netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: walter harms <wharms@bfs.de>
To: Colin King <colin.king@canonical.com>
Cc: Harry Morris <h.morris@cascoda.com>,
	linuxdev@cascoda.com, Alexander Aring <aar@pengutronix.de>,
	Stefan Schmidt <stefan@osg.samsung.com>,
	linux-wpan@vger.kernel.org, netdev@vger.kernel.org,
	kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Add checks for kmalloc allocation failures
Date: Wed, 29 Mar 2017 20:54:46 +0200	[thread overview]
Message-ID: <58DC02F6.40009@bfs.de> (raw)
In-Reply-To: <20170329155447.17991-1-colin.king@canonical.com>



Am 29.03.2017 17:54, schrieb Colin King:
> From: Colin Ian King <colin.king@canonical.com>
> 
> Ensure we don't end up with a null pointer dereferences by checking
> for for allocation failures.  Allocate by sizeof(*ptr) rather than
> the type to fix checkpack warnings.  Also merge multiple lines into
> one line for the kmalloc call.
> 
> Detected by CoverityScan, CID#1422435 ("Dereference null return value")
> 
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  drivers/net/ieee802154/ca8210.c | 18 ++++++++++--------
>  1 file changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/net/ieee802154/ca8210.c b/drivers/net/ieee802154/ca8210.c
> index 53fa87bfede0..25fd3b04b3c0 100644
> --- a/drivers/net/ieee802154/ca8210.c
> +++ b/drivers/net/ieee802154/ca8210.c
> @@ -634,6 +634,8 @@ static int ca8210_test_int_driver_write(
>  		dev_dbg(&priv->spi->dev, "%#03x\n", buf[i]);
>  
>  	fifo_buffer = kmalloc(len, GFP_KERNEL);
> +	if (!fifo_buffer)
> +		return -ENOMEM;
>  	memcpy(fifo_buffer, buf, len);


perhaps kmemdup() ist the way to go ?
by replace kamlloc()+memcpy

re,
 wh

>  	kfifo_in(&test->up_fifo, &fifo_buffer, 4);
>  	wake_up_interruptible(&priv->test.readq);
> @@ -759,10 +761,10 @@ static void ca8210_rx_done(struct cas_control *cas_ctl)
>  				&priv->spi->dev,
>  				"Resetting MAC...\n");
>  
> -			mlme_reset_wpc = kmalloc(
> -				sizeof(struct work_priv_container),
> -				GFP_KERNEL
> -			);
> +			mlme_reset_wpc = kmalloc(sizeof(*mlme_reset_wpc),
> +						 GFP_KERNEL);
> +			if (!mlme_reset_wpc)
> +				goto finish;
>  			INIT_WORK(
>  				&mlme_reset_wpc->work,
>  				ca8210_mlme_reset_worker
> @@ -925,10 +927,10 @@ static int ca8210_spi_transfer(
>  
>  	dev_dbg(&spi->dev, "ca8210_spi_transfer called\n");
>  
> -	cas_ctl = kmalloc(
> -		sizeof(struct cas_control),
> -		GFP_ATOMIC
> -	);
> +	cas_ctl = kmalloc(sizeof(*cas_ctl), GFP_ATOMIC);
> +	if (!cas_ctl)
> +		return -ENOMEM;
> +
>  	cas_ctl->priv = priv;
>  	memset(cas_ctl->tx_buf, SPI_IDLE, CA8210_SPI_BUF_SIZE);
>  	memset(cas_ctl->tx_in_buf, SPI_IDLE, CA8210_SPI_BUF_SIZE);

      parent reply	other threads:[~2017-03-29 18:54 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-29 15:54 [PATCH] Add checks for kmalloc allocation failures Colin King
2017-03-29 16:21 ` Eric Dumazet
2017-03-30  1:52   ` Stefan Schmidt
2017-03-29 18:54 ` walter harms [this message]

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=58DC02F6.40009@bfs.de \
    --to=wharms@bfs.de \
    --cc=aar@pengutronix.de \
    --cc=colin.king@canonical.com \
    --cc=h.morris@cascoda.com \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-wpan@vger.kernel.org \
    --cc=linuxdev@cascoda.com \
    --cc=netdev@vger.kernel.org \
    --cc=stefan@osg.samsung.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).