slip: make slhc_free() silently accept an error pointer [Linux 3.16.72]

This Linux kernel change "slip: make slhc_free() silently accept an error pointer" is included in the Linux 3.16.72 release. This change is authored by Linus Torvalds <torvalds [at] linux-foundation.org> on Thu Apr 25 16:13:58 2019 -0700. The commit for this change in Linux stable tree is 5a95f35 (patch) which is from upstream commit baf76f0. The same Linux upstream change may have been applied to various maintained Linux releases and you can find all Linux releases containing changes from upstream baf76f0.

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: [email protected]
Fixes: 4ab42d78e37a ("ppp, slip: Validate VJ compression slot parameters completely")
Acked-by: Ben Hutchings <[email protected]>
Cc: David Miller <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Signed-off-by: Ben Hutchings <[email protected]>

There are 2 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/net/slip/slhc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
index b52eabc..f8234b5 100644
--- a/drivers/net/slip/slhc.c
+++ b/drivers/net/slip/slhc.c
@@ -153,7 +153,7 @@ struct slcompress *
 void
 slhc_free(struct slcompress *comp)
 {
-   if ( comp == NULLSLCOMPR )
+   if ( IS_ERR_OR_NULL(comp) )
        return;

    if ( comp->tstate != NULLSLSTATE )

Leave a Reply

Your email address will not be published. Required fields are marked *