From patchwork Wed Dec 2 15:40:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 7748541 Return-Path: X-Original-To: patchwork-selinux@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4C7B9BEEE1 for ; Wed, 2 Dec 2015 16:30:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A2D8020549 for ; Wed, 2 Dec 2015 16:30:18 +0000 (UTC) Received: from emvm-gh1-uea08.nsa.gov (emvm-gh1-uea08.nsa.gov [63.239.67.9]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D179220503 for ; Wed, 2 Dec 2015 16:30:16 +0000 (UTC) X-TM-IMSS-Message-ID: <2380fc9100017b87@nsa.gov> Received: from tarius.tycho.ncsc.mil ([144.51.242.1]) by nsa.gov ([10.208.42.193]) with ESMTP (TREND IMSS SMTP Service 7.1) id 2380fc9100017b87 ; Wed, 2 Dec 2015 11:28:45 -0500 Received: from prometheus.infosec.tycho.ncsc.mil (prometheus [192.168.25.40]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id tB2GSVFi011271; Wed, 2 Dec 2015 11:28:32 -0500 Received: from tarius.tycho.ncsc.mil (tarius.infosec.tycho.ncsc.mil [144.51.242.1]) by prometheus.infosec.tycho.ncsc.mil (8.15.2/8.15.2) with ESMTP id tB2FgOlG185586 for ; Wed, 2 Dec 2015 10:42:24 -0500 Received: from goalie.tycho.ncsc.mil (goalie [144.51.242.250]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id tB2Fg5p1006458 for ; Wed, 2 Dec 2015 10:42:24 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A1ChAAA0EF9Wm67fVdFeGQEBAQEPAQEBAYRMu3CEFoYOAoIYAQEBAQEBEgEBAQEBBgsLCSGEYwEBAQMSFRkBATcBD1E0AQUBHAYTIogNoRWBMT4xileFVAEFjCMBAQEBBgIBGgYKhDqCEI42jiCIQZZMhiGLazaBF4JnI4F8UwGFbgEBAQ X-IPAS-Result: A1ChAAA0EF9Wm67fVdFeGQEBAQEPAQEBAYRMu3CEFoYOAoIYAQEBAQEBEgEBAQEBBgsLCSGEYwEBAQMSFRkBATcBD1E0AQUBHAYTIogNoRWBMT4xileFVAEFjCMBAQEBBgIBGgYKhDqCEI42jiCIQZZMhiGLazaBF4JnI4F8UwGFbgEBAQ X-IronPort-AV: E=Sophos;i="5.20,373,1444708800"; d="scan'208";a="4986121" Received: from emvm-gh1-uea08.nsa.gov ([10.208.42.193]) by goalie.tycho.ncsc.mil with ESMTP; 02 Dec 2015 10:42:24 -0500 X-TM-IMSS-Message-ID: <2356ab6400015edc@nsa.gov> Received: from mail-io0-f174.google.com (mail-io0-f174.google.com [209.85.223.174]) by nsa.gov ([10.208.42.193]) with ESMTP (TREND IMSS SMTP Service 7.1; TLSv1/SSLv3 AES128-SHA (128/128)) id 2356ab6400015edc ; Wed, 2 Dec 2015 10:42:32 -0500 Received: by ioc74 with SMTP id 74so49329363ioc.2 for ; Wed, 02 Dec 2015 07:42:22 -0800 (PST) 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=9sEaxXAG+7QGiN3WXMDGRRt6jScXk5CShjajDsCHZAU=; b=F4asSwPdE+5x1TMTLrlAVadz2bVu7RzCnu9pcR6PQD45BoMdYggtLA5xGUj071dDN9 INRes0zX7oFHZsBW6d7QTQeJnDexJ+/N+YiU9M3dOvLFaeJvvXSDH19pScTeVky6Ttf7 C/A4DFop374qeostz7IO1VFlyMOsYHY67yxZHMQ0qRGhkvpvtENkL0sF5RDbz3l2sZVj 9kLGSzn+TeWuwbG+K3NtB/49axwcMEKjODk7OOUNm8w+SaLSiRAEYCkB4TiHUXBJ7vzd 8rA40hgALPkEvkGNsqRqz7v32y0j5Ct+X5SI0whij3qaRYTzJQd5UQADrW9LwvBtWKxH Ayhg== 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=9sEaxXAG+7QGiN3WXMDGRRt6jScXk5CShjajDsCHZAU=; b=VYaz4ab1WXNBh/SL2kVhpRQRTVY1sRwEKccuP8HZUmS1hkF1BXQzwYnXxmNK7gCLIG N7DAGd2NXxloAFXm0BJjqEMfhRYSzeXE5Q77FaQKYNb/k0Cgh23ZdCUAXmCVJN12DeRj gaJEiEEdXMuUh6+EpdWtQxT+6u/2jTSvtNK0qr4FHF+hRoUlzMbDEl+ANsbKARu/ZAHT zgkU/13uLwg5IYjqHOwSrq/o+t5Efe+XUnHC2PbQMAY3Q+ISKeam3edLDSF7KGjAKLvu 3gTrEgKwGS5Shg+JLZddywIN/RVR+iiVmi35R91owpaMxfKgN6RZi6RG0n6DA6u5PMen chhw== X-Gm-Message-State: ALoCoQnIUDuLlNCCuMG8H6s1I7tebK048AusKETUyHQPxuSSbHAhSl7HpNbU0LZBXXhpA+G01His X-Received: by 10.107.4.213 with SMTP id 204mr4800058ioe.195.1449070942523; Wed, 02 Dec 2015 07:42:22 -0800 (PST) Received: from localhost (199-87-125-144.dyn.kc.surewest.net. [199.87.125.144]) by smtp.gmail.com with ESMTPSA id t98sm1351062ioi.31.2015.12.02.07.42.21 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 02 Dec 2015 07:42:22 -0800 (PST) From: Seth Forshee To: "Eric W. Biederman" Subject: [PATCH 08/19] cred: Reject inodes with invalid ids in set_create_file_as() Date: Wed, 2 Dec 2015 09:40:08 -0600 Message-Id: <1449070821-73820-9-git-send-email-seth.forshee@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1449070821-73820-1-git-send-email-seth.forshee@canonical.com> References: <1449070821-73820-1-git-send-email-seth.forshee@canonical.com> X-TM-AS-MML: disable X-Mailman-Approved-At: Wed, 02 Dec 2015 11:15:49 -0500 X-BeenThere: selinux@tycho.nsa.gov X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Security-Enhanced Linux \(SELinux\) mailing list" List-Post: List-Help: Cc: Serge Hallyn , Seth Forshee , dm-devel@redhat.com, Miklos Szeredi , Richard Weinberger , linux-security-module@vger.kernel.org, linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, fuse-devel@lists.sourceforge.net, Austin S Hemmelgarn , linux-mtd@lists.infradead.org, Alexander Viro , selinux@tycho.nsa.gov, linux-fsdevel@vger.kernel.org MIME-Version: 1.0 Errors-To: selinux-bounces@tycho.nsa.gov Sender: "Selinux" X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Using INVALID_[UG]ID for the LSM file creation context doesn't make sense, so return an error if the inode passed to set_create_file_as() has an invalid id. Signed-off-by: Seth Forshee Acked-by: Serge Hallyn --- kernel/cred.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/cred.c b/kernel/cred.c index 71179a09c1d6..ff8606f77d90 100644 --- a/kernel/cred.c +++ b/kernel/cred.c @@ -689,6 +689,8 @@ EXPORT_SYMBOL(set_security_override_from_ctx); */ int set_create_files_as(struct cred *new, struct inode *inode) { + if (!uid_valid(inode->i_uid) || !gid_valid(inode->i_gid)) + return -EINVAL; new->fsuid = inode->i_uid; new->fsgid = inode->i_gid; return security_kernel_create_files_as(new, inode);