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=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,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 9A1C7C3B183 for ; Mon, 7 Dec 2020 16:35:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6E99F238E5 for ; Mon, 7 Dec 2020 16:35:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727874AbgLGQe5 (ORCPT ); Mon, 7 Dec 2020 11:34:57 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:28564 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727790AbgLGQek (ORCPT ); Mon, 7 Dec 2020 11:34:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607358794; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WrWD39vQ5236vo/77WTHcclMwYYEe2kMnOzynaA/vIg=; b=YDqWPjUj/8lqyT1F5XRm7icpgYt7c0nHhZNKdTf2NEI7ucPxViLtvKG8lff+gpZltWx6EM v0XBExBkbrfhjUQltdjjnhRX16bm8Re/SJhmwJsWSGSHHxObZlu8SCZfglb8ewVT/lPZW4 rza9e1NDZEy31k6WPZP7zQNfz/+qDDE= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-484-KQC3QfeMNR-UeFWwWXum8w-1; Mon, 07 Dec 2020 11:33:10 -0500 X-MC-Unique: KQC3QfeMNR-UeFWwWXum8w-1 Received: by mail-ej1-f69.google.com with SMTP id f12so4030915ejk.2 for ; Mon, 07 Dec 2020 08:33:10 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=WrWD39vQ5236vo/77WTHcclMwYYEe2kMnOzynaA/vIg=; b=amedP/FJTdJYH5sn9HWsEoZ2OfwNDlhlQoAy6e5f1U2As05llda7uePnJYrXKDxQTx 8fCKAPMoOMg+2xMHKTINhbX8ePKI3u8nPaa6tLJjkNzy6w84UJWmIMm36DHLnNaRl/Sq Urz7/Q8Gf5ArQAE2hvHvIwrIJYeD7Mefc1flbAHbIq4HSIfGRR9K4H17FyA/2LoSNBht evyrVSVcbGy8M0VAB8dFyLoUEnsLTGTZhStTSmzN3t/Nm23lqThpg4wyfEaoJhkcpEPe oYn67gWEVb+shfJflcBn+R74n1yndEabH+p3DafZZFmzFrdo2zfsuUK5wICP6k4e67Qt qn4w== X-Gm-Message-State: AOAM532T7bNallCukinUl9dfEa2kiAbw7GXG9dNJCd3uYq0Xu1L1le3N eTUM3iJgAdSQlM6d/FMgEDWADAWRuDwhZ187MHzlJ8HlxA4TF6q8vz/BojRqM2vhZlUEXuDR/x5 sODaM1lpXvWHGONLBmzuNGk6Wnw== X-Received: by 2002:a05:6402:b57:: with SMTP id bx23mr20433027edb.191.1607358789301; Mon, 07 Dec 2020 08:33:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJyDZ8PBOMTmy7Viq25/DAuAax7RMDShGdfStsG7a9V/Uv4Vpsy2gyL1w0kDb+e0n297b859wQ== X-Received: by 2002:a05:6402:b57:: with SMTP id bx23mr20433017edb.191.1607358789148; Mon, 07 Dec 2020 08:33:09 -0800 (PST) Received: from miu.piliscsaba.redhat.com (catv-86-101-169-67.catv.broadband.hu. [86.101.169.67]) by smtp.gmail.com with ESMTPSA id op5sm12801964ejb.43.2020.12.07.08.33.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Dec 2020 08:33:08 -0800 (PST) From: Miklos Szeredi To: "Eric W . Biederman" Cc: linux-fsdevel@vger.kernel.org, linux-unionfs@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 07/10] ovl: do not fail when setting origin xattr Date: Mon, 7 Dec 2020 17:32:52 +0100 Message-Id: <20201207163255.564116-8-mszeredi@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201207163255.564116-1-mszeredi@redhat.com> References: <20201207163255.564116-1-mszeredi@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Comment above call already says this, but only EOPNOTSUPP is ignored, other failures are not. For example setting "user.*" will fail with EPERM on symlink/special. Ignore this error as well. Signed-off-by: Miklos Szeredi --- fs/overlayfs/copy_up.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c index 955ecd4030f0..8a7ef40d98f8 100644 --- a/fs/overlayfs/copy_up.c +++ b/fs/overlayfs/copy_up.c @@ -352,7 +352,8 @@ int ovl_set_origin(struct dentry *dentry, struct dentry *lower, fh ? fh->fb.len : 0, 0); kfree(fh); - return err; + /* Ignore -EPERM from setting "user.*" on symlink/special */ + return err == -EPERM ? 0 : err; } /* Store file handle of @upper dir in @index dir entry */ -- 2.26.2