From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 2 Sep 2020 15:30:48 +0000 (-0400)
Subject: fix regression in "epoll: Keep a reference on files added to the check list"
X-Git-Tag: MMI-QSAS30.62-33-12~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=93ce1a60c9277dc39968f27337a4d0ff33a0cfc6;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

fix regression in "epoll: Keep a reference on files added to the check list"

[ Upstream commit 77f4689de17c0887775bb77896f4cc11a39bf848 ]

epoll_loop_check_proc() can run into a file already committed to destruction;
we can't grab a reference on those and don't need to add them to the set for
reverse path check anyway.

Mot-CRs-fixed: (CR)
CVE-Fixed: CVE-2020-0466
Bug: 147802478

Change-Id: I24d3b8c878f5ef49f9ff5922d2364b59844fd8b8
Tested-by: Marc Zyngier <maz@kernel.org>
Fixes: a9ed4a6560b8 ("epoll: Keep a reference on files added to the check list")
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Jignesh Patel <jignesh@motorola.com>
Reviewed-on: https://gerrit.mot.com/1796974
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
(cherry picked from commit 77af7ed59b78781c7214086abb7f6bf6109a0b90)
---

diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index e6fd4b9874a3..a10c6081e48f 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -1903,9 +1903,9 @@ static int ep_loop_check_proc(void *priv, void *cookie, int call_nests)
 			 * during ep_insert().
 			 */
 			if (list_empty(&epi->ffd.file->f_tfile_llink)) {
-				get_file(epi->ffd.file);
-				list_add(&epi->ffd.file->f_tfile_llink,
-					 &tfile_check_list);
+				if (get_file_rcu(epi->ffd.file))
+					list_add(&epi->ffd.file->f_tfile_llink,
+						 &tfile_check_list);
 			}
 		}
 	}