aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2014-08-22 23:30:12 -0400
committerDavid S. Miller <davem@davemloft.net>2014-08-23 00:08:50 -0400
commit884cf705c7e60bc6ade7ddafcbe943af4dc84604 (patch)
tree6eae5bde7592b9e7adf32eeff183571cb60086f8 /net/core
parentd2de875c6d4cbec8a99c880160181a3ed5b9992e (diff)
net: remove dead code after sk_data_ready change
As a followup to commit 676d23690fb ("net: Fix use after free by removing length arg from sk_data_ready callbacks"), we can remove some useless code in sock_queue_rcv_skb() and rxrpc_queue_rcv_skb() Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/sock.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/net/core/sock.c b/net/core/sock.c
index 2714811afbd8..f7f2352200ad 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -437,7 +437,6 @@ static void sock_disable_timestamp(struct sock *sk, unsigned long flags)
437int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) 437int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
438{ 438{
439 int err; 439 int err;
440 int skb_len;
441 unsigned long flags; 440 unsigned long flags;
442 struct sk_buff_head *list = &sk->sk_receive_queue; 441 struct sk_buff_head *list = &sk->sk_receive_queue;
443 442
@@ -459,13 +458,6 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
459 skb->dev = NULL; 458 skb->dev = NULL;
460 skb_set_owner_r(skb, sk); 459 skb_set_owner_r(skb, sk);
461 460
462 /* Cache the SKB length before we tack it onto the receive
463 * queue. Once it is added it no longer belongs to us and
464 * may be freed by other threads of control pulling packets
465 * from the queue.
466 */
467 skb_len = skb->len;
468
469 /* we escape from rcu protected region, make sure we dont leak 461 /* we escape from rcu protected region, make sure we dont leak
470 * a norefcounted dst 462 * a norefcounted dst
471 */ 463 */