summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorHangbin Liu <liuhangbin@gmail.com>2019-02-27 16:15:29 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-03-10 07:17:17 +0100
commit99ed9458212602e1a286196c488c52952d2e9e7a (patch)
tree3b8cb8bdab23988c002eb4c44fd2ccc4c74687d9 /include/net
parentd61918a5e401bc1911d761a7f0c5c760ea1cac4b (diff)
ipv4: Add ICMPv6 support when parse route ipproto
[ Upstream commit 5e1a99eae84999a2536f50a0beaf5d5262337f40 ] For ip rules, we need to use 'ipproto ipv6-icmp' to match ICMPv6 headers. But for ip -6 route, currently we only support tcp, udp and icmp. Add ICMPv6 support so we can match ipv6-icmp rules for route lookup. v2: As David Ahern and Sabrina Dubroca suggested, Add an argument to rtm_getroute_parse_ip_proto() to handle ICMP/ICMPv6 with different family. Reported-by: Jianlin Shi <jishi@redhat.com> Fixes: eacb9384a3fe ("ipv6: support sport, dport and ip_proto in RTM_GETROUTE") Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/ip.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ip.h b/include/net/ip.h
index e44b1a44f67a..bf2209f861af 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -687,7 +687,7 @@ extern int sysctl_icmp_msgs_burst;
int ip_misc_proc_init(void);
#endif
-int rtm_getroute_parse_ip_proto(struct nlattr *attr, u8 *ip_proto,
+int rtm_getroute_parse_ip_proto(struct nlattr *attr, u8 *ip_proto, u8 family,
struct netlink_ext_ack *extack);
#endif /* _IP_H */