X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libsysio%2Fsrc%2Frw.c;h=bd4ae6bf57d4a98b491cba9769f69f7b4ae8ca56;hp=edc308bacc1d2150aef5d4510011fd4dae352a62;hb=567285197e592000b7a713d65b66e27314a11c2f;hpb=bfbd12e025894f1e17467080d7486c301d359cf3

diff --git a/libsysio/src/rw.c b/libsysio/src/rw.c
index edc308b..bd4ae6b 100644
--- a/libsysio/src/rw.c
+++ b/libsysio/src/rw.c
@@ -682,9 +682,13 @@ PREPEND(_, SYSIO_INTERFACE_NAME(ireadx))(int fd,
 
 	SYSIO_INTERFACE_ENTER;
 	fil = _sysio_fd_find(fd);
-	if (!(fil && xtv_count))
+	if (!fil)
 		SYSIO_INTERFACE_RETURN(IOID_FAIL, -EBADF);
 
+	/* Perform a check on the iov_count and xtv_count */
+	if ((iov_count == 0) || (xtv_count == 0))
+		SYSIO_INTERFACE_RETURN(IOID_FAIL, -EINVAL);
+
 	err =
 	    _sysio_iiox(IIOXOP_READ(fil->f_ino),
 			fil,
@@ -717,9 +721,14 @@ SYSIO_INTERFACE_NAME(ireadx)(int fd,
 
 	SYSIO_INTERFACE_ENTER;
 	fil = _sysio_fd_find(fd);
-	if (!(fil && xtv_count))
+	if (!fil)
 		SYSIO_INTERFACE_RETURN(IOID_FAIL, -EBADF);
 
+
+	/* Perform a check on the iov_count and xtv_count */
+	if ((iov_count == 0) || (xtv_count == 0))
+		SYSIO_INTERFACE_RETURN(IOID_FAIL, -EINVAL);
+
 	ixtv = ixtvent = malloc(xtv_count * sizeof(struct intnl_xtvec));
 	if (!ixtv)
 		SYSIO_INTERFACE_RETURN(IOID_FAIL, -ENOMEM);
@@ -1236,9 +1245,13 @@ SYSIO_INTERFACE_NAME(iwritex)(int fd,
 
 	SYSIO_INTERFACE_ENTER;
 	fil = _sysio_fd_find(fd);
-	if (!(fil && xtv_count))
+	if (!fil)
 		SYSIO_INTERFACE_RETURN(IOID_FAIL, -EBADF);
 
+	/* Perform a check on the iov_count and xtv_count */
+	if ((iov_count == 0) || (xtv_count == 0))
+		SYSIO_INTERFACE_RETURN(IOID_FAIL, -EINVAL);
+
 	ixtv = ixtvent = malloc(xtv_count * sizeof(struct intnl_xtvec));
 	if (!ixtv)
 		SYSIO_INTERFACE_RETURN(IOID_FAIL, -ENOMEM);