Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1705229

Re: [PATCH] scsi: mpt3sas: Fix memory allocation failure test in 'mpt3sas_base_attach()'

Show all headers | View raw

Am 07.08.2017 00:51, schrieb Christophe JAILLET:
> In the lines above this test, 8 'kzalloc' are performed, but only 7 results
> are tested.
> 
> Add the missing one (i.e. '!ioc->port_enable_cmds.reply').
> 
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
>  drivers/scsi/mpt3sas/mpt3sas_base.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
> index 1a5b6e40fb5c..8a44636ab0b5 100644
> --- a/drivers/scsi/mpt3sas/mpt3sas_base.c
> +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
> @@ -5494,10 +5494,10 @@ mpt3sas_base_attach(struct MPT3SAS_ADAPTER *ioc)
>  	ioc->ctl_cmds.status = MPT3_CMD_NOT_USED;
>  	mutex_init(&ioc->ctl_cmds.mutex);
>  
> -	if (!ioc->base_cmds.reply || !ioc->transport_cmds.reply ||
> -	    !ioc->scsih_cmds.reply || !ioc->tm_cmds.reply ||
> -	    !ioc->config_cmds.reply || !ioc->ctl_cmds.reply ||
> -	    !ioc->ctl_cmds.sense) {
> +	if (!ioc->base_cmds.reply || !ioc->port_enable_cmds.reply ||
> +	    !ioc->transport_cmds.reply || !ioc->scsih_cmds.reply ||
> +	    !ioc->tm_cmds.reply || !ioc->config_cmds.reply ||
> +	    !ioc->ctl_cmds.reply || !ioc->ctl_cmds.sense) {
>  		r = -ENOMEM;
>  		goto out_free_resources;
>  	}


obviously it is better to follow the pattern "malloc() , check".
Even the programmer lost track.

Bonus points if you malloc the buffers in one step.

just my 2 cents,

re,
 wh

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/3] power: supply: charger-manager: 1 fix and 2 minor clean-ups Christophe JAILLET <christophe.jaillet@wanadoo.fr> - 2017-08-07 00:40 +0200
  [PATCH] scsi: mpt3sas: Fix memory allocation failure test in 'mpt3sas_base_attach()' Christophe JAILLET <christophe.jaillet@wanadoo.fr> - 2017-08-07 01:00 +0200
    Re: [PATCH] scsi: mpt3sas: Fix memory allocation failure test in  'mpt3sas_base_attach()' walter harms <wharms@bfs.de> - 2017-08-07 10:30 +0200
      Re: [PATCH] scsi: mpt3sas: Fix memory allocation failure test in  'mpt3sas_base_attach()' Christophe JAILLET <christophe.jaillet@wanadoo.fr> - 2017-08-07 10:50 +0200

csiph-web