Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Chuck Lever III <chuck.lever@oracle.com>
To:     Jeff Layton <jlayton@kernel.org>
CC:     Linux NFS Mailing List <linux-nfs@vger.kernel.org>,
        Neil Brown <neilb@suse.de>
Subject: Re: [PATCH v2 1/2] nfsd: allow nfsd_file_get to sanely handle a NULL
 pointer
Thread-Topic: [PATCH v2 1/2] nfsd: allow nfsd_file_get to sanely handle a NULL
 pointer
Thread-Index: AQHZIeRLNKn8Ix6QSUa8Oo0IIf+ULa6U7F6A
Date:   Sun, 8 Jan 2023 19:33:25 +0000
Message-ID: <77443457-3991-463B-B7F1-0F361183B45B@oracle.com>
References: <20230106153348.104214-1-jlayton@kernel.org>
In-Reply-To: <20230106153348.104214-1-jlayton@kernel.org>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?J1NQdbklQcPzcToHx7lnKzNAtkV+aLAdehm925+GZs0Sj11MeZkG1La94ytF?=
 =?us-ascii?Q?inisbMGMstKt2A4KXV79A+HF1X0GBs9cWOMnx89zbPFjlJhipIsRD6lRv5aP?=
 =?us-ascii?Q?z+GB0tp7xB7eEQ1hTMkTmHfyCjUOWdulAgWfcyzvG7FF1/2jyYLcXeVj8X5t?=
 =?us-ascii?Q?A49RtsR/orTGlroJ+zLbCo9Z89Q0nrn/EB0BLqZVSfXmfcTGtadhpGBcObTt?=
 =?us-ascii?Q?/si7F8TavK/kqOaMNpy3Qes5GwiXpkfLSMtviwxyXQRiGg51IsKZGq5ZIFh+?=
 =?us-ascii?Q?RFyL3GvF3xGiAuceFvg4SdDAA1oLCSYC6xojCKvxJ1VnYF2auJ5utagkH3JC?=
 =?us-ascii?Q?8IdByvSl7ubrVJBWPFwmHRjYUand7lkSS9Fo/6JtxUhjwX05bF407/UGjAiX?=
 =?us-ascii?Q?rvS52lp5ZpMD/M0FdyGqUHyQ69Qpxd1stKc1samz117yFGP+AorJ0zF1wsZ3?=
 =?us-ascii?Q?j84rhlg75iZOI5yy344UHJTztCmw86wIEbRdXV1CWMiC1y8/4DTDTc17y0kU?=
 =?us-ascii?Q?5xwROE8as3jjhSUcFSppov+Ipy59x77aODfSMBjKKM/8stocoDsxyLhcBUO9?=
 =?us-ascii?Q?4W0rIvDNhugd+Uadl5uz75G7Kge6IU1XPVnTY6BV0TW7r9YqKiLWBS6HgS6k?=
 =?us-ascii?Q?RZTy8GVrMCmM3Z7MmAbTw6UwTOHPZzPYsA452M+JZJnaPiRlxjviEqL/Mifw?=
 =?us-ascii?Q?XM1OHdychWl2l2Pwb2S7z9/7G1mqitQx5c0b8Z07W32QxGF+U140ZQiyA7cC?=
 =?us-ascii?Q?kzQi+nRESMufrhCGM0IXmmacGYM8ooaMnIvPeTrCbQjwL+HHLOGWFoXeDGlU?=
 =?us-ascii?Q?Cx5UTer0za4G7yArMGJeXGsD/T7Q+oasJSu9217mEV0/3nbogvGjGWXESQwP?=
 =?us-ascii?Q?fcGYW/hzW9NDMGe3dYwGQ+ZXZX+DtGpS0FrabNQaAC2CRk8qwGo1MjwS9LuW?=
 =?us-ascii?Q?2u6pwxXlAdHs6NKdeIfsCPHYenknHrqa/ke7ZtPzGZ4ZDvHNCekCdiaakRVq?=
 =?us-ascii?Q?qSZsR5fncivoPiO1a8MsoIvmvdI2W4GG5rEQCgXPRHptLUjIUoVFGSZLVq9A?=
 =?us-ascii?Q?n8uirkDZcd+erqc03V0jpwhDRgX0IyBtq7zkAXYwE9A/0DadXBrBnjxb6pls?=
 =?us-ascii?Q?OvLZt6x2pPkzZ/HDWDmb7lHZyTLbPRocT0VeNbbsHNWlhpl0IhQVfBwqobRE?=
 =?us-ascii?Q?8bXJM0WhQy0SS/K5MUADevCt4yPI9u/kc54xbg4yFZpI3r8Nhu4GjaeWVigh?=
 =?us-ascii?Q?k8Yeg5oR8dlk+x7mZ7lhNDR/HbyYaHKeRWpQ3d24nklGTWsPwnSRYUtU1pXn?=
 =?us-ascii?Q?tZFfHG3cj5lGKkRZCfJdTPgFKLmPt6qqsxWhNiebTwh5k2DKAknsYUgYUu9T?=
 =?us-ascii?Q?ib2VhE1+4X8Ytr8MC4SPOwbzWqzUA3HCov0URLNfr8Y/84354IqsNOjaXcfo?=
 =?us-ascii?Q?XyqFs5L+H1EOgKbSOf7qfbcIx0WLPm9VoJfQ3EtL2HuliFD1DKJxMalhqmi8?=
 =?us-ascii?Q?GUO/fMhCyOtywW3QVXjBamIN6dPsAaQL6/k9vntMDdPpfZTdTWGu3mB+xT5Y?=
 =?us-ascii?Q?JLmWBAmwj1yQ+qGSu3GtdxYytmEo7682q2AKWskmtVEfVfcjU98MVlIElanT?=
 =?us-ascii?Q?Ew=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <4BC46BAEF9A31A49ACA423752CDDDCD1@namprd10.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: I4tv9jg5NEh5m0+0FvjCcphN86yn3xqOA7oiKew5l+8J1kcqr8CSol6xtjuDdV97ndYLz4gsUnEPJ8e6Hkk/qPE4dA01jmNR5OTGScwprbsbMT6t9uuEY/m82KYE0V1JVW2YhaArdczLPAItf5i19Cn5mSJOMzvNcDrXlerZmfwuBGbvD2SRvBSgV5/BlOWL53yvrf8/q4KbcOtxvEnI5HXQyPAUjGywcn4QIgDWrabkg7HKQikGxiJM+TsWvGVP9/nmWya44DRMiQLv+IW2T+i5gj1cgLVdfi2rFr5Yo5pkwMzEYl9cgum//XFxbJtaMupm88Zz2tHTJYK4gBQ73Gd7s/vxWFKHhEM6eA1jZgkKT2aeBIzeANuGKKOkkkap0iRAHTwCK5FladHFuBRIGc3oG5P+Ac2XXvwZTAd2KF3V9IRQ4PK0WtJWU/o7m1pHhxvjzZ7yvEq6M5DPfQII5lshuVpx71TZpClYqaEOihSEA2c0GXCRMqECOUAi9nUdj/vtWPS2sxOdMqU1eE+wKDxr4ABtVyqzECOmkS+FGyD8/ivICBjOydLaENSrSrwcjzT8+r+XR3cPhwT/ulavMqUdDROyTVOoggQbbX+2jmmf1a9WdpvenEP9fLa7t2ay/kCRvzERHKqLJH+VKFu19t62SqCWNBiT9LWCAcuErJEowrLAqRTN5+q7VQPxzGHzPA04n8QvSh4k86i4vkzGaEzPUz2maFNpjOQ0z6hWoK9o96/owU0zmCmMDettiV6/+t62WdNj14IxvL2WFdXwFNGMyS+eMPPNWFPHXfwlRA4fWB5ZBx7glAtm7ZSWJu0Z
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB5128.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d37ab7db-404a-40eb-13a3-08daf1af3661
X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Jan 2023 19:33:25.9624
 (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: YL0zlLrZiIpbF67jdsJCSRK5YnSOaNbP5KXF1Yw7Klbd88Z2TQ/QTvepIUBcZgs7wdFku0zie/RZm79p2lKg4g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB7148
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2023-01-08_15,2023-01-06_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 suspectscore=0
 malwarescore=0 mlxscore=0 adultscore=0 spamscore=0 bulkscore=0
 mlxlogscore=842 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2212070000 definitions=main-2301080145
X-Proofpoint-ORIG-GUID: 92OdTEGbUgItUrTDwwwlj7wW-g__qpDR
X-Proofpoint-GUID: 92OdTEGbUgItUrTDwwwlj7wW-g__qpDR
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-nfs.vger.kernel.org>
X-Mailing-List: linux-nfs@vger.kernel.org


> On Jan 6, 2023, at 10:33 AM, Jeff Layton <jlayton@kernel.org> wrote:
>=20
> ...and remove some now-useless NULL pointer checks in its callers.
>=20
> Suggested-by: NeilBrown <neilb@suse.de>
> Signed-off-by: Jeff Layton <jlayton@kernel.org>
> ---
> fs/nfsd/filecache.c | 5 ++---
> fs/nfsd/nfs4state.c | 4 +---
> 2 files changed, 3 insertions(+), 6 deletions(-)
>=20
> diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c
> index 0ef070349014..58ac93e7e680 100644
> --- a/fs/nfsd/filecache.c
> +++ b/fs/nfsd/filecache.c
> @@ -452,7 +452,7 @@ static bool nfsd_file_lru_remove(struct nfsd_file *nf=
)
> struct nfsd_file *
> nfsd_file_get(struct nfsd_file *nf)
> {
> -	if (likely(refcount_inc_not_zero(&nf->nf_ref)))
> +	if (nf && refcount_inc_not_zero(&nf->nf_ref))
> 		return nf;
> 	return NULL;
> }
> @@ -1096,8 +1096,7 @@ nfsd_file_do_acquire(struct svc_rqst *rqstp, struct=
 svc_fh *fhp,
> 	rcu_read_lock();
> 	nf =3D rhashtable_lookup(&nfsd_file_rhash_tbl, &key,
> 			       nfsd_file_rhash_params);
> -	if (nf)
> -		nf =3D nfsd_file_get(nf);
> +	nf =3D nfsd_file_get(nf);
> 	rcu_read_unlock();
>=20
> 	if (nf) {
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index 4809ae0f0138..655fcfec0ace 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -602,9 +602,7 @@ put_nfs4_file(struct nfs4_file *fi)
> static struct nfsd_file *
> __nfs4_get_fd(struct nfs4_file *f, int oflag)
> {
> -	if (f->fi_fds[oflag])
> -		return nfsd_file_get(f->fi_fds[oflag]);
> -	return NULL;
> +	return nfsd_file_get(f->fi_fds[oflag]);
> }
>=20
> static struct nfsd_file *
> --=20
> 2.39.0

Hi Jeff-

I've applied v2 of 1/2 and 2/2 to nfsd's for-next.

--
Chuck Lever