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

[net-next-2.6.git] / net / 9p / client.c

diff --git a/net/9p/client.c b/net/9p/client.c
index 8df80fb86f23631d2c79706b408bbcdd53aee105..a848bca9fbffcd89e659e0d998bf830b83920765 100644 (file)
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -1286,16 +1286,13 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
 
        if (data) {
                memmove(data, dataptr, count);
-       }
-
-       if (udata) {
+       } else {
                err = copy_to_user(udata, dataptr, count);
                if (err) {
                        err = -EFAULT;
                        goto free_and_error;
                }
        }
-
        p9_free_req(clnt, req);
        return count;