Messages in this thread | | | Subject | Re: [PATCH] Revert "net: fix NULL pointer reference in cipso_v4_doi_free" | From | 王贇 <> | Date | Wed, 1 Sep 2021 10:21:27 +0800 |
| |
Hi Paul, it confused me since it's the first time I face such situation, but I just realized what you're asking is actually this revert, correct?
Regards, Michael Wang
On 2021/9/1 上午10:18, 王贇 wrote: > This reverts commit 733c99ee8be9a1410287cdbb943887365e83b2d6. > > Since commit e842cb60e8ac ("net: fix NULL pointer reference in > cipso_v4_doi_free") also applied to fix the root cause, we can > just revert the old version now. > > Suggested-by: Paul Moore <paul@paul-moore.com> > Signed-off-by: Michael Wang <yun.wang@linux.alibaba.com> > --- > net/ipv4/cipso_ipv4.c | 18 ++++++++---------- > 1 file changed, 8 insertions(+), 10 deletions(-) > > diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c > index 7fbd0b5..099259f 100644 > --- a/net/ipv4/cipso_ipv4.c > +++ b/net/ipv4/cipso_ipv4.c > @@ -465,16 +465,14 @@ void cipso_v4_doi_free(struct cipso_v4_doi *doi_def) > 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); > } >
| |