Explorar o código

net/9p: Return error on read with NULL buffer

This patch ensures that a read(fd, NULL, 10) returns  EFAULT on a 9p file.

Signed-off-by: Sanchit Garg <sancgarg@linux.vnet.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
Sanchit Garg %!s(int64=14) %!d(string=hai) anos
pai
achega
f6ac55b6c1
Modificáronse 1 ficheiros con 1 adicións e 4 borrados
  1. 1 4
      net/9p/client.c

+ 1 - 4
net/9p/client.c

@@ -1286,16 +1286,13 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
 
 
 	if (data) {
 	if (data) {
 		memmove(data, dataptr, count);
 		memmove(data, dataptr, count);
-	}
-
-	if (udata) {
+	} else {
 		err = copy_to_user(udata, dataptr, count);
 		err = copy_to_user(udata, dataptr, count);
 		if (err) {
 		if (err) {
 			err = -EFAULT;
 			err = -EFAULT;
 			goto free_and_error;
 			goto free_and_error;
 		}
 		}
 	}
 	}
-
 	p9_free_req(clnt, req);
 	p9_free_req(clnt, req);
 	return count;
 	return count;