]> www.infradead.org Git - users/dwmw2/linux.git/commit
slip: make slhc_free() silently accept an error pointer
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Apr 2019 23:13:58 +0000 (16:13 -0700)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 13 Aug 2019 11:39:17 +0000 (12:39 +0100)
commit5a95f35b57aed9e4c550c0b17d6c61afd089ad48
tree8ffb26dda4b8d4a776a3bf26960c2fd782f7b760
parentbe90e624dd07070c18544c86896c4184a4f5cd0a
slip: make slhc_free() silently accept an error pointer

commit baf76f0c58aec435a3a864075b8f6d8ee5d1f17e 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 4ab42d78e37a ("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: 4ab42d78e37a ("ppp, slip: Validate VJ compression slot parameters completely")
Acked-by: Ben Hutchings <ben@decadent.org.uk>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/net/slip/slhc.c