[PATCH 0/3] power: supply: charger-manager: 1 fix and 2 minor clean-ups

[PATCH 0/3] power: supply: charger-manager: 1 fix and 2 minor clean-ups

[Christophe JAILLET]

This patch series improves 'charger_manager_probe()'. The first patch is
about a missing memory allocation failure test.
The 2 others are just things spotted in this function:
   - a comment that is no more up to date
   - a style issue (which saves 1 line)

Christophe JAILLET (3):
  power: supply: charger-manager: Fix a NULL pointer dereference in
    'charger_manager_probe()'
  power: supply: charger-manager: Fix a comment
  power: supply: charger-manager: Slighly simplify code

 drivers/power/supply/charger-manager.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

-- 
2.11.0

[PATCH 1/3] power: supply: charger-manager: Fix a NULL pointer dereference in 'charger_manager_probe()'

[Christophe JAILLET]

'devm_kzalloc()' can return NULL. Return -ENOMEM in this case in order to
avoid a NULL pointer dereference later on.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 drivers/power/supply/charger-manager.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/power/supply/charger-manager.c b/drivers/power/supply/charger-manager.c
index adc3761831e1..52a49857e20f 100644
--- a/drivers/power/supply/charger-manager.c
+++ b/drivers/power/supply/charger-manager.c
@@ -1645,6 +1645,8 @@ static int charger_manager_probe(struct platform_device *pdev)
 	/* Initialize alarm timer */
 	if (alarmtimer_get_rtcdev()) {
 		cm_timer = devm_kzalloc(cm->dev, sizeof(*cm_timer), GFP_KERNEL);
+		if (!cm_timer)
+			return -ENOMEM;
 		alarm_init(cm_timer, ALARM_BOOTTIME, cm_timer_func);
 	}
 
-- 
2.11.0

[PATCH 2/3] power: supply: charger-manager: Fix a comment

[Christophe JAILLET]

Update a comment which is no more up to date since commit
2ed9e9b653095.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 drivers/power/supply/charger-manager.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/power/supply/charger-manager.c b/drivers/power/supply/charger-manager.c
index 52a49857e20f..83c08c8e2c32 100644
--- a/drivers/power/supply/charger-manager.c
+++ b/drivers/power/supply/charger-manager.c
@@ -1651,8 +1651,8 @@ static int charger_manager_probe(struct platform_device *pdev)
 	}
 
 	/*
-	 * The following two do not need to be errors.
-	 * Users may intentionally ignore those two features.
+	 * Some of the following do not need to be errors.
+	 * Users may intentionally ignore those features.
 	 */
 	if (desc->fullbatt_uV == 0) {
 		dev_info(&pdev->dev, "Ignoring full-battery voltage threshold as it is not supplied\n");
-- 
2.11.0

[PATCH 3/3] power: supply: charger-manager: Slighly simplify code

[Christophe JAILLET]

Use 'sizeof(*var)' instead of the equivalent 'sizeof(data structure type)'
because it is less verbose.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 drivers/power/supply/charger-manager.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/power/supply/charger-manager.c b/drivers/power/supply/charger-manager.c
index 83c08c8e2c32..6502fa7c2106 100644
--- a/drivers/power/supply/charger-manager.c
+++ b/drivers/power/supply/charger-manager.c
@@ -1632,8 +1632,7 @@ static int charger_manager_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
-	cm = devm_kzalloc(&pdev->dev,
-			sizeof(struct charger_manager),	GFP_KERNEL);
+	cm = devm_kzalloc(&pdev->dev, sizeof(*cm), GFP_KERNEL);
 	if (!cm)
 		return -ENOMEM;
 
-- 
2.11.0

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

[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;
 	}
-- 
2.11.0

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

[walter harms]

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

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

[Christophe JAILLET]

Le 07/08/2017 à 10:25, walter harms a écrit :
>
> 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".
Agreed, but it is also more verbose. Leavig it as-is, is IMHO, good enough.

> Even the programmer lost track.
>
> Bonus points if you malloc the buffers in one step.
Most of the allocation are 'kzalloc(ioc->reply_sz, GFP_KERNEL);', so a 
kcalloc could be used instead.
However, the 'kzalloc(SCSI_SENSE_BUFFERSIZE, GFP_KERNEL);' breaks this 
logic and allocating all at once would lead to spaghetti code for no reason.

Moreover, I don't have any idea how big can be 'ioc->reply_sz', even if 
I guess it should be small.
So allocating all at once, could fail where several steps would work.

So I won't play for the bonus points :).

Best regards.
CJ

> just my 2 cents,
>
> re,
>   wh
>
>
>

Re: [PATCH 0/3] power: supply: charger-manager: 1 fix and 2 minor clean-ups

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 742 bytes --]

Hi,

On Mon, Aug 07, 2017 at 12:37:54AM +0200, Christophe JAILLET wrote:
> This patch series improves 'charger_manager_probe()'. The first patch is
> about a missing memory allocation failure test.
> The 2 others are just things spotted in this function:
>    - a comment that is no more up to date
>    - a style issue (which saves 1 line)
> 
> Christophe JAILLET (3):
>   power: supply: charger-manager: Fix a NULL pointer dereference in
>     'charger_manager_probe()'
>   power: supply: charger-manager: Fix a comment
>   power: supply: charger-manager: Slighly simplify code
> 
>  drivers/power/supply/charger-manager.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)

Thanks, queued.

-- Sebastian

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]