projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f78f7ed)
powerpc/pseries/hvcserver: don't memset pi_buff if it is null
authorColin Ian King <colin.king@canonical.com>
Thu, 8 Oct 2015 19:00:58 +0000 (20:00 +0100)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 8 Oct 2015 21:03:03 +0000 (08:03 +1100)
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>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/platforms/pseries/hvcserver.c patch | blob | blame | history

diff --git a/arch/powerpc/platforms/pseries/hvcserver.c b/arch/powerpc/platforms/pseries/hvcserver.c
index eedb64594dc560ee585e13a7fb4e411132cd84b1..94a6e5612b0d50976ae69fcc0cb5f033a64901a5 100644 (file)
--- 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);