From: Chris Wright Date: Tue, 24 Jan 2006 19:34:40 +0000 (-0800) Subject: Make second arg to skb_reserved() signed, from DaveM. X-Git-Tag: v2.6.14.7~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c5321a9c0e4d73699586b86898812213c6c24af;p=thirdparty%2Fkernel%2Fstable-queue.git Make second arg to skb_reserved() signed, from DaveM. --- diff --git a/queue/net-make-second-arg-to-skb_reserved-signed.patch b/queue/net-make-second-arg-to-skb_reserved-signed.patch new file mode 100644 index 00000000000..da145033594 --- /dev/null +++ b/queue/net-make-second-arg-to-skb_reserved-signed.patch @@ -0,0 +1,34 @@ +From stable-bounces@linux.kernel.org Fri Jan 20 04:37:22 2006 +Date: Fri, 20 Jan 2006 04:31:34 -0800 +From: Andrew Morton +To: stable@kernel.org +Message-Id: <20060120043134.65a14bfd.akpm@osdl.org> +Cc: "David S. Miller" +Subject: [NET]: Make second arg to skb_reserved() signed. + +From: David S. Miller + +Some subsystems, such as PPP, can send negative values +here. It just happened to work correctly on 32-bit with +an unsigned value, but on 64-bit this explodes. + +Figured out by Paul Mackerras based upon several PPP crash +reports. + +Signed-off-by: David S. Miller +Signed-off-by: Chris Wright +--- + include/linux/skbuff.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- linux-2.6.15.1.orig/include/linux/skbuff.h ++++ linux-2.6.15.1/include/linux/skbuff.h +@@ -927,7 +927,7 @@ static inline int skb_tailroom(const str + * Increase the headroom of an empty &sk_buff by reducing the tail + * room. This is only allowed for an empty buffer. + */ +-static inline void skb_reserve(struct sk_buff *skb, unsigned int len) ++static inline void skb_reserve(struct sk_buff *skb, int len) + { + skb->data += len; + skb->tail += len; diff --git a/queue/series b/queue/series index a55dc214f65..63f8dd271cc 100644 --- a/queue/series +++ b/queue/series @@ -5,3 +5,4 @@ fix-double-decrement-of-mqueue_mnt-mnt_count-in-sys_mq_open.patch fix-oops-in-ufs_fill_super-at-mount-time.patch elevator-as-back-compatibility.patch sparc64-fix-timekeeping-on-ultra-IIe-machines.patch +net-make-second-arg-to-skb_reserved-signed.patch