Commit d442c82a authored by Linus Torvalds's avatar Linus Torvalds Committed by Greg Kroah-Hartman

slip: make slhc_free() silently accept an error pointer

commit baf76f0c upstream.

This way, slhc_free() accepts what slhc_init() returns, whether that is
an error or not.

In particular, the pattern in sl_alloc_bufs() is

        slcomp = slhc_init(16, 16);
        ...
        slhc_free(slcomp);

for the error handling path, and rather than complicate that code, just
make it ok to always free what was returned by the init function.

That's what the code used to do before commit 4ab42d78 ("ppp, slip:
Validate VJ compression slot parameters completely") when slhc_init()
just returned NULL for the error case, with no actual indication of the
details of the error.

Reported-by: syzbot+45474c076a4927533d2e@syzkaller.appspotmail.com
Fixes: 4ab42d78 ("ppp, slip: Validate VJ compression slot parameters completely")
Acked-by: default avatarBen Hutchings <ben@decadent.org.uk>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d2618e32
...@@ -153,7 +153,7 @@ slhc_init(int rslots, int tslots) ...@@ -153,7 +153,7 @@ slhc_init(int rslots, int tslots)
void void
slhc_free(struct slcompress *comp) slhc_free(struct slcompress *comp)
{ {
if ( comp == NULLSLCOMPR ) if ( IS_ERR_OR_NULL(comp) )
return; return;
if ( comp->tstate != NULLSLSTATE ) if ( comp->tstate != NULLSLSTATE )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment