From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6DA3ECE58C for ; Mon, 7 Oct 2019 16:09:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 885DB205C9 for ; Mon, 7 Oct 2019 16:09:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=android.com header.i=@android.com header.b="WclQk7Cq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728829AbfJGQJ3 (ORCPT ); Mon, 7 Oct 2019 12:09:29 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:46645 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728330AbfJGQJ2 (ORCPT ); Mon, 7 Oct 2019 12:09:28 -0400 Received: by mail-pg1-f196.google.com with SMTP id b8so2139811pgm.13 for ; Mon, 07 Oct 2019 09:09:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=android.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aeEaJtarLqJ/0FUJVYNbwn+6HPdzfTKq5CySN2cpkL8=; b=WclQk7CqmZhdOvOLCv7bcbzhzQmzjahDqMBGbnnQMbfR+9Qr5Xtu2s4Pq3udBWYK3e GoWCLwm019+p9dKJnQT6RlhXwMB+3RrjdnZn6tx2kl/ylqM4mc/PyUyNj+lU7/yQ9NZJ KxYS/aSvd4bWsbKruGsMqIUZefM9aluM+5oFIv3S1DJ10bNO52A06lGf57EBsnVJKZ0w XMcJ9xAC8U2/pLfmvcFKcJzaUjo3yIi/b5PT2TuOq3N4yoK93MDj3/3JFcpF/FkTgRJz KovVEYC9Ir32aKghqE1WmmCNMId/lP6/3CiNDL0nw91hNfed+TIH1o2+/PCmnwpeNlCh ZRpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aeEaJtarLqJ/0FUJVYNbwn+6HPdzfTKq5CySN2cpkL8=; b=D1E8Yq247AThlVaze3yywtb4Zssay26ou75ToyO6wcNTNuaVnmIQFD64RF16dTW9dM Ys+MoDY7aJB8zDhQjoA3v7d3GRmXrHPRDJtK6DF7CQTFGsVnpcSbtZojRPORJTbyi6TJ p+O6wVJfm7Mh0elUCFDL6b9A0/GlBvZZTZdH0M/mUr7T8Ur2hKqPhlUTcsQ1xANfNgul o2dlhPMQuaTC7O8ITvMJfiEZJVTlwgFClPBFPFPgkxQ2DTLo1RztzMAL/bW4Yvia7ZwK UzN60e08CW2Lr8voVx33rNPD5G1lkYAiS5NJz3g5o3PiXV1zjVeB9wTXA6HMpgYOrkxu jx+w== X-Gm-Message-State: APjAAAVw8uvEJszpR3oM1nlZzBtR2r0k2oA0Bd9p2XGnFjhvQKZwlxLU Ue1W6KxQzFrL67oI88cn29aqfg== X-Google-Smtp-Source: APXvYqxOwvzzrjEtteWgmzgIWO6ke9wfqYA06v+6RaJ5Zxl0ufcPdavUTQcVgAmJgyYhl4ADnqIDlA== X-Received: by 2002:a17:90a:e008:: with SMTP id u8mr81782pjy.46.1570464566766; Mon, 07 Oct 2019 09:09:26 -0700 (PDT) Received: from nebulus.mtv.corp.google.com ([2620:15c:211:200:5404:91ba:59dc:9400]) by smtp.gmail.com with ESMTPSA id v13sm17660512pgo.79.2019.10.07.09.09.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2019 09:09:26 -0700 (PDT) From: Mark Salyzyn To: linux-kernel@vger.kernel.org Cc: kernel-team@android.com, Mark Salyzyn , linux-security-module@vger.kernel.org, Greg Kroah-Hartman , stable@vger.kernel.org, Miklos Szeredi , linux-unionfs@vger.kernel.org Subject: [PATCH] ovl: filter of trusted xattr results in audit Date: Mon, 7 Oct 2019 09:09:16 -0700 Message-Id: <20191007160918.29504-1-salyzyn@android.com> X-Mailer: git-send-email 2.23.0.581.g78d2f28ef7-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org When filtering xattr list for reading, presence of trusted xattr results in a security audit log. However, if there is other content no errno will be set, and if there isn't, the errno will be -ENODATA and not -EPERM as is usually associated with a lack of capability. The check does not block the request to list the xattrs present. Switch to has_capability_noaudit to reflect a more appropriate check. Signed-off-by: Mark Salyzyn Cc: linux-security-module@vger.kernel.org Cc: kernel-team@android.com Cc: Greg Kroah-Hartman Cc: stable@vger.kernel.org # v3.18 Fixes: upstream a082c6f680da ("ovl: filter trusted xattr for non-admin") Fixes: 3.18 4bcc9b4b3a0a ("ovl: filter trusted xattr for non-admin") --- Replaced ns_capable_noaudit with 3.18.y tree specific has_capability_noaudit present in original submission to kernel.org commit 5c2e9f346b815841f9bed6029ebcb06415caf640 ("ovl: filter of trusted xattr results in audit") fs/overlayfs/inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c index a01ec1836a72..1175efa5e956 100644 --- a/fs/overlayfs/inode.c +++ b/fs/overlayfs/inode.c @@ -265,7 +265,8 @@ static bool ovl_can_list(const char *s) return true; /* Never list trusted.overlay, list other trusted for superuser only */ - return !ovl_is_private_xattr(s) && capable(CAP_SYS_ADMIN); + return !ovl_is_private_xattr(s) && + has_capability_noaudit(current, CAP_SYS_ADMIN); } ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size) -- 2.23.0.581.g78d2f28ef7-goog