From patchwork Sat Oct 31 11:36:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 317406 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.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 9C716C388F9 for ; Sat, 31 Oct 2020 11:42:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6D566205F4 for ; Sat, 31 Oct 2020 11:42:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604144529; bh=cGhOKTRW40cD0lhMTa4QTllFZlDMJSEHYok7z5/T8jM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DU93FsvZNiaZQzPas6J6fLjH6EOl8AkU9ei5WUpJHJUut3yCw7PqIIIh8BexCm7V1 fIFOAqY/M1/A7tXXopzSm7soRnpl+muR5eAd7a74e+vs4KM5DzDIftDXsLY3IJVooo BNxHvLHG4f+aiwsMcmbOYMFi6OWM67zZvMei3nDs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727273AbgJaLmE (ORCPT ); Sat, 31 Oct 2020 07:42:04 -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 Precedence: bulk List-ID: X-Mailing-List: stable@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;