From: Florian Westphal <fw@strlen.de>
Date: Wed, 28 Jan 2015 09:56:04 +0000 (+0100)
Subject: ppp: deflate: never return len larger than output buffer
X-Git-Tag: v3.2.69~32
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=8bcd64423836bad3638684677f6d740bc7c9297f;hp=8bcd64423836bad3638684677f6d740bc7c9297f;ds=sidebyside

ppp: deflate: never return len larger than output buffer

[ Upstream commit e2a4800e75780ccf4e6c2487f82b688ba736eb18 ]

When we've run out of space in the output buffer to store more data, we
will call zlib_deflate with a NULL output buffer until we've consumed
remaining input.

When this happens, olen contains the size the output buffer would have
consumed iff we'd have had enough room.

This can later cause skb_over_panic when ppp_generic skb_put()s
the returned length.

Reported-by: Iain Douglas <centos@1n6.org.uk>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---