Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp1982116pxx; Sat, 31 Oct 2020 04:46:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/mvIDORprfzA/IjB3Q8hCWfIsfnKWSRG29yogJLlXNYvVyMG4EwPUXgQU2cDuYve9odvT X-Received: by 2002:a17:906:c102:: with SMTP id do2mr7042747ejc.236.1604144789132; Sat, 31 Oct 2020 04:46:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1604144789; cv=none; d=google.com; s=arc-20160816; b=j8RUQreJW5Mg8OhWAtm6IqoKOmXQ1AHLAoO3v1HjV3YIWofXcB7RavhOgXY3FcK3L0 Te09UqlUWK/mQoY58EKwyIOKL9itxJMzJloo70CGRPHITkq1oR4y73Fiu7SuD09e5b2t qX4pqyOUh+dNRM9+BuVVK0eGrEfJVqhDcRnUuR3uzHb7YBQusRFYjU2ebXspmAhVNn1I Zs5XnGpdNFf+GhEWByhkPdoIBhOSy4vdUCDvCi0Je+fS4T+N5tUn2s38LsnCAEefKEPU 9y5ukudDynLcKYpumvvLbq8M3DF203GJIkhRwcX8NVnSCIw1HVEFQ81yIOkrDR6Y8FKc jxbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=y82JZgzARyUXdqYhYY4KWu3WvunDEVMlXzDdfaYF9X0=; b=weD/vlQb4yuIchUWSkQspuLMBSjgnzpkPFHGWJVw2SK+whF7UQyI8c2nFlRQPX4pv8 eSRxhjRQ4HMlj6cjiwj7aUeX16FxVF+IRzX8/gA8HF2n94rzm1Km4Yda55GBKepRqXZ1 kt8USQfe9n1pqu9x7pvidk+sb2NryHgMEt9N7qBBzVSsPPonFlCocXoY4H1CNKVmKBAI Ty5sJ4S5p+gRkFXCVSOmhLEmJIAtqgJzHJN00I/4/l7Fb6i5yp8rI8medcaAsDkLHUgg Wx3+bmL8OPEjWGBA3HH27BEFbnjAGxrl9nd/vwerAeYL4d9DasMCODR3eMjLXDzC/R0p NeKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=s396n0HO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p22si2961707ejw.31.2020.10.31.04.46.06; Sat, 31 Oct 2020 04:46:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=s396n0HO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727808AbgJaLmF (ORCPT + 99 others); Sat, 31 Oct 2020 07:42:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:41430 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727798AbgJaLmD (ORCPT ); Sat, 31 Oct 2020 07:42:03 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5656320719; Sat, 31 Oct 2020 11:42:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604144522; bh=cGhOKTRW40cD0lhMTa4QTllFZlDMJSEHYok7z5/T8jM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s396n0HOkZ0VJmId4QnM3C4vQ+FoHhayheJDOi0FoUh4vNOZ5FIpwWF+0xdXkgXHl jQ/rDvMudXOzTxqGr4QnTIm+CMQ6ZSaRTIWDlODMvu0x8+t85ZxnvZt34BNxWhpYLA Hkebixb6eILLO9wmGwZ+RLrMili4VJuvHFP2Xq/A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hongyu Jin , Chao Yu , Gao Xiang Subject: [PATCH 5.8 49/70] erofs: avoid duplicated permission check for "trusted." xattrs Date: Sat, 31 Oct 2020 12:36:21 +0100 Message-Id: <20201031113501.848403905@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201031113459.481803250@linuxfoundation.org> References: <20201031113459.481803250@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Gao Xiang commit d578b46db69d125a654f509bdc9091d84e924dc8 upstream. Don't recheck it since xattr_permission() already checks CAP_SYS_ADMIN capability. Just follow 5d3ce4f70172 ("f2fs: avoid duplicated permission check for "trusted." xattrs") Reported-by: Hongyu Jin [ Gao Xiang: since it could cause some complex Android overlay permission issue as well on android-5.4+, it'd be better to backport to 5.4+ rather than pure cleanup on mainline. ] Cc: # 5.4+ Link: https://lore.kernel.org/r/20200811070020.6339-1-hsiangkao@redhat.com Reviewed-by: Chao Yu Signed-off-by: Gao Xiang Signed-off-by: Greg Kroah-Hartman --- fs/erofs/xattr.c | 2 -- 1 file changed, 2 deletions(-) --- a/fs/erofs/xattr.c +++ b/fs/erofs/xattr.c @@ -473,8 +473,6 @@ static int erofs_xattr_generic_get(const return -EOPNOTSUPP; break; case EROFS_XATTR_INDEX_TRUSTED: - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; break; case EROFS_XATTR_INDEX_SECURITY: break;