mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-10 05:39:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ipv4-Prevent-user-triggerable-warning'

Browse Source 
Ido Schimmel says:

====================
net: ipv4: Prevent user triggerable warning

Patch #1 prevents a user triaggerable warning in the flow dissector by
setting 'skb->dev' in skbs used for IPv4 output route get requests.

Patch #2 adds a test case that triggers the warning without the first
patch.

I have audited all the RTM_GETROUTE handlers and could not find any
other callpath where an skb is passed to the flow dissector with both
'skb->dev' and 'skb->sk' cleared.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2018-12-20 16:42:39 -08:00
parent 639c1b2625 676f4bb168
commit 7de333090a
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
net/ipv4/route.c
View File

@@ -2849,6 +2849,7 @@ static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,
err = -rt->dst.error;
} else {
fl4.flowi4_iif = LOOPBACK_IFINDEX;
skb->dev = net->loopback_dev;
rt = ip_route_output_key_hash_rcu(net, &fl4, &res, skb);
err = 0;
if (IS_ERR(rt))

15
tools/testing/selftests/net/rtnetlink.sh
View File

@@ -205,6 +205,8 @@ kci_test_polrouting()
kci_test_route_get()
{
local hash_policy=$(sysctl -n net.ipv4.fib_multipath_hash_policy)
ret=0
ip route get 127.0.0.1 > /dev/null
@@ -223,6 +225,19 @@ kci_test_route_get()
check_err $?
ip route get 10.23.7.11 from 10.23.7.12 iif "$devdummy" > /dev/null
check_err $?
ip route add 10.23.8.0/24 \
nexthop via 10.23.7.13 dev "$devdummy" \
nexthop via 10.23.7.14 dev "$devdummy"
check_err $?
sysctl -wq net.ipv4.fib_multipath_hash_policy=0
ip route get 10.23.8.11 > /dev/null
check_err $?
sysctl -wq net.ipv4.fib_multipath_hash_policy=1
ip route get 10.23.8.11 > /dev/null
check_err $?
sysctl -wq net.ipv4.fib_multipath_hash_policy="$hash_policy"
ip route del 10.23.8.0/24
check_err $?
ip addr del dev "$devdummy" 10.23.7.11/24
check_err $?