Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946487AbbEPIGb (ORCPT ); Sat, 16 May 2015 04:06:31 -0400 Received: from bband-dyn183.178-41-215.t-com.sk ([178.41.215.183]:22492 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1946460AbbEPIGY (ORCPT ); Sat, 16 May 2015 04:06:24 -0400 From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, "Eric W. Biederman" , Jiri Slaby Subject: [PATCH 3.12 117/142] mnt: Fix fs_fully_visible to verify the root directory is visible Date: Sat, 16 May 2015 09:37:57 +0200 Message-Id: <95c021d8b720eb3ade60e98b593f38a47df039fb.1431761807.git.jslaby@suse.cz> X-Mailer: git-send-email 2.3.7 In-Reply-To: <70c3d4ae1322b9e9bd7443ef574af5635234a0fa.1431761807.git.jslaby@suse.cz> References: <70c3d4ae1322b9e9bd7443ef574af5635234a0fa.1431761807.git.jslaby@suse.cz> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1398 Lines: 43 From: "Eric W. Biederman" 3.12-stable review patch. If anyone has any objections, please let me know. =============== commit 7e96c1b0e0f495c5a7450dc4aa7c9a24ba4305bd upstream. This fixes a dumb bug in fs_fully_visible that allows proc or sys to be mounted if there is a bind mount of part of /proc/ or /sys/ visible. Reported-by: Eric Windisch Signed-off-by: "Eric W. Biederman" Signed-off-by: Jiri Slaby --- fs/namespace.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/namespace.c b/fs/namespace.c index 7c3c0f6d2744..247f34d43dda 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -2940,6 +2940,12 @@ bool fs_fully_visible(struct file_system_type *type) if (mnt->mnt.mnt_sb->s_type != type) continue; + /* This mount is not fully visible if it's root directory + * is not the root directory of the filesystem. + */ + if (mnt->mnt.mnt_root != mnt->mnt.mnt_sb->s_root) + continue; + /* This mount is not fully visible if there are any child mounts * that cover anything except for empty directories. */ -- 2.3.7 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/