]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
Make second arg to skb_reserved() signed, from DaveM.
authorChris Wright <chrisw@sous-sol.org>
Tue, 24 Jan 2006 19:34:40 +0000 (11:34 -0800)
committerChris Wright <chrisw@sous-sol.org>
Tue, 24 Jan 2006 19:34:40 +0000 (11:34 -0800)
queue/net-make-second-arg-to-skb_reserved-signed.patch [new file with mode: 0644]
queue/series

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 (file)
index 0000000..da14503
--- /dev/null
@@ -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 <akpm@osdl.org>
+To: stable@kernel.org
+Message-Id: <20060120043134.65a14bfd.akpm@osdl.org>
+Cc: "David S. Miller" <davem@davemloft.net>
+Subject: [NET]: Make second arg to skb_reserved() signed.
+
+From: David S. Miller <davem@davemloft.net>
+
+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 <davem@davemloft.net>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+ 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;
index a55dc214f6534843a9ba77507e91540444439a85..63f8dd271ccc32c86c3e1bdb826cb0b316e3febd 100644 (file)
@@ -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