Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp2522694pxu; Mon, 7 Dec 2020 08:39:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJzKGyEa5oj9c21dHCx25Yi4oHy5QH341U1Y4XSNI+VQV8MXapnXwwPRxA+CWd12Q5yfAsxL X-Received: by 2002:a17:906:b309:: with SMTP id n9mr19706528ejz.365.1607359178913; Mon, 07 Dec 2020 08:39:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607359178; cv=none; d=google.com; s=arc-20160816; b=bbDOm39V99o5+e5t6ZTn6ElF5Cqdob0BdBbLw6wtud4K/qlXAQ0J5joeaJ/ZDJYpny s4EsiLRcoy23jc82AKWzmQOuzAzA5kAanbv0Yp7kHBL0igxXlX+3xB81PS2Joz61b1ns qkMTtTepn8S7iUlXnBrZJFcA2JBSTOd+8mxNV3MqfBU3Ang6JTimK4LXfHiaQV4i6tD0 J5lGeSCg9uCPepCvYEMOXNkemlWGAsW4YLcYDwdhnZN1piaW3yvDFffnLFWoR1gMiPx2 euAwdoT8JH+VautUD1dH/3NOmOkK4K8hSeOQxlmJHROSco/TsYK3tl36KDIUXSUcwViS /+8g== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WrWD39vQ5236vo/77WTHcclMwYYEe2kMnOzynaA/vIg=; b=uTrtBZGGAbWShgB+w2phHB8Pir9XWxUJvSIZ/ogvDsuNKVk0eT6GnNu1GhxI8qlGr0 WqSypDr4ASIxqdjvX+R21JtEoBtql/6mUl/dCrkqO5wk/Wp1dn1rQyESs6QL3uoaH4tO /boHVtcHkc0m2bfJK+tYcbOfenWcyEivbDiNQb7TZmjWkywTMYqK7lWFyRQv93Pue261 0ZZTHfwvXGmEl7Vq5y1qE7vT7d5jXnv3daq6kPOUyL4QwGcwXLn+FKh8Q2YDXnMJKkIO /d+a5Q9p+OR18v11BTaFXFgXYFrbPFxyjXjYl257m/vnYQ5q+U4wLNrYoBLdROMMa1AV UcyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=YDqWPjUj; 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=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q9si6773082ejm.460.2020.12.07.08.39.15; Mon, 07 Dec 2020 08:39:38 -0800 (PST) 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=@redhat.com header.s=mimecast20190719 header.b=YDqWPjUj; 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=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727877AbgLGQe5 (ORCPT + 99 others); Mon, 7 Dec 2020 11:34:57 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:39024 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727724AbgLGQek (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-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-540-HZxGL2VONWGXVY4m7I403g-1; Mon, 07 Dec 2020 11:33:10 -0500 X-MC-Unique: HZxGL2VONWGXVY4m7I403g-1 Received: by mail-ed1-f71.google.com with SMTP id p17so6016412edx.22 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=l0xdAQfJ1D1E0PwqqXFbOgf2WEwAGw41UrtHaSpyAlt+SBbR9WxI4RJVIJYngerW5U 6WffuD5ArdypuXvIodUXgIDdiVN1UExkpehQ9tJ2eodHtay92WhBuqs5Ahd6j0KNounI AJs9e75C9chydWqyS2sA6jbXlSNGMMdEO0KbGVXJiCwr73pB/mKgC/aSbWZhElU+lLfj pSjZrVp3lsEGZzNx0Q+kcVQFvD1xbaMl+4UQo9JZaoijHcNw5RzywOF8lA86oL9fZzeN iZ5lFg5anXYuQ2fifaeLBPieTvEa+5MOUacC/wcIRWWhHRJPvCStWo7IjOZcWQShBytF umKg== X-Gm-Message-State: AOAM531vwFBZnpjRxzXhDCY+MFTjvjg7EBoUo8vw4OJ/V+bQJcZJO5i1 0tJemtPANUTnjgUN/loL0mNDqdELDSphJntcNvwfpi6ep0n5mUuvvZhQI9+vGrYm8sEN3EeDOZp 9N+tnf0aUOGnwGGTWw+hcqcmn X-Received: by 2002:a05:6402:b57:: with SMTP id bx23mr20433025edb.191.1607358789300; Mon, 07 Dec 2020 08:33:09 -0800 (PST) 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-kernel@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