commit 4b1862e4fc6967bf326107ac0d5695157f32c25d
author Tadeusz Struk <tadeusz.struk@linaro.org> Mon Jan 03 12:50:26 2022 -0800
committer Lee Jones <joneslee@google.com> Wed Jan 26 11:31:08 2022 +0000
tree 4c2187921d4a28bdfed291939cf26265aeea3940
parent 445019bbca5d86f05b6ec383a6c0f4de3af555fe

ANDROID: incremental-fs: fix GPF in pending_reads_dispatch_ioctl

It is possible that fget returns NULL. This needs to be handled
correctly in ioctl_permit_fill.

Bug: 212821226

Signed-off-by: Tadeusz Struk <tadeusz.struk@linaro.org>
Change-Id: Iec8be21982afeab6794b78ab1a542671c52acea2

fs/incfs/pseudo_files.c

diff --git a/fs/incfs/pseudo_files.c b/fs/incfs/pseudo_files.c
index 1a664f1..1b9bf00 100644
--- a/fs/incfs/pseudo_files.c
+++ b/fs/incfs/pseudo_files.c
@@ -147,8 +147,12 @@
 		return -EFAULT;
 
 	file = fget(permit_fill.file_descriptor);
-	if (IS_ERR(file))
+	if (IS_ERR_OR_NULL(file)) {
+		if (!file)
+			return -ENOENT;
+
 		return PTR_ERR(file);
+	}
 
 	if (file->f_op != &incfs_file_ops) {
 		error = -EPERM;