9 files changed, 15 insertions, 8 deletions

diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index 7769c9b36d75..34c4436fd18f 100644
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -160,6 +160,7 @@ struct inet_cork {
         char                    priority;
         __u16                   gso_size;
         u64                     transmit_time;
+        u32                     mark;
 };
 
 struct inet_cork_full {
diff --git a/include/net/ip.h b/include/net/ip.h
index 29d89de39822..95bb77f95bcc 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -88,6 +88,7 @@ static inline void ipcm_init_sk(struct ipcm_cookie *ipcm,
 {
         ipcm_init(ipcm);
 
+        ipcm->sockc.mark = inet->sk.sk_mark;
         ipcm->sockc.tsflags = inet->sk.sk_tsflags;
         ipcm->oif = inet->sk.sk_bound_dev_if;
         ipcm->addr = inet->inet_saddr;
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index cc7ef0d05bbd..5eb73775c3f7 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1266,6 +1266,7 @@ static int ip_setup_cork(struct sock *sk, struct inet_cork *cork,
         cork->length = 0;
         cork->ttl = ipc->ttl;
         cork->tos = ipc->tos;
+        cork->mark = ipc->sockc.mark;
         cork->priority = ipc->priority;
         cork->transmit_time = ipc->sockc.transmit_time;
         cork->tx_flags = 0;
@@ -1529,7 +1530,7 @@ struct sk_buff *__ip_make_skb(struct sock *sk,
         }
 
         skb->priority = (cork->tos != -1) ? cork->priority: sk->sk_priority;
-        skb->mark = sk->sk_mark;
+        skb->mark = cork->mark;
         skb->tstamp = cork->transmit_time;
         /*
          * Steal rt from cork.dst to avoid a pair of atomic_inc/atomic_dec
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 9d24ef5c5d8f..535427292194 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -781,7 +781,7 @@ static int ping_v4_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
         } else if (!ipc.oif)
                 ipc.oif = inet->uc_index;
 
-        flowi4_init_output(&fl4, ipc.oif, sk->sk_mark, tos,
+        flowi4_init_output(&fl4, ipc.oif, ipc.sockc.mark, tos,
                            RT_SCOPE_UNIVERSE, sk->sk_protocol,
                            inet_sk_flowi_flags(sk), faddr, saddr, 0, 0,
                            sk->sk_uid);
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 40a6abbc9cf6..80da5a66d5d7 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -375,7 +375,7 @@ static int raw_send_hdrinc(struct sock *sk, struct flowi4 *fl4,
         skb_reserve(skb, hlen);
 
         skb->priority = sk->sk_priority;
-        skb->mark = sk->sk_mark;
+        skb->mark = sockc->mark;
         skb->tstamp = sockc->transmit_time;
         skb_dst_set(skb, &rt->dst);
         *rtp = NULL;
@@ -623,7 +623,7 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
                 }
         }
 
-        flowi4_init_output(&fl4, ipc.oif, sk->sk_mark, tos,
+        flowi4_init_output(&fl4, ipc.oif, ipc.sockc.mark, tos,
                            RT_SCOPE_UNIVERSE,
                            hdrincl ? IPPROTO_RAW : sk->sk_protocol,
                            inet_sk_flowi_flags(sk) |
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index d88821c794fb..fbcd9be3a470 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1130,7 +1130,7 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
 
                 fl4 = &fl4_stack;
 
-                flowi4_init_output(fl4, ipc.oif, sk->sk_mark, tos,
+                flowi4_init_output(fl4, ipc.oif, ipc.sockc.mark, tos,
                                    RT_SCOPE_UNIVERSE, sk->sk_protocol,
                                    flow_flags,
                                    faddr, saddr, dport, inet->inet_sport,
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 8e49fd62eea9..89a4c7c2e25d 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1294,6 +1294,7 @@ static int ip6_setup_cork(struct sock *sk, struct inet_cork_full *cork,
         cork->base.fragsize = mtu;
         cork->base.gso_size = ipc6->gso_size;
         cork->base.tx_flags = 0;
+        cork->base.mark = ipc6->sockc.mark;
         sock_tx_timestamp(sk, ipc6->sockc.tsflags, &cork->base.tx_flags);
 
         if (dst_allfrag(xfrm_dst_path(&rt->dst)))
@@ -1764,7 +1765,7 @@ struct sk_buff *__ip6_make_skb(struct sock *sk,
         hdr->daddr = *final_dst;
 
         skb->priority = sk->sk_priority;
-        skb->mark = sk->sk_mark;
+        skb->mark = cork->base.mark;
 
         skb->tstamp = cork->base.transmit_time;
 
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 8a6131991e38..6e1888ee4036 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -646,7 +646,7 @@ static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, int length,
 
         skb->protocol = htons(ETH_P_IPV6);
         skb->priority = sk->sk_priority;
-        skb->mark = sk->sk_mark;
+        skb->mark = sockc->mark;
         skb->tstamp = sockc->transmit_time;
 
         skb_put(skb, length);
@@ -810,6 +810,7 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
 
         ipcm6_init(&ipc6);
         ipc6.sockc.tsflags = sk->sk_tsflags;
+        ipc6.sockc.mark = sk->sk_mark;
 
         if (sin6) {
                 if (addr_len < SIN6_LEN_RFC2133)
@@ -891,6 +892,7 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
         opt = ipv6_fixup_options(&opt_space, opt);
 
         fl6.flowi6_proto = proto;
+        fl6.flowi6_mark = ipc6.sockc.mark;
 
         if (!hdrincl) {
                 rfv.msg = msg;
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 827fe7385078..2c8beb3896d1 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -1230,6 +1230,7 @@ int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
         ipcm6_init(&ipc6);
         ipc6.gso_size = up->gso_size;
         ipc6.sockc.tsflags = sk->sk_tsflags;
+        ipc6.sockc.mark = sk->sk_mark;
 
         /* destination address check */
         if (sin6) {
@@ -1352,7 +1353,7 @@ do_udp_sendmsg:
         if (!fl6.flowi6_oif)
                 fl6.flowi6_oif = np->sticky_pktinfo.ipi6_ifindex;
 
-        fl6.flowi6_mark = sk->sk_mark;
+        fl6.flowi6_mark = ipc6.sockc.mark;
         fl6.flowi6_uid = sk->sk_uid;
 
         if (msg->msg_controllen) {