From: Amir Goldstein <amir73il@gmail.com>
Date: Tue, 30 Jan 2018 11:54:45 +0000 (+0200)
Subject: ovl: check ERR_PTR() return value from ovl_encode_fh()
X-Git-Tag: v4.16-rc1~62^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9b6faee074702bbbc207e7027b9416c2d8fea9fe;p=users%2Fhch%2Fmisc.git

ovl: check ERR_PTR() return value from ovl_encode_fh()

Another fix for an issue reported by 0-day robot.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Fixes: 8ed5eec9d6c4 ("ovl: encode pure upper file handles")
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
---

diff --git a/fs/overlayfs/export.c b/fs/overlayfs/export.c
index b65ea49de457..bb94ce9da5c8 100644
--- a/fs/overlayfs/export.c
+++ b/fs/overlayfs/export.c
@@ -108,6 +108,9 @@ static int ovl_d_to_fh(struct dentry *dentry, char *buf, int buflen)
 
 	/* Encode an upper or origin file handle */
 	fh = ovl_encode_fh(origin ?: ovl_dentry_upper(dentry), !origin);
+	err = PTR_ERR(fh);
+	if (IS_ERR(fh))
+		goto fail;
 
 	err = -EOVERFLOW;
 	if (fh->len > buflen)