[kernel] r13361 - dists/lenny-security/linux-2.6/debian/patches/bugfix/all

[Dann Frazier]

Author: dannf
Date: Wed Apr  8 06:12:51 2009
New Revision: 13361

Log:
adjust to apply

Modified:
   dists/lenny-security/linux-2.6/debian/patches/bugfix/all/af_rose+x25-sanity-check-the-max-user-frame-size.patch

Modified: dists/lenny-security/linux-2.6/debian/patches/bugfix/all/af_rose+x25-sanity-check-the-max-user-frame-size.patch
==============================================================================
--- dists/lenny-security/linux-2.6/debian/patches/bugfix/all/af_rose+x25-sanity-check-the-max-user-frame-size.patch	Wed Apr  8 06:12:37 2009	(r13360)
+++ dists/lenny-security/linux-2.6/debian/patches/bugfix/all/af_rose+x25-sanity-check-the-max-user-frame-size.patch	Wed Apr  8 06:12:51 2009	(r13361)
@@ -13,9 +13,9 @@
 
 Adjusted to apply to Debian's 2.6.26 by dann frazier <dannf at debian.org>
 
-diff -urpN a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
---- a/net/netrom/af_netrom.c	2008-01-24 15:58:37.000000000 -0700
-+++ b/net/netrom/af_netrom.c	2009-04-07 23:56:09.000000000 -0600
+diff -urpN linux-source-2.6.26.orig/net/netrom/af_netrom.c linux-source-2.6.26/net/netrom/af_netrom.c
+--- linux-source-2.6.26.orig/net/netrom/af_netrom.c	2008-07-13 15:51:29.000000000 -0600
++++ linux-source-2.6.26/net/netrom/af_netrom.c	2009-04-08 00:09:44.000000000 -0600
 @@ -1074,7 +1074,11 @@ static int nr_sendmsg(struct kiocb *iocb
  
  	SOCK_DEBUG(sk, "NET/ROM: sendto: Addresses built.\n");
@@ -29,10 +29,10 @@
  	SOCK_DEBUG(sk, "NET/ROM: sendto: building packet.\n");
  	size = len + NR_NETWORK_LEN + NR_TRANSPORT_LEN;
  
-diff -urpN a/net/rose/af_rose.c b/net/rose/af_rose.c
---- a/net/rose/af_rose.c	2008-01-24 15:58:37.000000000 -0700
-+++ b/net/rose/af_rose.c	2009-04-07 23:56:09.000000000 -0600
-@@ -1100,6 +1100,10 @@ static int rose_sendmsg(struct kiocb *io
+diff -urpN linux-source-2.6.26.orig/net/rose/af_rose.c linux-source-2.6.26/net/rose/af_rose.c
+--- linux-source-2.6.26.orig/net/rose/af_rose.c	2008-07-13 15:51:29.000000000 -0600
++++ linux-source-2.6.26/net/rose/af_rose.c	2009-04-08 00:09:44.000000000 -0600
+@@ -1110,6 +1110,10 @@ static int rose_sendmsg(struct kiocb *io
  
  	/* Build a packet */
  	SOCK_DEBUG(sk, "ROSE: sendto: building packet.\n");
@@ -43,9 +43,9 @@
  	size = len + AX25_BPQ_HEADER_LEN + AX25_MAX_HEADER_LEN + ROSE_MIN_LEN;
  
  	if ((skb = sock_alloc_send_skb(sk, size, msg->msg_flags & MSG_DONTWAIT, &err)) == NULL)
-diff -urpN a/net/x25/af_x25.c b/net/x25/af_x25.c
---- a/net/x25/af_x25.c	2008-01-24 15:58:37.000000000 -0700
-+++ b/net/x25/af_x25.c	2009-04-07 23:56:09.000000000 -0600
+diff -urpN linux-source-2.6.26.orig/net/x25/af_x25.c linux-source-2.6.26/net/x25/af_x25.c
+--- linux-source-2.6.26.orig/net/x25/af_x25.c	2008-07-13 15:51:29.000000000 -0600
++++ linux-source-2.6.26/net/x25/af_x25.c	2009-04-08 00:09:44.000000000 -0600
 @@ -1042,6 +1042,12 @@ static int x25_sendmsg(struct kiocb *ioc
  		sx25.sx25_addr   = x25->dest_addr;
  	}