Просмотр исходного кода

ppp: deflate: never return len larger than output buffer

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>
Florian Westphal 11 лет назад
Родитель
Сommit
e2a4800e75
1 измененных файлов с 1 добавлено и 1 удалено
  1. 1 1
      drivers/net/ppp/ppp_deflate.c

+ 1 - 1
drivers/net/ppp/ppp_deflate.c

@@ -246,7 +246,7 @@ static int z_compress(void *arg, unsigned char *rptr, unsigned char *obuf,
 	/*
 	/*
 	 * See if we managed to reduce the size of the packet.
 	 * See if we managed to reduce the size of the packet.
 	 */
 	 */
-	if (olen < isize) {
+	if (olen < isize && olen <= osize) {
 		state->stats.comp_bytes += olen;
 		state->stats.comp_bytes += olen;
 		state->stats.comp_packets++;
 		state->stats.comp_packets++;
 	} else {
 	} else {