diff options
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/netfilter/ip_conntrack_netlink.c | 2 | ||||
-rw-r--r-- | net/ipv4/tcp_input.c | 6 | ||||
-rw-r--r-- | net/ipv4/tcp_probe.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_netlink.c b/net/ipv4/netfilter/ip_conntrack_netlink.c index 5fcf91d617cd..6f31fad9be13 100644 --- a/net/ipv4/netfilter/ip_conntrack_netlink.c +++ b/net/ipv4/netfilter/ip_conntrack_netlink.c | |||
@@ -959,7 +959,7 @@ ctnetlink_create_conntrack(struct nfattr *cda[], | |||
959 | if (cda[CTA_PROTOINFO-1]) { | 959 | if (cda[CTA_PROTOINFO-1]) { |
960 | err = ctnetlink_change_protoinfo(ct, cda); | 960 | err = ctnetlink_change_protoinfo(ct, cda); |
961 | if (err < 0) | 961 | if (err < 0) |
962 | return err; | 962 | goto err; |
963 | } | 963 | } |
964 | 964 | ||
965 | #if defined(CONFIG_IP_NF_CONNTRACK_MARK) | 965 | #if defined(CONFIG_IP_NF_CONNTRACK_MARK) |
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index c701f6abbfc1..5c16e24a6061 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -4420,9 +4420,11 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb, | |||
4420 | * But, this leaves one open to an easy denial of | 4420 | * But, this leaves one open to an easy denial of |
4421 | * service attack, and SYN cookies can't defend | 4421 | * service attack, and SYN cookies can't defend |
4422 | * against this problem. So, we drop the data | 4422 | * against this problem. So, we drop the data |
4423 | * in the interest of security over speed. | 4423 | * in the interest of security over speed unless |
4424 | * it's still in use. | ||
4424 | */ | 4425 | */ |
4425 | goto discard; | 4426 | kfree_skb(skb); |
4427 | return 0; | ||
4426 | } | 4428 | } |
4427 | goto discard; | 4429 | goto discard; |
4428 | 4430 | ||
diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c index f230eeecf092..41c157848181 100644 --- a/net/ipv4/tcp_probe.c +++ b/net/ipv4/tcp_probe.c | |||
@@ -30,7 +30,7 @@ | |||
30 | 30 | ||
31 | #include <net/tcp.h> | 31 | #include <net/tcp.h> |
32 | 32 | ||
33 | MODULE_AUTHOR("Stephen Hemminger <shemminger@osdl.org>"); | 33 | MODULE_AUTHOR("Stephen Hemminger <shemminger@linux-foundation.org>"); |
34 | MODULE_DESCRIPTION("TCP cwnd snooper"); | 34 | MODULE_DESCRIPTION("TCP cwnd snooper"); |
35 | MODULE_LICENSE("GPL"); | 35 | MODULE_LICENSE("GPL"); |
36 | 36 | ||