Received-SPF: pass (google.com: domain of linux-kernel-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:     Christophe JAILLET <christophe.jaillet@wanadoo.fr>
CC:     Jeff Layton <jlayton@kernel.org>,
        Bruce Fields <bfields@redhat.com>,
        Scott Mayhew <smayhew@redhat.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        "kernel-janitors@vger.kernel.org" <kernel-janitors@vger.kernel.org>,
        Linux NFS Mailing List <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH v2 1/3] nfsd: Fix a memory leak in an error handling path
Thread-Topic: [PATCH v2 1/3] nfsd: Fix a memory leak in an error handling path
Thread-Index: AQHYvcN+p7gwXmsrPEWOSmDIsKimnq3KbmsAgABUtwA=
Date:   Thu, 1 Sep 2022 16:24:39 +0000
Message-ID: <45CAC18F-1FEE-422F-B9B8-4B49261713B5@oracle.com>
References: <14d802144c88da0eb9e201b3acbf4bde376b2473.1662009844.git.christophe.jaillet@wanadoo.fr>
 <5c5d87f8329e44275bda36657be4de2390f065d4.camel@kernel.org>
In-Reply-To: <5c5d87f8329e44275bda36657be4de2390f065d4.camel@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?l0tl9Z3pf7/D5bIRLJgqXSJJAkGR7yJYYMeS37ZjBUt2MHki1C0NwHqmZ8Bc?=
 =?us-ascii?Q?EohiKxYddbQwUYLn6KKSaGa38nUzqK55UuRCsGBcdwTQBG8q1HlePsTIT9WB?=
 =?us-ascii?Q?tICawXNvdfJ2o486VzjDdMIK4Azm53D0X9IGrdoIfV9uP6juOI18p5uahPQ+?=
 =?us-ascii?Q?akGd1xYmq567Lj682k/gteStyMUoNb4VjnzAHJXG1xh6OUCSK6xsPaipqJDa?=
 =?us-ascii?Q?QhsTSrngvWFQGlkvu6q5ZyT4GZ9rQlBfydjdgU9n6hiaayaWT8dzQVhMgkO+?=
 =?us-ascii?Q?59hcg/NBBhqZb8/ZG6cTkcKhvPTz1xtIlYuCFDL4Ej9jxkbl5qPWj8qnKHcH?=
 =?us-ascii?Q?fzqvAyTuY7yTGme6Ft+V8xN+KTL2ErlkM5xYwYbvb3J63o0oMXFT+ZtcGzf2?=
 =?us-ascii?Q?SQSyjqGn0vfTXFMW5sXKDR0XSqyjXcSzjMjQ4uP4iZ9nPMvi1HC0fppyUsCF?=
 =?us-ascii?Q?87z+q45FhWvbucUvjR0wuyB1UsSfAnfJfiy2ala7KSN4+pNcVobYVOWHHA1b?=
 =?us-ascii?Q?ULmXC2ZvuerE3QxJ3B9GcShwKM6z33mtu9gOY8vCun2Zv00Tln+enh3HitE7?=
 =?us-ascii?Q?Mgc9wDJxMq8MBpygxbSdEhKo8PNeA1WtbmOl5fta3SbJZUYW4ed4w3ymNM07?=
 =?us-ascii?Q?JEoUI2jrwiLmtGFyk9xoH7NnPGjfqsVLltY6W+rEqOKLB3DnAdZ1mz9agoEm?=
 =?us-ascii?Q?D24hhHY4X8KAmr0vImN3KWAoVBokzNXXTp+2yUaSwfHdMdvu9K67JcbPVP6H?=
 =?us-ascii?Q?+Ie1k8XjiIPWL9FnAHe4ekOis2zqXOG9AoBNkxIVCcwwJiX5QwcyVcpEG9tN?=
 =?us-ascii?Q?aJaLN7XlAzmPFBDdMz4HON67uczl2uk9orzgPalISuEDLvakogE6HdGL91n0?=
 =?us-ascii?Q?eqbNqKcxh2om+WneSPQHk5CoS9cZinHkB4Oi+XO3MYr09gR9cbOsqyn05ZSB?=
 =?us-ascii?Q?H/QrC3HAtOR2959ASnJp4quZtKSQRZkMuUkOecd1CEHn3hgJ1t9ORBIujVY3?=
 =?us-ascii?Q?4IIbJg6CB/Je69VW4n8kfDffRp+ERK68uGORjL+6raBR3pdOF2y0ngelpKWu?=
 =?us-ascii?Q?z9/P/2viyPPVxLNuLLnWkfODqy+kqWZhpu/wjvepF0Osc+xTwhruBfJ0lbJ2?=
 =?us-ascii?Q?AjYh9IrFmCSCOSWh388Hmq7IHFI4FNhYid/aBWE1f+J0iGTYEnFHBJnj4+He?=
 =?us-ascii?Q?knD2tMyvBTjgHLd951b7G+f4a7XXnCDj/fCCVw2t9UD6YS1WM+Oq5x4+YGNX?=
 =?us-ascii?Q?QoPWMTXF7sV+wl/SSR3RpJj0tok8S8geMv3L0CG37Gawu+q+k7nfRX1V5Hb7?=
 =?us-ascii?Q?9w0YOaeZbh8zHfndchwz/xQa2txH3s+od8JMNkPMvhBQounZkciXGIjgKIqk?=
 =?us-ascii?Q?fwf7cN9PytNQuOypgHuYAfWukPIiNMzYaCwpjaoROl+5StULu6yvWhdPZOs+?=
 =?us-ascii?Q?0OT46gxMv5GB315ugUpwGgg1GGgQjtf4jh3UIu/sz5I3QSZW1rJ3pqv3IJ3K?=
 =?us-ascii?Q?wKGSm9WlmRWxlU9CUDlDFlE+6hJ6tZsEJaUF9xeFRb7eQcZyoE+k8lV/wAPF?=
 =?us-ascii?Q?AF6SqVKDiIL0VlI/pasgGxwiYak356H6STlVS+F9rEAy8wyrC6WS6CBgSyyO?=
 =?us-ascii?Q?Lw=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <894CB29937481D45AB472D940A6D3747@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: BN0PR10MB5128.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: bd0f3108-f07a-4a5c-1f84-08da8c367801
X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Sep 2022 16:24:39.5183
 (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: Yrse7iiohLV5rDsEpXPF19MP3n9siuQvAMbyA9tnOGoMqZkvmx0cs1fjI9srNJhMpVQDhIvhR98+wcYLvVGRCg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB5237
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-09-01_10,2022-08-31_03,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 malwarescore=0 spamscore=0
 adultscore=0 mlxscore=0 mlxlogscore=999 suspectscore=0 phishscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2207270000
 definitions=main-2209010073
X-Proofpoint-ORIG-GUID: yoASm8yI0io-SPf4ZvxN6u_I5GydXgLw
X-Proofpoint-GUID: yoASm8yI0io-SPf4ZvxN6u_I5GydXgLw
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,T_SCC_BODY_TEXT_LINE
        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-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> On Sep 1, 2022, at 7:21 AM, Jeff Layton <jlayton@kernel.org> wrote:
>=20
> On Thu, 2022-09-01 at 07:27 +0200, Christophe JAILLET wrote:
>> If this memdup_user() call fails, the memory allocated in a previous cal=
l
>> a few lines above should be freed. Otherwise it leaks.
>>=20
>> Fixes: 6ee95d1c8991 ("nfsd: add support for upcall version 2")
>> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
>> ---
>> fs/nfsd/nfs4recover.c | 4 +++-
>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>=20
>> diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
>> index b29d27eaa8a6..248ff9f4141c 100644
>> --- a/fs/nfsd/nfs4recover.c
>> +++ b/fs/nfsd/nfs4recover.c
>> @@ -815,8 +815,10 @@ __cld_pipe_inprogress_downcall(const struct cld_msg=
_v2 __user *cmsg,
>> 				princhash.data =3D memdup_user(
>> 						&ci->cc_princhash.cp_data,
>> 						princhashlen);
>> -				if (IS_ERR_OR_NULL(princhash.data))
>> +				if (IS_ERR_OR_NULL(princhash.data)) {
>> +					kfree(name.data);
>> 					return -EFAULT;
>> +				}
>> 				princhash.len =3D princhashlen;
>> 			} else
>> 				princhash.len =3D 0;
>=20
> Reviewed-by: Jeff Layton <jlayton@kernel.org>

All three applied for v6.1. Thanks!


--
Chuck Lever