From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3162B1DF97C; Tue, 8 Oct 2024 13:24:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728393849; cv=none; b=rx6UCWUfp7ZaVK5W2TqTxe0NZ8ao+lIRhGCXZ5F+GKAXyqR3ZSLIRrVTpiIxjd+j1IxDSoIGkx+K9sjw4mZ4gtTZLIGSJC2jiQEzWK3XWnEd2vvjAIvhunNvEnsjeerD43F7/ha5jUc9Gag9RYerVadKuJqSWNl+nommh2AXLrk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728393849; c=relaxed/simple; bh=kQLz5t9MyFDpcMYKi9PJ1pdtaMZyYekf0hoJ1Vp9QMA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aqWllRr8BpJH4eryD7XSSUgZQXv1vUTAxfWs15dLYV0FKiNE2baRnLmwU0XJpCpJbK4oZbpaYaqQ5SlBOs/QsNhfuw144/dDuWPZ1thidQjoH9UceME6jO+U0lOXYoxYHQXkLBKyRlZTMhvURnjS+rHs23KVTQgJM3O5BmnvOM4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ta2WvFkT; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ta2WvFkT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8DD08C4CEC7; Tue, 8 Oct 2024 13:24:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728393849; bh=kQLz5t9MyFDpcMYKi9PJ1pdtaMZyYekf0hoJ1Vp9QMA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ta2WvFkTU7jw1E1XylOKAdodVgLKjYutwI8cip1SAYQ7jE0z9MMOZX/HjhhwyKBpz i4HZHrub4BDlpKdzpzNQehHQZ0zNbsKJRgSRJBvnuATvQqTukRhFiTggwR3ttxVxur LvQRF2Eai0iVrFxpZ1sZGkE5aoFL53XkRCY80aXE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Cedric Blancher , Dan Shelton , Roland Mainz , Chuck Lever Subject: [PATCH 6.6 274/386] NFSD: Fix NFSv4s PUTPUBFH operation Date: Tue, 8 Oct 2024 14:08:39 +0200 Message-ID: <20241008115640.173828962@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241008115629.309157387@linuxfoundation.org> References: <20241008115629.309157387@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chuck Lever commit 202f39039a11402dcbcd5fece8d9fa6be83f49ae upstream. According to RFC 8881, all minor versions of NFSv4 support PUTPUBFH. Replace the XDR decoder for PUTPUBFH with a "noop" since we no longer want the minorversion check, and PUTPUBFH has no arguments to decode. (Ideally nfsd4_decode_noop should really be called nfsd4_decode_void). PUTPUBFH should now behave just like PUTROOTFH. Reported-by: Cedric Blancher Fixes: e1a90ebd8b23 ("NFSD: Combine decode operations for v4 and v4.1") Cc: Dan Shelton Cc: Roland Mainz Cc: stable@vger.kernel.org Signed-off-by: Chuck Lever Signed-off-by: Greg Kroah-Hartman --- fs/nfsd/nfs4xdr.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -1246,14 +1246,6 @@ nfsd4_decode_putfh(struct nfsd4_compound } static __be32 -nfsd4_decode_putpubfh(struct nfsd4_compoundargs *argp, union nfsd4_op_u *p) -{ - if (argp->minorversion == 0) - return nfs_ok; - return nfserr_notsupp; -} - -static __be32 nfsd4_decode_read(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u) { struct nfsd4_read *read = &u->read; @@ -2345,7 +2337,7 @@ static const nfsd4_dec nfsd4_dec_ops[] = [OP_OPEN_CONFIRM] = nfsd4_decode_open_confirm, [OP_OPEN_DOWNGRADE] = nfsd4_decode_open_downgrade, [OP_PUTFH] = nfsd4_decode_putfh, - [OP_PUTPUBFH] = nfsd4_decode_putpubfh, + [OP_PUTPUBFH] = nfsd4_decode_noop, [OP_PUTROOTFH] = nfsd4_decode_noop, [OP_READ] = nfsd4_decode_read, [OP_READDIR] = nfsd4_decode_readdir,