Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946201AbbEVJLe (ORCPT ); Fri, 22 May 2015 05:11:34 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:35319 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757270AbbEVJAQ (ORCPT ); Fri, 22 May 2015 05:00:16 -0400 From: Luis Henriques To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: "Eric W. Biederman" , Luis Henriques Subject: [PATCH 3.16.y-ckt 105/129] mnt: Fix fs_fully_visible to verify the root directory is visible Date: Fri, 22 May 2015 09:58:10 +0100 Message-Id: <1432285114-9254-106-git-send-email-luis.henriques@canonical.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1432285114-9254-1-git-send-email-luis.henriques@canonical.com> References: <1432285114-9254-1-git-send-email-luis.henriques@canonical.com> X-Extended-Stable: 3.16 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1417 Lines: 40 3.16.7-ckt12 -stable review patch. If anyone has any objections, please let me know. ------------------ From: "Eric W. Biederman" 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: Luis Henriques --- fs/namespace.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/namespace.c b/fs/namespace.c index 0a55bbca650f..6dfb6fc34286 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -3038,6 +3038,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. */ -- 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/