lkml.org 
[lkml]   [2021]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 039/168] net: remove the unnecessary check in cipso_v4_doi_free
    Date
    From: 王贇 <yun.wang@linux.alibaba.com>

    commit 9756e44fd4d283ebcc94df353642f322428b73de upstream.

    The commit 733c99ee8be9 ("net: fix NULL pointer reference in
    cipso_v4_doi_free") was merged by a mistake, this patch try
    to cleanup the mess.

    And we already have the commit e842cb60e8ac ("net: fix NULL
    pointer reference in cipso_v4_doi_free") which fixed the root
    cause of the issue mentioned in it's description.

    Suggested-by: Paul Moore <paul@paul-moore.com>
    Signed-off-by: Michael Wang <yun.wang@linux.alibaba.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/ipv4/cipso_ipv4.c | 18 ++++++++----------
    1 file changed, 8 insertions(+), 10 deletions(-)

    --- a/net/ipv4/cipso_ipv4.c
    +++ b/net/ipv4/cipso_ipv4.c
    @@ -465,16 +465,14 @@ void cipso_v4_doi_free(struct cipso_v4_d
    if (!doi_def)
    return;

    - if (doi_def->map.std) {
    - switch (doi_def->type) {
    - case CIPSO_V4_MAP_TRANS:
    - kfree(doi_def->map.std->lvl.cipso);
    - kfree(doi_def->map.std->lvl.local);
    - kfree(doi_def->map.std->cat.cipso);
    - kfree(doi_def->map.std->cat.local);
    - kfree(doi_def->map.std);
    - break;
    - }
    + switch (doi_def->type) {
    + case CIPSO_V4_MAP_TRANS:
    + kfree(doi_def->map.std->lvl.cipso);
    + kfree(doi_def->map.std->lvl.local);
    + kfree(doi_def->map.std->cat.cipso);
    + kfree(doi_def->map.std->cat.local);
    + kfree(doi_def->map.std);
    + break;
    }
    kfree(doi_def);
    }

    \
     
     \ /
      Last update: 2021-09-20 20:41    [W:6.784 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site