[PATCH] powerpc/pseries/hvcserver: don't memset pi_buff if it is null

[PATCH] powerpc/pseries/hvcserver: don't memset pi_buff if it is null

[Colin King]

From: Colin Ian King <colin.king@canonical.com>

pi_buff is being memset before it is sanity checked. Move the
memset after the null pi_buff sanity check to avoid an oops.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 arch/powerpc/platforms/pseries/hvcserver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/platforms/pseries/hvcserver.c b/arch/powerpc/platforms/pseries/hvcserver.c
index eedb645..94a6e56 100644
--- a/arch/powerpc/platforms/pseries/hvcserver.c
+++ b/arch/powerpc/platforms/pseries/hvcserver.c
@@ -142,11 +142,11 @@ int hvcs_get_partner_info(uint32_t unit_address, struct list_head *head,
 	int more = 1;
 	int retval;
 
-	memset(pi_buff, 0x00, PAGE_SIZE);
 	/* invalid parameters */
 	if (!head || !pi_buff)
 		return -EINVAL;
 
+	memset(pi_buff, 0x00, PAGE_SIZE);
 	last_p_partition_ID = last_p_unit_address = ~0UL;
 	INIT_LIST_HEAD(head);
 
-- 
2.5.0

Re: [PATCH] powerpc/pseries/hvcserver: don't memset pi_buff if it is null

[Daniel Axtens]

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


Hi Colin,

This looks good. Out of curiousity, how did you find it? Code
inspection? Bug? Static analysis?

Not that it's particularly meaningful for such a trivial fix, but FWIW:

Reviewed-by: Daniel Axtens <dja@axtens.net>

Regards,
Daniel

Colin King <colin.king@canonical.com> writes:

> From: Colin Ian King <colin.king@canonical.com>
>
> pi_buff is being memset before it is sanity checked. Move the
> memset after the null pi_buff sanity check to avoid an oops.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  arch/powerpc/platforms/pseries/hvcserver.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/powerpc/platforms/pseries/hvcserver.c b/arch/powerpc/platforms/pseries/hvcserver.c
> index eedb645..94a6e56 100644
> --- a/arch/powerpc/platforms/pseries/hvcserver.c
> +++ b/arch/powerpc/platforms/pseries/hvcserver.c
> @@ -142,11 +142,11 @@ int hvcs_get_partner_info(uint32_t unit_address, struct list_head *head,
>  	int more = 1;
>  	int retval;
>  
> -	memset(pi_buff, 0x00, PAGE_SIZE);
>  	/* invalid parameters */
>  	if (!head || !pi_buff)
>  		return -EINVAL;
>  
> +	memset(pi_buff, 0x00, PAGE_SIZE);
>  	last_p_partition_ID = last_p_unit_address = ~0UL;
>  	INIT_LIST_HEAD(head);
>  
> -- 
> 2.5.0
>
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev

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

Re: [PATCH] powerpc/pseries/hvcserver: don't memset pi_buff if it is null

[Colin Ian King]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

On 12/10/15 01:35, Daniel Axtens wrote:
> 
> Hi Colin,
> 
> This looks good. Out of curiousity, how did you find it? Code
> inspection? Bug? Static analysis?

static analysis with cppcheck. I forgot to mention that in the commit
message.

> 
> Not that it's particularly meaningful for such a trivial fix, but FWIW
:
> 
> Reviewed-by: Daniel Axtens <dja@axtens.net>
> 
> Regards,
> Daniel
> 
> Colin King <colin.king@canonical.com> writes:
> 
>> From: Colin Ian King <colin.king@canonical.com>
>>
>> pi_buff is being memset before it is sanity checked. Move the
>> memset after the null pi_buff sanity check to avoid an oops.
>>
>> Signed-off-by: Colin Ian King <colin.king@canonical.com>
>> ---
>>  arch/powerpc/platforms/pseries/hvcserver.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/powerpc/platforms/pseries/hvcserver.c b/arch/powerp
c/platforms/pseries/hvcserver.c
>> index eedb645..94a6e56 100644
>> --- a/arch/powerpc/platforms/pseries/hvcserver.c
>> +++ b/arch/powerpc/platforms/pseries/hvcserver.c
>> @@ -142,11 +142,11 @@ int hvcs_get_partner_info(uint32_t unit_address
, struct list_head *head,
>>  	int more = 1;
>>  	int retval;
>>  
>> -	memset(pi_buff, 0x00, PAGE_SIZE);
>>  	/* invalid parameters */
>>  	if (!head || !pi_buff)
>>  		return -EINVAL;
>>  
>> +	memset(pi_buff, 0x00, PAGE_SIZE);
>>  	last_p_partition_ID = last_p_unit_address = ~0UL;
>>  	INIT_LIST_HEAD(head);
>>  
>> -- 
>> 2.5.0
>>
>> _______________________________________________
>> Linuxppc-dev mailing list
>> Linuxppc-dev@lists.ozlabs.org
>> https://lists.ozlabs.org/listinfo/linuxppc-dev

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAEBCAAGBQJWG0/KAAoJEGjCh9/GqAImcV8QAIToDexS4X/vya3F8aHZ2qtT
idFEvgKl1mJxzgk79RJs874AiGs3CtOEC3/5w5fMh4eA/P6d6vJ1NPDu5bsugzzA
I6F329WP/QxeOWgU13GSXxa0p13sUxTXqFRT8sHqwDgEaecX6kR+nf8x+P5pZUYX
c7y25IHCZ/nNrj/QwQZcrlNd+U5bwxHyd5zUPJYYInbSEQmPUrhFhW1EkiUDVEYG
6rGmCzRGqfPS2sBqLXG/6ObP4FO8NC+bxQxNWAG/p9iWZg9KdIVL7IFTjWbxT7GC
dsVbBsWu7ewUqo6euK56cd5CFf0oFDoHwhbDQ7T9b9CHYvGVWHxW1k7rUCgcep9x
yJIIWOAVw78DemV3JkZm53Q2+1jUCYuaY6Vw8M3UmdQbWrg2rvbh8TtgoCiXbbrF
HlNO0wlFOBpmr7LoHEPoIV8TsIeoeEikGrXszkqXI/MXKvN8jW1k5vtzcD3j+EU9
gy9wZvovvVZ6RL0erXwVLdzDp+R2clQfIcSi/St2/OGW+5X9NXtuaa+mvBy+dcpW
Se0kO8DpLmHfNtcXvXJhCm77O1Oapw7s5UumevXSTibZ/Mhxzrdg+YhSWexm/SRu
evcm6pagTpX3Vruq4BTt0Rdji9J/stT8GFlOWT0hGH1ZBLrzIKTlkJskSTkT801N
+MkiI6UyL8lqdVoqZrNk
=xqJ4
-----END PGP SIGNATURE-----

Re: powerpc/pseries/hvcserver: don't memset pi_buff if it is null

[Michael Ellerman]

On Thu, 2015-08-10 at 19:00:58 UTC, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> pi_buff is being memset before it is sanity checked. Move the
> memset after the null pi_buff sanity check to avoid an oops.
> 
> Signed-off-by: Colin Ian King <colin.king@canonical.com>

Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/c13e1c05b22b504bf0d72fc7

cheers