Message ID | 1461699396-33000-16-git-send-email-seth.forshee@canonical.com |
---|---|
State | Not Applicable |
Headers | show
Return-Path: <linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qvYLT0Z3pz9t4h for <incoming@patchwork.ozlabs.org>; Wed, 27 Apr 2016 05:38:57 +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=nU6xY84n; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1av8oE-0002uc-0Q; Tue, 26 Apr 2016 19:38:10 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1av8nd-0002Kv-Sh for linux-mtd@bombadil.infradead.org; Tue, 26 Apr 2016 19:37:34 +0000 Received: from mail-ig0-x22c.google.com ([2607:f8b0:4001:c05::22c]) by merlin.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1av8nb-0001sl-Vv for linux-mtd@lists.infradead.org; Tue, 26 Apr 2016 19:37:33 +0000 Received: by mail-ig0-x22c.google.com with SMTP id u10so52245909igr.1 for <linux-mtd@lists.infradead.org>; Tue, 26 Apr 2016 12:37:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6wp+PLaoRzmNmk4QzmosQuFHoGYfjs+oQVk8R8M0s9M=; b=nU6xY84n4EcejeABOJPlpQWzlde2y+gFYrVPYMyDw1oMv+Ckh/I2EHW6oNDifmvrwA F+iPl3QW86jymi1Vp/jPHJ1geMzZUAZ1pa1837hWkqt2UqKq8/XQx0SppP++sV1dGGs2 rLPDifC0r4rxeoUHXQr+AG5Qa0EHjvAkoERETXyCrwFZYuHebrfTNW2t1aPmr/3Lnh8n LXTomFFahH4N9OZyZZO7hr8Ii7XpQsXZESqu7KzGLFS57kaPLjUzfGSmj0Kso8ydAZSw 5EFdNlScxed0nPc31FaQJlonYCM4gC59k/Bu4h4feOLfNcLUTW8AIisgX/HhwcoSzNiT xOvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6wp+PLaoRzmNmk4QzmosQuFHoGYfjs+oQVk8R8M0s9M=; b=DuUshyWfnqMuIXTdC5vSzG7ohz6ij7mr5rzha1zCATj9OlHZnCn29KAjVHjB8OdiLC 6Ds+VwwojUo5knxIiczoqpwmtKnRdWa01mgK19TAFGxVtfJtmNJSQAxcy6iMBGu0HIsA v3bjCHYMEVBg1H3qWFelrI8Is44gKMw06xUB9LVQvNp14LTCdZMO8UvTbx23rPFw3A2E 8jYYtFJfmyUCKB91UdKVMQZN3G4Gz5VIP0FtPgzMPuTSb19RfP4a1KS9nqrtD98Z5e02 mdQVUxsxeGlvRv+SW+GOYxpx6TRtsWCuo+VTNPzAj+3kMPFnWtw44nAxMuo/+MgaZhmH MDIg== X-Gm-Message-State: AOPr4FVn1NMKBMhebqozp6RujYuL/5hJ7pbev48XvJMUqh5xm2f6FJ9BQK7ysGT/C3psOh7s X-Received: by 10.50.164.165 with SMTP id yr5mr20785114igb.48.1461699429881; Tue, 26 Apr 2016 12:37:09 -0700 (PDT) Received: from localhost ([2605:a601:aab:f920:39a1:5bcf:aa:5b00]) by smtp.gmail.com with ESMTPSA id m143sm2346548ioe.43.2016.04.26.12.37.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Apr 2016 12:37:09 -0700 (PDT) From: Seth Forshee <seth.forshee@canonical.com> To: "Eric W. Biederman" <ebiederm@xmission.com>, Alexander Viro <viro@zeniv.linux.org.uk> Subject: [PATCH v4 15/21] fs: Don't remove suid for CAP_FSETID in s_user_ns Date: Tue, 26 Apr 2016 14:36:28 -0500 Message-Id: <1461699396-33000-16-git-send-email-seth.forshee@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1461699396-33000-1-git-send-email-seth.forshee@canonical.com> References: <1461699396-33000-1-git-send-email-seth.forshee@canonical.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160426_153732_061624_B06E37CE X-CRM114-Status: UNSURE ( 8.83 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.1 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2607:f8b0:4001:c05:0:0:0:22c listed in] [list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux MTD discussion mailing list <linux-mtd.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-mtd>, <mailto:linux-mtd-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-mtd/> List-Post: <mailto:linux-mtd@lists.infradead.org> List-Help: <mailto:linux-mtd-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-mtd>, <mailto:linux-mtd-request@lists.infradead.org?subject=subscribe> Cc: linux-bcache@vger.kernel.org, Serge Hallyn <serge.hallyn@canonical.com>, Seth Forshee <seth.forshee@canonical.com>, dm-devel@redhat.com, Miklos Szeredi <mszeredi@redhat.com>, Richard Weinberger <richard.weinberger@gmail.com>, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, fuse-devel@lists.sourceforge.net, Austin S Hemmelgarn <ahferroin7@gmail.com>, linux-mtd@lists.infradead.org, selinux@tycho.nsa.gov, linux-fsdevel@vger.kernel.org, cgroups@vger.kernel.org, Pavel Tikhomirov <ptikhomirov@virtuozzo.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-mtd" <linux-mtd-bounces@lists.infradead.org> Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org |
diff --git a/fs/inode.c b/fs/inode.c index 69b8b526c194..cd52170f9117 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -1690,7 +1690,8 @@ int should_remove_suid(struct dentry *dentry) if (unlikely((mode & S_ISGID) && (mode & S_IXGRP))) kill |= ATTR_KILL_SGID; - if (unlikely(kill && !capable(CAP_FSETID) && S_ISREG(mode))) + if (unlikely(kill && !ns_capable(dentry->d_sb->s_user_ns, CAP_FSETID) && + S_ISREG(mode))) return kill; return 0;