qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: ipv6: add skb drop reasons to ip6_rcv_core() 

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2059161
Upstream Status: linux.git
Conflicts:\
- No call to dev_core_stats_rx_otherhost_dropped_inc call in
  ip6_rcv_core due to missing upstream commit 794c24e9921f ("net-core:
  rx_otherhost_dropped to core_stats") in c9s.

commit 4daf841a2ef3b2e987894c8107d309ce2b67c202
Author: Menglong Dong <imagedong@tencent.com>
Date:   Wed Apr 13 16:15:59 2022 +0800

    net: ipv6: add skb drop reasons to ip6_rcv_core()

    Replace kfree_skb() used in ip6_rcv_core() with kfree_skb_reason().
    No new drop reasons are added.

    Seems now we use 'SKB_DROP_REASON_IP_INHDR' for too many case during
    ipv6 header parse or check, just like what 'IPSTATS_MIB_INHDRERRORS'
    do. Will it be too general and hard to know what happened?

    Signed-off-by: Menglong Dong <imagedong@tencent.com>
    Reviewed-by: Jiang Biao <benbjiang@tencent.com>
    Reviewed-by: Hao Peng <flyingpeng@tencent.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Antoine Tenart <atenart@redhat.com>
This commit is contained in:
Antoine Tenart 2022-10-10 14:47:09 +02:00
parent c9b5607540
commit fc225c396f
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
net/ipv6/ip6_input.c
View File

@ -145,12 +145,13 @@ static void ip6_list_rcv_finish(struct net *net, struct sock *sk,
static struct sk_buff *ip6_rcv_core(struct sk_buff *skb, struct net_device *dev,
struct net *net)
{
enum skb_drop_reason reason;
const struct ipv6hdr *hdr;
u32 pkt_len;
struct inet6_dev *idev;
if (skb->pkt_type == PACKET_OTHERHOST) {
kfree_skb(skb);
kfree_skb_reason(skb, SKB_DROP_REASON_OTHERHOST);
return NULL;
}
@ -160,9 +161,12 @@ static struct sk_buff *ip6_rcv_core(struct sk_buff *skb, struct net_device *dev,
__IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_IN, skb->len);
SKB_DR_SET(reason, NOT_SPECIFIED);
if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL ||
!idev || unlikely(idev->cnf.disable_ipv6)) {
__IP6_INC_STATS(net, idev, IPSTATS_MIB_INDISCARDS);
if (unlikely(idev->cnf.disable_ipv6))
SKB_DR_SET(reason, IPV6DISABLED);
goto drop;
}
@ -186,8 +190,10 @@ static struct sk_buff *ip6_rcv_core(struct sk_buff *skb, struct net_device *dev,
hdr = ipv6_hdr(skb);
if (hdr->version != 6)
if (hdr->version != 6) {
SKB_DR_SET(reason, UNHANDLED_PROTO);
goto err;
}
__IP6_ADD_STATS(net, idev,
IPSTATS_MIB_NOECTPKTS +
@ -225,8 +231,10 @@ static struct sk_buff *ip6_rcv_core(struct sk_buff *skb, struct net_device *dev,
if (!ipv6_addr_is_multicast(&hdr->daddr) &&
(skb->pkt_type == PACKET_BROADCAST ||
skb->pkt_type == PACKET_MULTICAST) &&
idev->cnf.drop_unicast_in_l2_multicast)
idev->cnf.drop_unicast_in_l2_multicast) {
SKB_DR_SET(reason, UNICAST_IN_L2_MULTICAST);
goto err;
}
/* RFC4291 2.7
* Nodes must not originate a packet to a multicast address whose scope
@ -255,12 +263,11 @@ static struct sk_buff *ip6_rcv_core(struct sk_buff *skb, struct net_device *dev,
if (pkt_len + sizeof(struct ipv6hdr) > skb->len) {
__IP6_INC_STATS(net,
idev, IPSTATS_MIB_INTRUNCATEDPKTS);
SKB_DR_SET(reason, PKT_TOO_SMALL);
goto drop;
}
if (pskb_trim_rcsum(skb, pkt_len + sizeof(struct ipv6hdr))) {
__IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);
goto drop;
}
if (pskb_trim_rcsum(skb, pkt_len + sizeof(struct ipv6hdr)))
goto err;
hdr = ipv6_hdr(skb);
}
@ -281,9 +288,10 @@ static struct sk_buff *ip6_rcv_core(struct sk_buff *skb, struct net_device *dev,
return skb;
err:
__IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);
SKB_DR_OR(reason, IP_INHDR);
drop:
rcu_read_unlock();
kfree_skb(skb);
kfree_skb_reason(skb, reason);
return NULL;
}