Received-SPF: pass (google.com: domain of linux-kernel+bounces-18311-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Precedence: bulk
MIME-Version: 1.0
References: <9e415e37-a5bf-459f-8b9c-a02431e8fcfd@web.de>
In-Reply-To: <9e415e37-a5bf-459f-8b9c-a02431e8fcfd@web.de>
From: Steve French <smfrench@gmail.com>
Date: Fri, 5 Jan 2024 13:57:22 -0600
Message-ID: <CAH2r5mtDbP3XZTdrT97KB8R4ujZ1qHOkn=4RUsvzsHEcmwLxwg@mail.gmail.com>
Subject: Re: [PATCH] smb3: Improve exception handling in allocate_mr_list()
To: Markus Elfring <Markus.Elfring@web.de>
Cc: linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, 
	kernel-janitors@vger.kernel.org, Paulo Alcantara <pc@manguebit.com>, 
	Ronnie Sahlberg <lsahlber@redhat.com>, Shyam Prasad N <sprasad@microsoft.com>, 
	Steve French <sfrench@samba.org>, Tom Talpey <tom@talpey.com>, LKML <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

merged into cifs-2.6.git for-next

On Sat, Dec 30, 2023 at 3:47=E2=80=AFAM Markus Elfring <Markus.Elfring@web.=
de> wrote:
>
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Fri, 29 Dec 2023 20:43:12 +0100
>
> The kfree() function was called in one case by
> the allocate_mr_list() function during error handling
> even if the passed variable contained a null pointer.
> This issue was detected by using the Coccinelle software.
>
> Thus use another label.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
>  fs/smb/client/smbdirect.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/smb/client/smbdirect.c b/fs/smb/client/smbdirect.c
> index 94df9eec3d8d..d74e829de51c 100644
> --- a/fs/smb/client/smbdirect.c
> +++ b/fs/smb/client/smbdirect.c
> @@ -2136,7 +2136,7 @@ static int allocate_mr_list(struct smbd_connection =
*info)
>         for (i =3D 0; i < info->responder_resources * 2; i++) {
>                 smbdirect_mr =3D kzalloc(sizeof(*smbdirect_mr), GFP_KERNE=
L);
>                 if (!smbdirect_mr)
> -                       goto out;
> +                       goto cleanup_entries;
>                 smbdirect_mr->mr =3D ib_alloc_mr(info->pd, info->mr_type,
>                                         info->max_frmr_depth);
>                 if (IS_ERR(smbdirect_mr->mr)) {
> @@ -2162,7 +2162,7 @@ static int allocate_mr_list(struct smbd_connection =
*info)
>
>  out:
>         kfree(smbdirect_mr);
> -
> +cleanup_entries:
>         list_for_each_entry_safe(smbdirect_mr, tmp, &info->mr_list, list)=
 {
>                 list_del(&smbdirect_mr->list);
>                 ib_dereg_mr(smbdirect_mr->mr);
> --
> 2.43.0
>
>


--=20
Thanks,

Steve