From 64727f59c4a1412fdb73e092fb838ae66e2aad1a Mon Sep 17 00:00:00 2001 From: Alexander Amelkin Date: Thu, 29 Nov 2018 13:10:53 +0300 Subject: [PATCH] lanplus: Cleanup. Refix 6dec83ff, fix be2c0c4b This is a cleanup commit. Commit 6dec83ff removed assignment of `rsp` pointer in SOL-processing block of ipmi_lan_poll_single(), but left the check for the pointer validity in place. Although that has effectively fixed the bug of potentially accessing the null `rsp` pointer in the `else` block introduced with be2c0c4b, the resulting if/else looked suspicious and left and impression that a NULL pointer could still be accessed. This commit removes the check for `rsp` from the `if` as it is checked at the start of the function where `rsp` is initialized (and that is the only place where it is ever changed). Signed-off-by: Alexander Amelkin --- src/plugins/lanplus/lanplus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/lanplus/lanplus.c b/src/plugins/lanplus/lanplus.c index c4041a8..aabcf94 100644 --- a/src/plugins/lanplus/lanplus.c +++ b/src/plugins/lanplus/lanplus.c @@ -844,7 +844,7 @@ ipmi_lan_poll_single(struct ipmi_intf * intf) } read_sol_packet(rsp, &offset); extra_data_length = payload_size - (offset - payload_start); - if (rsp && extra_data_length) { + if (extra_data_length) { rsp->data_len = extra_data_length; memmove(rsp->data, rsp->data + offset, extra_data_length); } else {