From patchwork Tue Sep 6 14:32:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 666621 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3sT8FL5scDz9s9x; Wed, 7 Sep 2016 00:32:22 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical-com.20150623.gappssmtp.com header.i=@canonical-com.20150623.gappssmtp.com header.b=MnO2KYdk; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1bhHQA-0004rs-RX; Tue, 06 Sep 2016 14:32:18 +0000 Received: from mail-oi0-f45.google.com ([209.85.218.45]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1bhHPx-0004p9-Cl for kernel-team@lists.ubuntu.com; Tue, 06 Sep 2016 14:32:05 +0000 Received: by mail-oi0-f45.google.com with SMTP id s131so36882041oie.2 for ; Tue, 06 Sep 2016 07:32:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=dxm0wjW/pktazF1gKnpSxgiHrvdqojJ1rc0XqFbOPnw=; b=MnO2KYdkLWtkfOlQfApKR9VVzLOoYfR04sEw5W7IMfgojSZf0ziH07Nc1jKmeYhK5V 2AZEr411roiH/3JxIsxdM7Zo2kFW5sCwTJplj5Rdj5DBi0hVtWtFho/VAAXTqD8yG6nE KvwL5xkYN+OXfTx6tvYLaOL5UAw0X7zrCSX9vKhDakhpgvK/0pd3NUatnHSRaVC7cSE9 BbwRe1Urg3cp44W6CONPbSAll+28JKJzm2TvTIslZFtcykhQ0NC4ze6QJ6QOnNhqPUDd ZV/qrs9WCpH15oxaibGKGowrXNx5cpF7hzWQIswL5WJrQFZKiiYqYirt7c9d+gIFz6hE nC2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=dxm0wjW/pktazF1gKnpSxgiHrvdqojJ1rc0XqFbOPnw=; b=ldWByChnvCAAf8WxYHdeIjSbH6xmJHOix1q+HfRSMY/QL9NO2ufnWyyt1sxI48sUOJ CV9nlOQ/GExC4QJzc3RdsdDu3qPFNmS4vHx/aNwaVol2GhPcDrbIreF/jsEvb71PkZ+r /LfzjkW/GhT99Mm1U6GJZvWTweY9ucet93QOG6NPEBkVG2MIFjXQl6ijPXHWnM8ql5eB rNF9McC3kgU1GxdyAh9Snf6QL9G95qgbscsPbEJ14aM1J84Fs0SNjyDaHl5k6wIcZKP/ koodxRxmV89wjBgjzflKN2uJrspOiUIrkqz/xKZuUIMOT+hRZmf+eRXNhqxV/oUQeJbr /kXg== X-Gm-Message-State: AE9vXwMguzWV3I2PAdNcQCUPrbq8QopDJPkd5qEk36hT19gpp+MhXv8+vvumUpuLAj1AeBC5 X-Received: by 10.202.49.21 with SMTP id x21mr8131637oix.66.1473172324131; Tue, 06 Sep 2016 07:32:04 -0700 (PDT) Received: from localhost ([2605:a601:aa9:6620:f195:4c7f:b580:58e9]) by smtp.gmail.com with ESMTPSA id v141sm1482076oie.8.2016.09.06.07.32.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Sep 2016 07:32:03 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2][Xenial SRU] Revert "UBUNTU: SAUCE: (namespace) Bypass sget() capability check for nfs" Date: Tue, 6 Sep 2016 09:32:00 -0500 Message-Id: <1473172321-20748-2-git-send-email-seth.forshee@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473172321-20748-1-git-send-email-seth.forshee@canonical.com> References: <1473172321-20748-1-git-send-email-seth.forshee@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/1612135 This reverts commit d15123a5a9e5c9fcb95909ea30699d46035e7734 in order to replace it with the more generic upstream fix. Signed-off-by: Seth Forshee --- fs/nfs/super.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 8a57020..f126828 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -2559,8 +2559,7 @@ struct dentry *nfs_fs_mount_common(struct nfs_server *server, sb_mntdata.mntflags |= MS_SYNCHRONOUS; /* Get a superblock - note that we may end up sharing one that already exists */ - s = sget_userns(nfs_mod->nfs_fs, compare_super, nfs_set_super, flags, - &init_user_ns, &sb_mntdata); + s = sget(nfs_mod->nfs_fs, compare_super, nfs_set_super, flags, &sb_mntdata); if (IS_ERR(s)) { mntroot = ERR_CAST(s); goto out_err_nosb;