From: Jakub Kicinski <kuba@kernel.org>
To: Esina Ekaterina <eesina@astralinux.ru>
Cc: lvc-project@linuxtesting.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, Eric Dumazet <edumazet@google.com>,
Paolo Abeni <pabeni@redhat.com>,
linuxppc-dev@lists.ozlabs.org,
"David S . Miller" <davem@davemloft.net>,
Zhao Qiang <qiang.zhao@nxp.com>
Subject: Re: [PATCH v3] net: wan: Add checks for NULL for utdm in undo_uhdlc_init and unmap_si_regs
Date: Wed, 11 Jan 2023 10:28:48 -0800 [thread overview]
Message-ID: <20230111102848.44863b9c@kernel.org> (raw)
In-Reply-To: <20230111090504.66434-1-eesina@astralinux.ru>
On Wed, 11 Jan 2023 12:05:03 +0300 Esina Ekaterina wrote:
> Subject: [PATCH v3] net: wan: Add checks for NULL for utdm in undo_uhdlc_init and unmap_si_regs
net: wan: prevent null-deref on error path for non-tdm case
> If uhdlc_priv_tsa != 1 then utdm is not initialized.
> And if ret != NULL then goto undo_uhdlc_init, where
> utdm is dereferenced. Same if dev == NULL.
>
> Found by Linux Verification Center (linuxtesting.org) with SVACE.
I did the indentation to make the content stand out in the email,
there should be no indentation in the actual msg, sorry.
> --- a/drivers/net/wan/fsl_ucc_hdlc.c
> +++ b/drivers/net/wan/fsl_ucc_hdlc.c
> @@ -1243,9 +1243,11 @@ static int ucc_hdlc_probe(struct platform_device *pdev)
> free_dev:
> free_netdev(dev);
> undo_uhdlc_init:
> - iounmap(utdm->siram);
> + if (utdm != NULL)
and here just:
if (utdm)
comparing to NULL or zero is less idiomatic in kernel C.
> + iounmap(utdm->siram);
> unmap_si_regs:
> - iounmap(utdm->si_regs);
> + if (utdm != NULL)
> + iounmap(utdm->si_regs);
WARNING: multiple messages have this Message-ID (diff)
From: Jakub Kicinski <kuba@kernel.org>
To: Esina Ekaterina <eesina@astralinux.ru>
Cc: Zhao Qiang <qiang.zhao@nxp.com>,
"David S . Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Paolo Abeni <pabeni@redhat.com>,
netdev@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-kernel@vger.kernel.org, lvc-project@linuxtesting.org
Subject: Re: [PATCH v3] net: wan: Add checks for NULL for utdm in undo_uhdlc_init and unmap_si_regs
Date: Wed, 11 Jan 2023 10:28:48 -0800 [thread overview]
Message-ID: <20230111102848.44863b9c@kernel.org> (raw)
In-Reply-To: <20230111090504.66434-1-eesina@astralinux.ru>
On Wed, 11 Jan 2023 12:05:03 +0300 Esina Ekaterina wrote:
> Subject: [PATCH v3] net: wan: Add checks for NULL for utdm in undo_uhdlc_init and unmap_si_regs
net: wan: prevent null-deref on error path for non-tdm case
> If uhdlc_priv_tsa != 1 then utdm is not initialized.
> And if ret != NULL then goto undo_uhdlc_init, where
> utdm is dereferenced. Same if dev == NULL.
>
> Found by Linux Verification Center (linuxtesting.org) with SVACE.
I did the indentation to make the content stand out in the email,
there should be no indentation in the actual msg, sorry.
> --- a/drivers/net/wan/fsl_ucc_hdlc.c
> +++ b/drivers/net/wan/fsl_ucc_hdlc.c
> @@ -1243,9 +1243,11 @@ static int ucc_hdlc_probe(struct platform_device *pdev)
> free_dev:
> free_netdev(dev);
> undo_uhdlc_init:
> - iounmap(utdm->siram);
> + if (utdm != NULL)
and here just:
if (utdm)
comparing to NULL or zero is less idiomatic in kernel C.
> + iounmap(utdm->siram);
> unmap_si_regs:
> - iounmap(utdm->si_regs);
> + if (utdm != NULL)
> + iounmap(utdm->si_regs);
next prev parent reply other threads:[~2023-01-11 18:29 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-10 11:47 [PATCH v2] net: wan: Add checks for NULL. If uhdlc_priv_tsa != 1 then utdm is not initialized. And if ret != NULL then goto undo_uhdlc_init, where utdm is dereferenced. Same if dev == NULL Esina Ekaterina
2023-01-10 11:47 ` Esina Ekaterina
2023-01-11 4:44 ` Jakub Kicinski
2023-01-11 4:44 ` Jakub Kicinski
2023-01-11 9:05 ` [PATCH v3] net: wan: Add checks for NULL for utdm in undo_uhdlc_init and unmap_si_regs Esina Ekaterina
2023-01-11 9:05 ` Esina Ekaterina
2023-01-11 18:28 ` Jakub Kicinski [this message]
2023-01-11 18:28 ` Jakub Kicinski
2023-01-11 19:55 ` [PATCH v4] " Esina Ekaterina
2023-01-11 19:55 ` Esina Ekaterina
2023-01-11 20:10 ` Jakub Kicinski
2023-01-11 20:10 ` Jakub Kicinski
2023-01-12 7:09 ` Leon Romanovsky
2023-01-12 7:09 ` Leon Romanovsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230111102848.44863b9c@kernel.org \
--to=kuba@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=eesina@astralinux.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=lvc-project@linuxtesting.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=qiang.zhao@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.