]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
rdma: Don't pass garbage to rd_check_is_filtered()
authorPhil Sutter <phil@nwl.cc>
Thu, 18 Oct 2018 12:35:50 +0000 (14:35 +0200)
committerStephen Hemminger <stephen@networkplumber.org>
Mon, 22 Oct 2018 17:05:43 +0000 (10:05 -0700)
Variables 'src_port' and 'dst_port' are initialized only if attributes
RDMA_NLDEV_ATTR_RES_SRC_ADDR or RDMA_NLDEV_ATTR_RES_DST_ADDR are
present. Make sure to pass them over to rd_check_is_filtered() only if
that is the case.

Fixes: 9a362cc71a455 ("rdma: Add CM_ID resource tracking information")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
rdma/res.c

index 074b9929a38b2f9e94fd301470a8815c3488be91..0d8c1c388c4ca4d997e17667c4b9e045c3d203d0 100644 (file)
@@ -621,6 +621,8 @@ static int res_cm_id_parse_cb(const struct nlmsghdr *nlh, void *data)
                        if (rd_check_is_string_filtered(rd, "src-addr",
                                                        src_addr_str))
                                continue;
+                       if (rd_check_is_filtered(rd, "src-port", src_port))
+                               continue;
                }
 
                if (nla_line[RDMA_NLDEV_ATTR_RES_DST_ADDR]) {
@@ -630,14 +632,10 @@ static int res_cm_id_parse_cb(const struct nlmsghdr *nlh, void *data)
                        if (rd_check_is_string_filtered(rd, "dst-addr",
                                                        dst_addr_str))
                                continue;
+                       if (rd_check_is_filtered(rd, "dst-port", dst_port))
+                               continue;
                }
 
-               if (rd_check_is_filtered(rd, "src-port", src_port))
-                       continue;
-
-               if (rd_check_is_filtered(rd, "dst-port", dst_port))
-                       continue;
-
                if (nla_line[RDMA_NLDEV_ATTR_RES_PID]) {
                        pid = mnl_attr_get_u32(
                                        nla_line[RDMA_NLDEV_ATTR_RES_PID]);