From: Colin Ian King <colin.king@canonical.com>
Date: Wed, 16 Dec 2020 12:25:13 +0000 (+0000)
Subject: NFSv4.2: fix error return on memory allocation failure
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7be9b38afafbfcc58ede3be66bfc4ea415b3d5f1;p=linux.git

NFSv4.2: fix error return on memory allocation failure

Currently when an alloc_page fails the error return is not set in
variable err and a garbage initialized value is returned. Fix this
by setting err to -ENOMEM before taking the error return path.

Addresses-Coverity: ("Uninitialized scalar variable")
Fixes: a1f26739ccdc ("NFSv4.2: improve page handling for GETXATTR")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
---

diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c
index b9836e2ce4a2f..f3fd935620fcb 100644
--- a/fs/nfs/nfs42proc.c
+++ b/fs/nfs/nfs42proc.c
@@ -1301,6 +1301,7 @@ ssize_t nfs42_proc_getxattr(struct inode *inode, const char *name,
 		pages[i] = alloc_page(GFP_KERNEL);
 		if (!pages[i]) {
 			np = i + 1;
+			err = -ENOMEM;
 			goto out;
 		}
 	}