Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2639036pxj; Mon, 14 Jun 2021 03:44:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzDzoaFVW2jGE4Kh0QrL/agFIpbrckJJIjUFZ5qLh3nBpkXe42wju0J9F0u5REsuUYoI1Fc X-Received: by 2002:a17:907:9e1:: with SMTP id ce1mr14581187ejc.104.1623667478945; Mon, 14 Jun 2021 03:44:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623667478; cv=none; d=google.com; s=arc-20160816; b=SAFgXSZN9npPDYFwoulGYQ6LFJlDTMNmQ7Cb7L8TJLC8xDspW2+DqiOM162vS8ycuf sc2GLgya8FPMzCxLKmJnxGv1i6U5o6Tmittzr7+0N645eQlgv/qfPOVoJZMRuXZC47VZ 5kj30d5Qf3IP2Yjm0zDLolPKEjvMaFVJrJimmgeFr0dX253AFBuP7bKbNe8LLWEiUdyL HiVYMSkmFvCJXjg8sPCm5UZ0fXu1QWBzTPLj/9iYaOzHxqoh3UXmlWi0g61vnQx5pO1t AdoUK+PFySBwlgq5rjm/hQY66LR9gV+n7uZy5Jh+CwGllN/yRdSBX58RAvYHRHptxwzl djEQ== 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=2Hn380gyJMXSAZnWp6tqupVrVo1bsNBnBMgFvWg56EI=; b=X0Y42p0EQm1/94TRjRoIxm1pvoStHyUTueWRYZbBgHm23BNtkvxTQrO+9nb42ZUg3u 7RU1e3luJtKnZBQ4ulBDx7Wne+y8r01S45hNYQpShNhkewrPEaXQ/uwLxGEdUA4UxHzR j+iwcP+ZPbuqLT4FrfujM6A12m9q9U9/JFlegCO4+I0k+cmDob2K9fBWqC6+JVToWUei hHSCqs4hwUSO5fAYmJPsRumOx+SJ7xv4amYhaFgKHZXJZW48cLKs3DCofJi+MfY1jjN5 m6N0AjiQeo/OwetS3IyEjtgIfrlk/4Illhw++MXYX9HZPYl70IraNQ8tyfEcnydp54uv 20IQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=nGNPygdr; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p3si11025741edr.444.2021.06.14.03.44.16; Mon, 14 Jun 2021 03:44:38 -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=@linuxfoundation.org header.s=korg header.b=nGNPygdr; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234178AbhFNKoX (ORCPT + 99 others); Mon, 14 Jun 2021 06:44:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:45360 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232890AbhFNKhz (ORCPT ); Mon, 14 Jun 2021 06:37:55 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E57006141D; Mon, 14 Jun 2021 10:33:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1623666827; bh=Sobkwd88iPtaxvWm9n4sImcEYD/egDZ6/XK/oOI2Dzw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nGNPygdrNVGJ3g2Qplo6q7lu2ethWu52rvtxyrhaKRExybGOojuqaPYvqOt3K1B9N iYC6nuszK2kizu1O/IMnpcpnNmzXZzBQqGIxV1ODR+3zcuUlSevNL4aNj3a3B3MYUE QkqOZ+PnpCNzRDggXUEGQUg7/5JldJ4Bpzp425h0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dai Ngo , Trond Myklebust Subject: [PATCH 4.14 44/49] NFSv4: nfs4_proc_set_acl needs to restore NFS_CAP_UIDGID_NOMAP on error. Date: Mon, 14 Jun 2021 12:27:37 +0200 Message-Id: <20210614102643.301107014@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210614102641.857724541@linuxfoundation.org> References: <20210614102641.857724541@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: Dai Ngo commit f8849e206ef52b584cd9227255f4724f0cc900bb upstream. Currently if __nfs4_proc_set_acl fails with NFS4ERR_BADOWNER it re-enables the idmapper by clearing NFS_CAP_UIDGID_NOMAP before retrying again. The NFS_CAP_UIDGID_NOMAP remains cleared even if the retry fails. This causes problem for subsequent setattr requests for v4 server that does not have idmapping configured. This patch modifies nfs4_proc_set_acl to detect NFS4ERR_BADOWNER and NFS4ERR_BADNAME and skips the retry, since the kernel isn't involved in encoding the ACEs, and return -EINVAL. Steps to reproduce the problem: # mount -o vers=4.1,sec=sys server:/export/test /tmp/mnt # touch /tmp/mnt/file1 # chown 99 /tmp/mnt/file1 # nfs4_setfacl -a A::unknown.user@xyz.com:wrtncy /tmp/mnt/file1 Failed setxattr operation: Invalid argument # chown 99 /tmp/mnt/file1 chown: changing ownership of ‘/tmp/mnt/file1’: Invalid argument # umount /tmp/mnt # mount -o vers=4.1,sec=sys server:/export/test /tmp/mnt # chown 99 /tmp/mnt/file1 # v2: detect NFS4ERR_BADOWNER and NFS4ERR_BADNAME and skip retry in nfs4_proc_set_acl. Signed-off-by: Dai Ngo Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman --- fs/nfs/nfs4proc.c | 8 ++++++++ 1 file changed, 8 insertions(+) --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -5294,6 +5294,14 @@ static int nfs4_proc_set_acl(struct inod do { err = __nfs4_proc_set_acl(inode, buf, buflen); trace_nfs4_set_acl(inode, err); + if (err == -NFS4ERR_BADOWNER || err == -NFS4ERR_BADNAME) { + /* + * no need to retry since the kernel + * isn't involved in encoding the ACEs. + */ + err = -EINVAL; + break; + } err = nfs4_handle_exception(NFS_SERVER(inode), err, &exception); } while (exception.retry);