public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: ip: make ip_mc_validate_source() return drop reason

Browse source 
Make ip_mc_validate_source() return drop reason, and adjust the call of
it in ip_route_input_mc().

Another caller of it is ip_rcv_finish_core->udp_v4_early_demux, and the
errno is not checked in detail, so we don't do more adjustment for it.

The drop reason "SKB_DROP_REASON_IP_LOCALNET" is added in this commit.

Signed-off-by: Menglong Dong <dongml2@chinatelecom.cn>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Menglong Dong 2024-11-07 20:55:55 +08:00 • committed by Paolo Abeni
parent c6c670784b
commit d46f827016
3 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/net/dropreason-core.h
View file

@ -78,6 +78,7 @@
FN(IP_INNOROUTES) \ FN(IP_INNOROUTES) \
FN(IP_LOCAL_SOURCE) \ FN(IP_LOCAL_SOURCE) \
FN(IP_INVALID_SOURCE) \ FN(IP_INVALID_SOURCE) \
FN(IP_LOCALNET) \
FN(PKT_TOO_BIG) \ FN(PKT_TOO_BIG) \
FN(DUP_FRAG) \ FN(DUP_FRAG) \
FN(FRAG_REASM_TIMEOUT) \ FN(FRAG_REASM_TIMEOUT) \
@ -383,6 +384,8 @@ enum skb_drop_reason {
* 2) source ip is zero and not IGMP * 2) source ip is zero and not IGMP
*/ */
SKB_DROP_REASON_IP_INVALID_SOURCE, SKB_DROP_REASON_IP_INVALID_SOURCE,
/** @SKB_DROP_REASON_IP_LOCALNET: source or dest ip is local net */
SKB_DROP_REASON_IP_LOCALNET,
/** /**
* @SKB_DROP_REASON_PKT_TOO_BIG: packet size is too big (maybe exceed the * @SKB_DROP_REASON_PKT_TOO_BIG: packet size is too big (maybe exceed the
* MTU) * MTU)

7
include/net/route.h
View file

@ -199,9 +199,10 @@ static inline struct rtable *ip_route_output_gre(struct net *net, struct flowi4
return ip_route_output_key(net, fl4); return ip_route_output_key(net, fl4);
} }
int ip_mc_validate_source(struct sk_buff *skb, __be32 daddr, __be32 saddr, enum skb_drop_reason
dscp_t dscp, struct net_device *dev, ip_mc_validate_source(struct sk_buff *skb, __be32 daddr, __be32 saddr,
struct in_device *in_dev, u32 *itag); dscp_t dscp, struct net_device *dev,
struct in_device *in_dev, u32 *itag);
int ip_route_input_noref(struct sk_buff *skb, __be32 daddr, __be32 saddr, int ip_route_input_noref(struct sk_buff *skb, __be32 daddr, __be32 saddr,
dscp_t dscp, struct net_device *dev); dscp_t dscp, struct net_device *dev);
int ip_route_use_hint(struct sk_buff *skb, __be32 daddr, __be32 saddr, int ip_route_use_hint(struct sk_buff *skb, __be32 daddr, __be32 saddr,

35
net/ipv4/route.c
View file

@ -1678,34 +1678,37 @@ struct rtable *rt_dst_clone(struct net_device *dev, struct rtable *rt)
EXPORT_SYMBOL(rt_dst_clone); EXPORT_SYMBOL(rt_dst_clone);
/* called in rcu_read_lock() section */ /* called in rcu_read_lock() section */
int ip_mc_validate_source(struct sk_buff *skb, __be32 daddr, __be32 saddr, enum skb_drop_reason
dscp_t dscp, struct net_device *dev, ip_mc_validate_source(struct sk_buff *skb, __be32 daddr, __be32 saddr,
struct in_device *in_dev, u32 *itag) dscp_t dscp, struct net_device *dev,
struct in_device *in_dev, u32 *itag)
{ {
enum skb_drop_reason reason; enum skb_drop_reason reason;
/* Primary sanity checks. */ /* Primary sanity checks. */
if (!in_dev) if (!in_dev)
return -EINVAL; return SKB_DROP_REASON_NOT_SPECIFIED;
if (ipv4_is_multicast(saddr) || ipv4_is_lbcast(saddr) || if (ipv4_is_multicast(saddr) || ipv4_is_lbcast(saddr))
skb->protocol != htons(ETH_P_IP)) return SKB_DROP_REASON_IP_INVALID_SOURCE;
return -EINVAL;
if (skb->protocol != htons(ETH_P_IP))
return SKB_DROP_REASON_INVALID_PROTO;
if (ipv4_is_loopback(saddr) && !IN_DEV_ROUTE_LOCALNET(in_dev)) if (ipv4_is_loopback(saddr) && !IN_DEV_ROUTE_LOCALNET(in_dev))
return -EINVAL; return SKB_DROP_REASON_IP_LOCALNET;
if (ipv4_is_zeronet(saddr)) { if (ipv4_is_zeronet(saddr)) {
if (!ipv4_is_local_multicast(daddr) && if (!ipv4_is_local_multicast(daddr) &&
ip_hdr(skb)->protocol != IPPROTO_IGMP) ip_hdr(skb)->protocol != IPPROTO_IGMP)
return -EINVAL; return SKB_DROP_REASON_IP_INVALID_SOURCE;
} else { } else {
reason = fib_validate_source_reason(skb, saddr, 0, dscp, 0, reason = fib_validate_source_reason(skb, saddr, 0, dscp, 0,
dev, in_dev, itag); dev, in_dev, itag);
if (reason) if (reason)
return -EINVAL; return reason;
} }
return 0; return SKB_NOT_DROPPED_YET;
} }
/* called in rcu_read_lock() section */ /* called in rcu_read_lock() section */
@ -1715,14 +1718,14 @@ ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr,
{ {
struct in_device *in_dev = __in_dev_get_rcu(dev); struct in_device *in_dev = __in_dev_get_rcu(dev);
unsigned int flags = RTCF_MULTICAST; unsigned int flags = RTCF_MULTICAST;
enum skb_drop_reason reason;
struct rtable *rth; struct rtable *rth;
u32 itag = 0; u32 itag = 0;
int err;
err = ip_mc_validate_source(skb, daddr, saddr, dscp, dev, in_dev, reason = ip_mc_validate_source(skb, daddr, saddr, dscp, dev, in_dev,
&itag); &itag);
if (err) if (reason)
return SKB_DROP_REASON_NOT_SPECIFIED; return reason;
if (our) if (our)
flags |= RTCF_LOCAL; flags |= RTCF_LOCAL;