projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Initialize events discarded and packet lost counters to zero
[lttng-tools.git]
/
src
/
common
/
readwrite.c
diff --git
a/src/common/readwrite.c
b/src/common/readwrite.c
index 7b8460962eda5ee7e917be20cce7c47be0a56ea4..42a048fdabd2d3abaf0e32d561f9cb901930baff 100644
(file)
--- a/
src/common/readwrite.c
+++ b/
src/common/readwrite.c
@@
-15,8
+15,10
@@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#define _LGPL_SOURCE
#include <assert.h>
#include <errno.h>
#include <assert.h>
#include <errno.h>
+#include <limits.h>
#include <unistd.h>
#include "readwrite.h"
#include <unistd.h>
#include "readwrite.h"
@@
-29,6
+31,7
@@
* error occured.
* The error can be checked by querying errno.
*/
* error occured.
* The error can be checked by querying errno.
*/
+LTTNG_HIDDEN
ssize_t lttng_read(int fd, void *buf, size_t count)
{
size_t i = 0;
ssize_t lttng_read(int fd, void *buf, size_t count)
{
size_t i = 0;
@@
-36,6
+39,14
@@
ssize_t lttng_read(int fd, void *buf, size_t count)
assert(buf);
assert(buf);
+ /*
+ * Deny a read count that can be bigger then the returned value max size.
+ * This makes the function to never return an overflow value.
+ */
+ if (count > SSIZE_MAX) {
+ return -EINVAL;
+ }
+
do {
ret = read(fd, buf + i, count - i);
if (ret < 0) {
do {
ret = read(fd, buf + i, count - i);
if (ret < 0) {
@@
-58,6
+69,7
@@
error:
}
}
}
}
+LTTNG_HIDDEN
ssize_t lttng_write(int fd, const void *buf, size_t count)
{
size_t i = 0;
ssize_t lttng_write(int fd, const void *buf, size_t count)
{
size_t i = 0;
@@
-65,6
+77,14
@@
ssize_t lttng_write(int fd, const void *buf, size_t count)
assert(buf);
assert(buf);
+ /*
+ * Deny a write count that can be bigger then the returned value max size.
+ * This makes the function to never return an overflow value.
+ */
+ if (count > SSIZE_MAX) {
+ return -EINVAL;
+ }
+
do {
ret = write(fd, buf + i, count - i);
if (ret < 0) {
do {
ret = write(fd, buf + i, count - i);
if (ret < 0) {
This page took
0.024537 seconds
and
4
git commands to generate.