git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dccp: limit sk_filter trim to payload
[pandora-kernel.git]
/
net
/
dccp
/
ipv4.c
diff --git
a/net/dccp/ipv4.c
b/net/dccp/ipv4.c
index
3f4e541
..
d336501
100644
(file)
--- a/
net/dccp/ipv4.c
+++ b/
net/dccp/ipv4.c
@@
-434,8
+434,8
@@
exit:
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENDROPS);
return NULL;
put_and_exit:
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_LISTENDROPS);
return NULL;
put_and_exit:
-
bh_unlock_sock
(newsk);
-
sock_put
(newsk);
+
inet_csk_prepare_forced_close
(newsk);
+
dccp_done
(newsk);
goto exit;
}
goto exit;
}
@@
-877,7
+877,7
@@
static int dccp_v4_rcv(struct sk_buff *skb)
goto discard_and_relse;
nf_reset(skb);
goto discard_and_relse;
nf_reset(skb);
- return
sk_receive_skb(sk, skb, 1
);
+ return
__sk_receive_skb(sk, skb, 1, dh->dccph_doff * 4
);
no_dccp_socket:
if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb))
no_dccp_socket:
if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb))