[kernel] r20005 - dists/squeeze-security/linux-2.6/debian/patches/bugfix/all

[Dann Frazier]

Author: dannf
Date: Sat May  4 01:15:12 2013
New Revision: 20005

Log:
adjust offsets

Modified:
   dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/irda-Fix-missing-msg_namelen-update-in-irda_recvmsg_.patch

Modified: dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/irda-Fix-missing-msg_namelen-update-in-irda_recvmsg_.patch
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/irda-Fix-missing-msg_namelen-update-in-irda_recvmsg_.patch	Sat May  4 00:56:55 2013	(r20004)
+++ dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/irda-Fix-missing-msg_namelen-update-in-irda_recvmsg_.patch	Sat May  4 01:15:12 2013	(r20005)
@@ -15,23 +15,18 @@
 Cc: Samuel Ortiz <samuel at sortiz.org>
 Signed-off-by: Mathias Krause <minipli at googlemail.com>
 Signed-off-by: David S. Miller <davem at davemloft.net>
----
- net/irda/af_irda.c |    2 ++
- 1 file changed, 2 insertions(+)
+[dannf: adjusted to apply to Debian's 2.6.32]
 
 diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
-index d28e7f0..e493b33 100644
+index 476b24e..bfb325d 100644
 --- a/net/irda/af_irda.c
 +++ b/net/irda/af_irda.c
-@@ -1386,6 +1386,8 @@ static int irda_recvmsg_dgram(struct kiocb *iocb, struct socket *sock,
- 
- 	IRDA_DEBUG(4, "%s()\n", __func__);
+@@ -1338,6 +1338,8 @@ static int irda_recvmsg_dgram(struct kiocb *iocb, struct socket *sock,
+ 	if ((err = sock_error(sk)) < 0)
+ 		return err;
  
 +	msg->msg_namelen = 0;
 +
  	skb = skb_recv_datagram(sk, flags & ~MSG_DONTWAIT,
  				flags & MSG_DONTWAIT, &err);
  	if (!skb)
--- 
-1.7.10.4
-