Received-SPF: pass (google.com: domain of linux-nfs+bounces-2361-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Sun, 17 Mar 2024 11:09:49 -0400
From: Chuck Lever <chuck.lever@oracle.com>
To: Jeff Layton <jlayton@kernel.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>,
        Christian Brauner <brauner@kernel.org>, Jan Kara <jack@suse.cz>,
        Alexander Aring <alex.aring@gmail.com>,
        Trond Myklebust <trond.myklebust@hammerspace.com>,
        Anna Schumaker <anna@kernel.org>, Steve French <sfrench@samba.org>,
        Paulo Alcantara <pc@manguebit.com>,
        Ronnie Sahlberg <ronniesahlberg@gmail.com>,
        Shyam Prasad N <sprasad@microsoft.com>, Tom Talpey <tom@talpey.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        "Rafael J. Wysocki" <rafael@kernel.org>,
        David Howells <dhowells@redhat.com>, Tyler Hicks <code@tyhicks.com>,
        Neil Brown <neilb@suse.de>, Olga Kornievskaia <kolga@netapp.com>,
        Dai Ngo <Dai.Ngo@oracle.com>, Miklos Szeredi <miklos@szeredi.hu>,
        Amir Goldstein <amir73il@gmail.com>,
        Namjae Jeon <linkinjeon@kernel.org>,
        Sergey Senozhatsky <senozhatsky@chromium.org>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>, linux-fsdevel@vger.kernel.org,
        linux-kernel@vger.kernel.org, linux-nfs@vger.kernel.org,
        linux-cifs@vger.kernel.org, samba-technical@lists.samba.org,
        netfs@lists.linux.dev, ecryptfs@vger.kernel.org,
        linux-unionfs@vger.kernel.org, netdev@vger.kernel.org
Subject: Re: [PATCH RFC 11/24] nfsd: allow DELEGRETURN on directories
Message-ID: <ZfcHvSEkwIS8-Ytj@manet.1015granger.net>
References: <20240315-dir-deleg-v1-0-a1d6209a3654@kernel.org>
 <20240315-dir-deleg-v1-11-a1d6209a3654@kernel.org>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240315-dir-deleg-v1-11-a1d6209a3654@kernel.org>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?NmHMpqVcOqIjMGjXp8h8PEsv/PStyp2qg+/sFgwQVHVfvOrcBIH589TZjX5m?=
 =?us-ascii?Q?Fw8vJn6QfgQWodsu9+aZ4Gl9SLcRLcSgeJ/n/MCbZgWy0Xf0lkos/+9iOjxH?=
 =?us-ascii?Q?UQf5xXUqghHfxpz+gvWEurJZx+M3iv2/aBoh193KUkMYibXVDzH9he/7iD7f?=
 =?us-ascii?Q?KWBHkH43ypVAlz6+uOHq7/Ex3NGtPL0T553lEUMC8JbQleQVNVr8K+WTPcxg?=
 =?us-ascii?Q?SrJJx3m0IzBA/L22O4R/SsMnQ7Fu34xLSORBLGqA4QHMZ4ESBhpMv8NE7MMR?=
 =?us-ascii?Q?yRAqMo4688uOIYOCw9yjJdYPiBffCgvZFGr85uXHHLBTPkmnnA5PClhYvPhA?=
 =?us-ascii?Q?nE7IyMxqpupzX3zUUfAnZGAJ3ve/8kOsl2qxWDtet5sGSOz24ir1E4TVQkFD?=
 =?us-ascii?Q?Qvg+anNW0AQhmDqAcoRUj5A7ZlYTj5AmC+fg5pkoWVz3P6JFuLMY/M8RkRFB?=
 =?us-ascii?Q?LZE9Ymrat2F3c+4Np4KUEirDdkioW0fvyFkt0fGHjULX9gzPMXvScsiWGRER?=
 =?us-ascii?Q?MYMBLNY19lQrfd15ArU/1zHm8iOyysylv4RW6xCvUM0LGbxiVmQuh4XUxKOE?=
 =?us-ascii?Q?YO02/i4AlqyrnekvZdj7WehW+B3vFOVmMHG5v5HBeqV1f6dDVkPvQaRv+Rgt?=
 =?us-ascii?Q?1XqOEnLXpb1/nFKSCOCAOVhjR74eLIqi418MPR2+knO7S5CB8WHQik3osv6T?=
 =?us-ascii?Q?VTflQQTZaVkh4aUN6k0l6mtbQalFYppcmq/mtHxC8g9nBoUW7ekJxp4w2IcK?=
 =?us-ascii?Q?O2RxNM90RCeB/3aTVDblhfz5QkajRQnGLNsgLRvNfnI0924rZ0QD0rDZTNKV?=
 =?us-ascii?Q?SuBN5ANgr1/q8ThS6m+HeJ81ziAWslrdBc7jnEql/keTf87Nn0Q91kuhHClo?=
 =?us-ascii?Q?lMx9BuY45DP8mlhTYsbKp/LbKqlMmGcdup6x4lhhK1GSG8+2DxqlivrH4fYr?=
 =?us-ascii?Q?vMfEX6uTlbDL7gqeWeLTL8VHStmCKAB3T57+5UwkFS5l52jBQ5noFqCurUm7?=
 =?us-ascii?Q?Ndw0h0bEK2YE4jAa8cH5Fkd421yEOZ8wo0e3b6ehy/MSNrpJPWA+Fxq6r5Th?=
 =?us-ascii?Q?DrQxKdrQ1/Phzz7XTIA3p6Az4hOEqxfHBen0gr/0A6++VBHtciQ77UtZCdSC?=
 =?us-ascii?Q?12SJfKr25ShqWJusVcKe2XUze0o90IsZDbe1vLA7SKTCclSBlT3fa1xsHSfJ?=
 =?us-ascii?Q?vSln4pfjdvrvZam6kzeyYDQ9uCfn8iPwB547O9HixHFFwh3nGS+OAOmeDLTq?=
 =?us-ascii?Q?cKOLJX3TuNgYCpEl+O9QrIKhxc6KlCOMkMBCLFpW8iJyWHmKZpmRlxTv/VZ4?=
 =?us-ascii?Q?XUIuvfQ1rdZj13s8/hS1u40WXbJFHdMm+2f/OdIRO7b4jbKrTLoC58W+4WiT?=
 =?us-ascii?Q?hvld3YTAcoFP6o10WGFClvm8MBUzlzsuHy1+PVVtaZjdr2gPeHiWHQxHFyOJ?=
 =?us-ascii?Q?0o7gXy6kuK5lgrx50x4zwY0TwrsV29e/8fNl6JWdos+cVcNG+LwtZ6NNHtsi?=
 =?us-ascii?Q?BekcCVa2ybJ9DQe6EEt3qumjVQnSLPZ87N2LNtQ9gv3n9mbbUR9Ceyu8lW3q?=
 =?us-ascii?Q?ymo0KLDMdLrMuIqzQv+6g+daGHtjUbIJNX++mOCk5/AYB5peHr35k6e5EayH?=
 =?us-ascii?Q?HQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	tevoBGrYrou3a4eKmxBZVfchHZa/iolMyzNzY1DPtFuQZmXTXM4o/4IZuHegRq+6xER2JszhwDyaUyPTbfUg/OYOp5qf/3DQH2IZAcdbYkR1Q3sPN12XNHsqdx98Wb3DewYvKwrHS3D6Gw6G1XNbWF4FsMEdFeCHMf9Z881+UVHQ9hbPbxXCzF6WRlvFqy9tEenl4uGe0qQI4vepDw3BNzxg9GN+BbwePfPVZtF0Sjy7ROBMNXG75siUiLczMBqp8M/fXLP36voRHD50qRhwnF1W8uPvC1TT3HbyOhTxhSaqpT64rOpVx/2US32mEK/+v1LFm3sKGlbjqrymvO13s9JWeIrn7BIQdAwVGRZzTc/3jDrJAwJl2gxyWc4j+RaZ9qZS6f76Cr4hD1flk1TdVh8cO6dBtft1y8DaQ79DjcxTMAT2gMJlKzuJaoUk+2THIF3CEUPNsP8pwjnTI7Tnaa1xreeOkbsWMg3VdXilOGTfW/VUA6NszDcnOBwqTTKc1m3SymOFXx8bSC9LYTA5hugBo6PXNW0zhntq8Df+fG6w/oPYf6k3XxNW0/Al72RUtNU1eQHhQwGpKL+PUjB9x7k0SWaDhW4CGhEXKJbQ+mo=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 668b0b96-448c-4709-af6d-08dc46944fc5
X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB5128.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2024 15:09:58.8217
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: pjZMNjmtVJQMcWAISn4khALxx/uNz44W7OA68VFkPzHI22T1NvJN3/+MUnj+gDHkbM4rVfqRc6EOwhcBze3sEg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB6614
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-03-17_10,2024-03-15_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 adultscore=0 mlxscore=0
 bulkscore=0 mlxlogscore=806 suspectscore=0 phishscore=0 spamscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2403140000
 definitions=main-2403170119
X-Proofpoint-GUID: 37GOpg1u5-XBiubg3a2vHlbPgPXgJDJZ
X-Proofpoint-ORIG-GUID: 37GOpg1u5-XBiubg3a2vHlbPgPXgJDJZ

On Fri, Mar 15, 2024 at 12:53:02PM -0400, Jeff Layton wrote:
> fh_verify only allows you to filter on a single type of inode, so have
> nfsd4_delegreturn not filter by type. Once fh_verify returns, do the
> appropriate check of the type and return an error if it's not a regular
> file or directory.
> 
> Signed-off-by: Jeff Layton <jlayton@kernel.org>
> ---
>  fs/nfsd/nfs4state.c | 14 +++++++++++++-
>  1 file changed, 13 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index 17d09d72632b..c52e807f9672 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -7425,12 +7425,24 @@ nfsd4_delegreturn(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
>  	struct nfs4_delegation *dp;
>  	stateid_t *stateid = &dr->dr_stateid;
>  	struct nfs4_stid *s;
> +	umode_t mode;
>  	__be32 status;
>  	struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);
>  
> -	if ((status = fh_verify(rqstp, &cstate->current_fh, S_IFREG, 0)))
> +	if ((status = fh_verify(rqstp, &cstate->current_fh, 0, 0)))
>  		return status;
>  
> +	mode = d_inode(cstate->current_fh.fh_dentry)->i_mode & S_IFMT;
> +	switch(mode) {
> +	case S_IFREG:
> +	case S_IFDIR:
> +		break;
> +	case S_IFLNK:
> +		return nfserr_symlink;
> +	default:
> +		return nfserr_inval;
> +	}
> +

RFC 8881 Section 15.2 does not list NFS4ERR_SYMLINK among the
valid status codes for the DELEGRETURN operation. Maybe the naked
fh_verify() call has gotten it wrong all these years...?


>  	status = nfsd4_lookup_stateid(cstate, stateid, SC_TYPE_DELEG, 0, &s, nn);
>  	if (status)
>  		goto out;
> 
> -- 
> 2.44.0
> 

-- 
Chuck Lever