Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Chuck Lever III <chuck.lever@oracle.com>
To:     Bruce Fields <bfields@fieldses.org>
CC:     Dai Ngo <dai.ngo@oracle.com>,
        Linux NFS Mailing List <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH] NLM: Remove svcxdr_encode_owner()
Thread-Topic: [PATCH] NLM: Remove svcxdr_encode_owner()
Thread-Index: AQHXqy2WsD0fmjmgOUmW4+O/YnSBBquwO3mAgAAAXgA=
Date:   Wed, 22 Sep 2021 15:47:09 +0000
Message-ID: <7533B3B6-9128-4380-8209-6365F5DAF079@oracle.com>
References: <163181894199.1110.356714948732645250.stgit@bazille.1015granger.net>
 <20210922154549.GB22937@fieldses.org>
In-Reply-To: <20210922154549.GB22937@fieldses.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?nskUIvKsxeCvdGVGYTvaoMGkC30WRTKFjWFC8e47DBOkr7qA/gOb5/O/Vjzj?=
 =?us-ascii?Q?LXjswlWJc6NtrHoVaPSaaXuzsvqzpjt+YyGo+YSEOQ7UR3uggv9/5C3PEB5L?=
 =?us-ascii?Q?Oa1p0NKTFPmgn0fo35mzdWOLfEjRdP9YadaMF1m1q584NuxbnhO1wO145ceT?=
 =?us-ascii?Q?uuyUNaK7dkb/SHgYLKNoowO8tVh6sz2ew6Ben6KNQoI+xd8xur0QBU5mwRtg?=
 =?us-ascii?Q?VfA7obKDlj04Ui5uxo+GD1lsgP2+CXrRnXsK3/kIpTW05kJm5b7/bEnRk6Kd?=
 =?us-ascii?Q?jrcm6kPB6iFbRQ7HjLMyDpOJIWrYgHzhS6GEsuyOhuReFZbdT9/fWEb5MUrT?=
 =?us-ascii?Q?70Y1F0n7xQCTmWw7zBvlmg4CQGgAvV+7lZoBFX3cnGePf4h2SnTJXGEpjANo?=
 =?us-ascii?Q?rvBd7MabFnJuq6SNLi2VP8DigYajxGgawWuAUtc72RILp4ORc8psi1lKDNaT?=
 =?us-ascii?Q?w3cYVHB49ZCgjaTcjv4j8dM5TYkMtNUMpsYsmgR8+Ppsy1zyp2+NVPrBfk38?=
 =?us-ascii?Q?UyKOkTTPOKGJ4pu2mXGYtyTpPv5cRvbryO0yV5cmOFp5L9OrO2vOH8mEZPiq?=
 =?us-ascii?Q?tx+HI0bt9gzQS0UJzZes8sZT2cdQjMO6HoeQ0suLlyFvnASuWHVapGcN1tHZ?=
 =?us-ascii?Q?U1t31z6ytQN0krwiIlzdgty61+Obc3mB323he3rScFKvfvjzYI54Q8Z8E7+B?=
 =?us-ascii?Q?sWzLcIvUibbnJOF8Ir6/sbAaEUG1x8q0kdfe+xOYSk9Rnwmrdxmr9MFY26Xs?=
 =?us-ascii?Q?MVoLbS5ZOxHiSUxiL05tnmC5WsgWhLpU1P/fUSq2kYm2sKlibFt9FW5ajTAa?=
 =?us-ascii?Q?veN253ojvnSjb8gODZwLUSHv7Vq/BPAoYVg3G5RusG16eP5+nTnuifh0+CwM?=
 =?us-ascii?Q?QB0x+S5AfXPc+H2/4GWh2p5hCzrgTlFeMppNIY7Jkvw1qbR7OkP3ldfYvC6c?=
 =?us-ascii?Q?9WeRFq3IoGSH065djohzfKtDy0rdgI4fC6DISgVWWZaJD0IV37xuICq7uxwU?=
 =?us-ascii?Q?wlZ4A/8FQSpX7QxcSr8AOqYCDuqC5wWPx5mgHk1BDuzRNIRGnFgsPFZTgZvI?=
 =?us-ascii?Q?aX1wCxu8JLfKPnQNDLe7mCc/wB/PYzTLjYWduEl9qMzjh0FP8z/uxl1bXSrA?=
 =?us-ascii?Q?tLaAw4XgwrdbMm7Qs8d2dDKDg9fgOOLziRvzDiAe9NPrmvAewWgHQTeKgsOi?=
 =?us-ascii?Q?x90iWIVMXmNXywzcV3MxA/9z2ysA953IiAl4WQ7sYqJhMuWeOZXUUrfcmz4X?=
 =?us-ascii?Q?Axpxw8ZAeIERFot/59YL3zlGVXsFJBcGHQJ8fHx1SwDE8S0LFPJq2Ny71yu+?=
 =?us-ascii?Q?MEPbJcT88jzZoJJR66UYvvei?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <94655AAA9319BF489BF9FCC3B7063792@namprd10.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4688.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: be1cb471-6ced-4c25-dcbc-08d97de03cbd
X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Sep 2021 15:47:09.3872
 (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: IFRydpYxqd5ZguBYHPCIoHDM25qnJy+/xkF5nBs6LmOdhDs5oJ1TqIGPm22vDeJa1f7FDHSJS6c2T2RCahLthA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4210
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10115 signatures=668682
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 suspectscore=0 bulkscore=0
 malwarescore=0 mlxscore=0 mlxlogscore=999 spamscore=0 phishscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109200000
 definitions=main-2109220110
X-Proofpoint-ORIG-GUID: nWQofEW711M1WJGnZzWcLvM2jBVNHa0_
X-Proofpoint-GUID: nWQofEW711M1WJGnZzWcLvM2jBVNHa0_
Precedence: bulk
List-ID: <linux-nfs.vger.kernel.org>
X-Mailing-List: linux-nfs@vger.kernel.org


> On Sep 22, 2021, at 11:45 AM, J. Bruce Fields <bfields@fieldses.org> wrot=
e:
>=20
> On Thu, Sep 16, 2021 at 03:03:32PM -0400, Chuck Lever wrote:
>> Dai Ngo reports that, since the XDR overhaul, the NLM server crashes
>> when the TEST procedure wants to return NLM_DENIED. There is a bug
>> in svcxdr_encode_owner() that none of our standard test cases found.
>>=20
>> Replace the open-coded function with a call to an appropriate
>> pre-fabricated XDR helper.
>=20
> Makes sense to me.  I assume you're taking this for 5.15.--b.

Yes. I'm just finishing up testing for the next -rc PR.


>> Reported-by: Dai Ngo <Dai.Ngo@oracle.com>
>> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
>> ---
>> fs/lockd/svcxdr.h |   13 ++-----------
>> 1 file changed, 2 insertions(+), 11 deletions(-)
>>=20
>> This might be a little better for the long term. Comments?
>>=20
>> diff --git a/fs/lockd/svcxdr.h b/fs/lockd/svcxdr.h
>> index c69a0bb76c94..805fb19144d7 100644
>> --- a/fs/lockd/svcxdr.h
>> +++ b/fs/lockd/svcxdr.h
>> @@ -134,18 +134,9 @@ svcxdr_decode_owner(struct xdr_stream *xdr, struct =
xdr_netobj *obj)
>> static inline bool
>> svcxdr_encode_owner(struct xdr_stream *xdr, const struct xdr_netobj *obj=
)
>> {
>> -	unsigned int quadlen =3D XDR_QUADLEN(obj->len);
>> -	__be32 *p;
>> -
>> -	if (xdr_stream_encode_u32(xdr, obj->len) < 0)
>> -		return false;
>> -	p =3D xdr_reserve_space(xdr, obj->len);
>> -	if (!p)
>> +	if (unlikely(obj->len > XDR_MAX_NETOBJ))
>> 		return false;
>> -	p[quadlen - 1] =3D 0;	/* XDR pad */
>> -	memcpy(p, obj->data, obj->len);
>> -
>> -	return true;
>> +	return xdr_stream_encode_opaque(xdr, obj->data, obj->len) > 0;
>> }
>>=20
>> #endif /* _LOCKD_SVCXDR_H_ */
>>=20

--
Chuck Lever