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

[Dann Frazier]

Author: dannf
Date: Sat May  4 01:45:44 2013
New Revision: 20006

Log:
remove duplicate hunk

Modified:
   dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/tipc-fix-info-leaks-via-msg_name-in-recv_msg-recv_st.patch

Modified: dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/tipc-fix-info-leaks-via-msg_name-in-recv_msg-recv_st.patch
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/tipc-fix-info-leaks-via-msg_name-in-recv_msg-recv_st.patch	Sat May  4 01:15:12 2013	(r20005)
+++ dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/tipc-fix-info-leaks-via-msg_name-in-recv_msg-recv_st.patch	Sat May  4 01:45:44 2013	(r20006)
@@ -24,18 +24,6 @@
 Signed-off-by: David S. Miller <davem at davemloft.net>
 [dannf: backported to Debian's 2.6.32]
 
-diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
-index 523efbb..2984999 100644
---- a/net/rose/af_rose.c
-+++ b/net/rose/af_rose.c
-@@ -1275,6 +1275,7 @@ static int rose_recvmsg(struct kiocb *iocb, struct socket *sock,
- 	skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
- 
- 	if (srose != NULL) {
-+		memset(srose, 0, msg->msg_namelen);
- 		srose->srose_family = AF_ROSE;
- 		srose->srose_addr   = rose->dest_addr;
- 		srose->srose_call   = rose->dest_call;
 diff --git a/net/tipc/socket.c b/net/tipc/socket.c
 index bf4b320..f5b0547 100644
 --- a/net/tipc/socket.c