diff --git a/[refs] b/[refs] index 0c20ef531594..5d14c6a59d17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16ebe911eba8afa88879213dc4388f2dd701561e +refs/heads/master: 6a5640f10255a8941a3a57396dda20af7a5c9a9e diff --git a/trunk/fs/compat.c b/trunk/fs/compat.c index eb1740ac8c0a..d717442c4133 100644 --- a/trunk/fs/compat.c +++ b/trunk/fs/compat.c @@ -597,10 +597,8 @@ ssize_t compat_rw_copy_check_uvector(int type, if (nr_segs > fast_segs) { ret = -ENOMEM; iov = kmalloc(nr_segs*sizeof(struct iovec), GFP_KERNEL); - if (iov == NULL) { - *ret_pointer = fast_pointer; + if (iov == NULL) goto out; - } } *ret_pointer = iov;