From f4fc39065e5b5f429f158744b4a4e43189b02930 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 17 Mar 2017 13:23:33 +0100 Subject: [PATCH] tc: flower: make use of flower_port_attr_type() safe and silent Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1422629 Upstream Status: iproute2.git commit 6bd5b80cdcfbe commit 6bd5b80cdcfbeb30b79c3ff07ce844f9e4f2c600 Author: Simon Horman Date: Sat Dec 3 09:52:40 2016 +0100 tc: flower: make use of flower_port_attr_type() safe and silent Make use of flower_port_attr_type() safe: * flower_port_attr_type() may return a valid index into tb[] or -1. Only access tb[] in the case of the former. * Do not access null entries in tb[] Also make usage silent - it is valid for ip_proto to be invalid, for example if it is not specified as part of the filter. Fixes: a1fb0d484237 ("tc: flower: Support matching on SCTP ports") Signed-off-by: Simon Horman --- tc/f_flower.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/tc/f_flower.c b/tc/f_flower.c index cac2802..3f0190f 100644 --- a/tc/f_flower.c +++ b/tc/f_flower.c @@ -168,19 +168,17 @@ static int flower_parse_ip_addr(char *str, __be16 eth_type, static int flower_port_attr_type(__u8 ip_proto, bool is_src) { - if (ip_proto == IPPROTO_TCP) { + if (ip_proto == IPPROTO_TCP) return is_src ? TCA_FLOWER_KEY_TCP_SRC : TCA_FLOWER_KEY_TCP_DST; - } else if (ip_proto == IPPROTO_UDP) { + else if (ip_proto == IPPROTO_UDP) return is_src ? TCA_FLOWER_KEY_UDP_SRC : TCA_FLOWER_KEY_UDP_DST; - } else if (ip_proto == IPPROTO_SCTP) { + else if (ip_proto == IPPROTO_SCTP) return is_src ? TCA_FLOWER_KEY_SCTP_SRC : TCA_FLOWER_KEY_SCTP_DST; - } else { - fprintf(stderr, "Illegal \"ip_proto\" for port\n"); + else return -1; - } } static int flower_parse_port(char *str, __u8 ip_proto, bool is_src, @@ -562,7 +560,8 @@ static void flower_print_ip_addr(FILE *f, char *name, __be16 eth_type, static void flower_print_port(FILE *f, char *name, struct rtattr *attr) { - fprintf(f, "\n %s %d", name, rta_getattr_be16(attr)); + if (attr) + fprintf(f, "\n %s %d", name, rta_getattr_be16(attr)); } static void flower_print_key_id(FILE *f, const char *name, @@ -578,6 +577,7 @@ static int flower_print_opt(struct filter_util *qu, FILE *f, struct rtattr *tb[TCA_FLOWER_MAX + 1]; __be16 eth_type = 0; __u8 ip_proto = 0xff; + int nl_type; if (!opt) return 0; @@ -632,10 +632,12 @@ static int flower_print_opt(struct filter_util *qu, FILE *f, tb[TCA_FLOWER_KEY_IPV6_SRC], tb[TCA_FLOWER_KEY_IPV6_SRC_MASK]); - flower_print_port(f, "dst_port", - tb[flower_port_attr_type(ip_proto, false)]); - flower_print_port(f, "src_port", - tb[flower_port_attr_type(ip_proto, true)]); + nl_type = flower_port_attr_type(ip_proto, false); + if (nl_type >= 0) + flower_print_port(f, "dst_port", tb[nl_type]); + nl_type = flower_port_attr_type(ip_proto, true); + if (nl_type >= 0) + flower_print_port(f, "src_port", tb[nl_type]); flower_print_ip_addr(f, "enc_dst_ip", tb[TCA_FLOWER_KEY_ENC_IPV4_DST_MASK] ? -- 1.8.3.1