Skip to content

Instantly share code, notes, and snippets.

@invisiblek
Created December 28, 2014 03:39
Show Gist options
  • Save invisiblek/5c0722a4bb4e10a96b18 to your computer and use it in GitHub Desktop.
Save invisiblek/5c0722a4bb4e10a96b18 to your computer and use it in GitHub Desktop.
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 2d44cde..ea63a57 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -588,8 +588,6 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)
iph->tos;
mark = IP4_REPLY_MARK(net, skb_in->mark);
- mark = IP4_REPLY_MARK(net, skb_in->mark);
-
if (ip_options_echo(&icmp_param.replyopts.opt.opt, skb_in))
goto out_unlock;
diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c
index d507577..e721766 100644
--- a/net/ipv4/syncookies.c
+++ b/net/ipv4/syncookies.c
@@ -348,7 +348,7 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
* hasn't changed since we received the original syn, but I see
* no easy way to do this.
*/
- flowi4_init_output(&fl4, sk->sk_bound_dev_if, sk->sk_mark,
+ flowi4_init_output(&fl4, sk->sk_bound_dev_if, ireq->ir_mark,
RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE, IPPROTO_TCP,
inet_sk_flowi_flags(sk),
(opt && opt->srr) ? opt->faddr : ireq->rmt_addr,
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment