From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5A42CC4332F for ; Thu, 2 Nov 2023 21:22:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229769AbjKBVWF (ORCPT ); Thu, 2 Nov 2023 17:22:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230015AbjKBVWB (ORCPT ); Thu, 2 Nov 2023 17:22:01 -0400 Received: from smtp.smtpout.orange.fr (smtp-30.smtpout.orange.fr [80.12.242.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0C49196 for ; Thu, 2 Nov 2023 14:21:56 -0700 (PDT) Received: from [192.168.1.18] ([86.243.2.178]) by smtp.orange.fr with ESMTPA id yf8Rqp7S1uQcKyf8RqIfdN; Thu, 02 Nov 2023 22:21:53 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1698960113; bh=lug65i9SpeCxzvrYTmUZ5JS3Ay8/Kn/DlLaH6z3IhH8=; h=Date:Subject:To:Cc:References:From:In-Reply-To; b=eVip9fRFNHWDPpYoUlO67CGTnE5aVD6Ok7JeiqTgUzBtEMpoqVHN+1iWRvnokiG2P czruQufq+8nreAWpibk4+WCd0Cov/lPQcJscEMSSMIEsGh8ALpTUebqffPgeqChcsa 8Exa7B9LYwVUUUI3w/nzuwfcyAVZislOh6guKhCm1zo2tAqiziVgvhsFGYkOKjUvqH T2oJvZ6DEF/ZkAavYyvi2zpKPutTtFhampzhJAT2KPhF0rq74P8jcTAFL5Qtd8VNQE sTWWEvkjWSU9Ki5PRahWbR1gIO0DZ0Nzmjtp0pRIfju6UwwxLQgsB5ayjX/WpXEdTi GiHD3fvjEeAdg== X-ME-Helo: [192.168.1.18] X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Thu, 02 Nov 2023 22:21:53 +0100 X-ME-IP: 86.243.2.178 Message-ID: <95fdad28-95d5-4720-811b-8bbef8600830@wanadoo.fr> Date: Thu, 2 Nov 2023 22:21:51 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/2] vboxsf: Avoid an spurious warning if load_nls_xxx() fails To: Matthew Wilcox Cc: Hans de Goede , Christoph Hellwig , Al Viro , linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, linux-fsdevel@vger.kernel.org References: Content-Language: fr, en-US From: Christophe JAILLET In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Le 02/11/2023 à 13:30, Matthew Wilcox a écrit : > On Wed, Nov 01, 2023 at 11:49:48AM +0100, Christophe JAILLET wrote: >> If an load_nls_xxx() function fails a few lines above, the 'sbi->bdi_id' is >> still 0. >> So, in the error handling path, we will call ida_simple_remove(..., 0) >> which is not allocated yet. >> >> In order to prevent a spurious "ida_free called for id=0 which is not >> allocated." message, tweak the error handling path and add a new label. > > That's not spurious! My fault, as a non-native English speaking man. I've always sought that spurious was meaning "odd" or "strange", but I was wrong :( Here, a better wording could be "to prevent an un-expected "ida..."". Is that ok for you? Or the last sentence could shortened to only "In order to fix it, tweak the error handling path and add a new label.". CJ > You're freeing something that wasn't allocated. > A good quality malloc allocation will warn you if you free() a random > pointer. I agree with everything abuot this patch (and the next) except > for the changelog. > >> Fixes: 0fd169576648 ("fs: Add VirtualBox guest shared folder (vboxsf) support") >> Signed-off-by: Christophe JAILLET >> --- >> fs/vboxsf/super.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/fs/vboxsf/super.c b/fs/vboxsf/super.c >> index 1fb8f4df60cb..9848af78215b 100644 >> --- a/fs/vboxsf/super.c >> +++ b/fs/vboxsf/super.c >> @@ -151,7 +151,7 @@ static int vboxsf_fill_super(struct super_block *sb, struct fs_context *fc) >> if (!sbi->nls) { >> vbg_err("vboxsf: Count not load '%s' nls\n", nls_name); >> err = -EINVAL; >> - goto fail_free; >> + goto fail_destroy_idr; >> } >> } >> >> @@ -224,6 +224,7 @@ static int vboxsf_fill_super(struct super_block *sb, struct fs_context *fc) >> ida_simple_remove(&vboxsf_bdi_ida, sbi->bdi_id); >> if (sbi->nls) >> unload_nls(sbi->nls); >> +fail_destroy_idr: >> idr_destroy(&sbi->ino_idr); >> kfree(sbi); >> return err; >> -- >> 2.34.1 >> >> > >