r2706 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches patches/series

[Andres Salomon]

Author: dilinger-guest
Date: 2005-03-14 11:13:31 +0100 (Mon, 14 Mar 2005)
New Revision: 2706

Added:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/123-atm_get_addr_signedness_fix.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-14
Log:
  * [SECURITY] 123-atm_get_addr_signedness_fix.dpatch
    Fix atm_get_addr()'s usage of its size arg, by making it
    unsigned.  WDYBTGT3-3 on
    http://www.guninski.com/where_do_you_want_billg_to_go_today_3.html
    (Andres Salomon).



Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2005-03-14 10:08:56 UTC (rev 2705)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2005-03-14 10:13:31 UTC (rev 2706)
@@ -96,6 +96,12 @@
     http://www.guninski.com/where_do_you_want_billg_to_go_today_3.html
     (Andres Salomon).
 
+  * [SECURITY] 123-atm_get_addr_signedness_fix.dpatch
+    Fix atm_get_addr()'s usage of its size arg, by making it
+    unsigned.  WDYBTGT3-3 on
+    http://www.guninski.com/where_do_you_want_billg_to_go_today_3.html
+    (Andres Salomon).
+
  -- Joshua Kwan <joshk@triplehelix.org>  Mon, 14 Mar 2005 00:03:12 -0800
 
 kernel-source-2.6.8 (2.6.8-13) unstable; urgency=high

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/123-atm_get_addr_signedness_fix.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/123-atm_get_addr_signedness_fix.dpatch	2005-03-14 10:08:56 UTC (rev 2705)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/123-atm_get_addr_signedness_fix.dpatch	2005-03-14 10:13:31 UTC (rev 2706)
@@ -0,0 +1,54 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: Fix ATM copy-to-user usage.
+## DP: Patch author: torvalds@ppc970.osdl.org
+## DP: Upstream status: backport
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2005/02/08 07:59:56-08:00 torvalds@ppc970.osdl.org 
+#   Fix ATM copy-to-user usage.
+#   
+#   More of the Guninski "copy_to_user() takes a size_t" series.
+# 
+# net/atm/addr.c
+#   2005/02/08 07:59:48-08:00 torvalds@ppc970.osdl.org +1 -1
+#   Fix ATM copy-to-user usage.
+#   
+#   More of the Guninski "copy_to_user() takes a size_t" series.
+# 
+# net/atm/addr.h
+#   2005/02/08 07:59:48-08:00 torvalds@ppc970.osdl.org +1 -1
+#   Fix ATM copy-to-user usage.
+#   
+#   More of the Guninski "copy_to_user() takes a size_t" series.
+# 
+diff -Nru a/net/atm/addr.c b/net/atm/addr.c
+--- a/net/atm/addr.c	2004-10-18 17:53:08.000000000 -0400
++++ b/net/atm/addr.c	2005-02-22 04:09:27.014499056 -0500
+@@ -114,7 +114,7 @@
+ }
+ 
+ 
+-int atm_get_addr(struct atm_dev *dev,struct sockaddr_atmsvc __user *buf,int size)
++int atm_get_addr(struct atm_dev *dev,struct sockaddr_atmsvc __user *buf,size_t size)
+ {
+ 	unsigned long flags;
+ 	struct atm_dev_addr *walk;
+diff -Nru a/net/atm/addr.h b/net/atm/addr.h
+--- a/net/atm/addr.h	2005-02-14 04:38:48 -08:00
++++ b/net/atm/addr.h	2005-02-14 04:38:48 -08:00
+@@ -13,6 +13,6 @@
+ void atm_reset_addr(struct atm_dev *dev);
+ int atm_add_addr(struct atm_dev *dev,struct sockaddr_atmsvc *addr);
+ int atm_del_addr(struct atm_dev *dev,struct sockaddr_atmsvc *addr);
+-int atm_get_addr(struct atm_dev *dev,struct sockaddr_atmsvc __user *buf,int size);
++int atm_get_addr(struct atm_dev *dev,struct sockaddr_atmsvc __user *buf,size_t size);
+ 
+ #endif

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-14
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-14	2005-03-14 10:08:56 UTC (rev 2705)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-14	2005-03-14 10:13:31 UTC (rev 2706)
@@ -26,3 +26,4 @@
 + 115-proc_file_read_nbytes_signedness_fix.dpatch
 + 116-n_tty_copy_from_read_buf_signedness_fixes.dpatch
 + 117-reiserfs_file_64bit_size_t_fixes.dpatch
++ 123-atm_get_addr_signedness_fix.dpatch