tcp md5sig: Use skb's saddr when replying to an incoming segment

[pandora-kernel.git] / net / tipc / socket.c

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 9440a3d..580ecf2 100644 (file)
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -34,6 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <linux/export.h>
 #include <net/sock.h>
 
 #include "core.h"
@@ -828,6 +829,7 @@ static void set_orig_addr(struct msghdr *m, struct tipc_msg *msg)
        if (addr) {
                addr->family = AF_TIPC;
                addr->addrtype = TIPC_ADDR_ID;
+               memset(&addr->addr, 0, sizeof(addr->addr));
                addr->addr.id.ref = msg_origport(msg);
                addr->addr.id.node = msg_orignode(msg);
                addr->addr.name.domain = 0;     /* could leave uninitialized */
@@ -1539,6 +1541,8 @@ static int accept(struct socket *sock, struct socket *new_sock, int flags)
                u32 new_ref = new_tport->ref;
                struct tipc_msg *msg = buf_msg(buf);
 
+               security_sk_clone(sock->sk, new_sock->sk);
+
                lock_sock(new_sk);
 
                /*