projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: miscellaneous memory handling fixes
[lttng-tools.git]
/
src
/
common
/
readwrite.c
diff --git
a/src/common/readwrite.c
b/src/common/readwrite.c
index 43d4e39eeeaed22896337995b440ba2e5fe46952..d33e0519088049bdb4895198d167d872522d9671 100644
(file)
--- a/
src/common/readwrite.c
+++ b/
src/common/readwrite.c
@@
-15,7
+15,11
@@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <assert.h>
+#include <errno.h>
+#include <limits.h>
#include <unistd.h>
#include <unistd.h>
+
#include "readwrite.h"
/*
#include "readwrite.h"
/*
@@
-31,8
+35,18
@@
ssize_t lttng_read(int fd, void *buf, size_t count)
size_t i = 0;
ssize_t ret;
size_t i = 0;
ssize_t ret;
+ 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 {
do {
- ret = read(fd,
&buf[i]
, count - i);
+ ret = read(fd,
buf + i
, count - i);
if (ret < 0) {
if (errno == EINTR) {
continue; /* retry operation */
if (ret < 0) {
if (errno == EINTR) {
continue; /* retry operation */
@@
-58,8
+72,18
@@
ssize_t lttng_write(int fd, const void *buf, size_t count)
size_t i = 0;
ssize_t ret;
size_t i = 0;
ssize_t ret;
+ 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 {
do {
- ret = write(fd,
&buf[i]
, count - i);
+ ret = write(fd,
buf + i
, count - i);
if (ret < 0) {
if (errno == EINTR) {
continue; /* retry operation */
if (ret < 0) {
if (errno == EINTR) {
continue; /* retry operation */
This page took
0.024958 seconds
and
4
git commands to generate.