From mboxrd@z Thu Jan 1 00:00:00 1970 From: Serhey Popovych Subject: [PATCH iproute2-next v3 5/8] ipneigh: Use inet_addr_match_rta() Date: Wed, 24 Jan 2018 20:56:37 +0200 Message-ID: <1516820200-13723-6-git-send-email-serhe.popovych@gmail.com> References: <1516820200-13723-1-git-send-email-serhe.popovych@gmail.com> To: netdev@vger.kernel.org Return-path: Received: from mail-lf0-f68.google.com ([209.85.215.68]:37437 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965094AbeAXS4x (ORCPT ); Wed, 24 Jan 2018 13:56:53 -0500 Received: by mail-lf0-f68.google.com with SMTP id 63so258196lfv.4 for ; Wed, 24 Jan 2018 10:56:52 -0800 (PST) Received: from tuxracer.localdomain ([2a01:6d80::195:20:96:53]) by smtp.gmail.com with ESMTPSA id h63sm174842ljf.36.2018.01.24.10.56.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jan 2018 10:56:50 -0800 (PST) In-Reply-To: <1516820200-13723-1-git-send-email-serhe.popovych@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: While there check return from get_prefix() for filter address. Signed-off-by: Serhey Popovych --- ip/ipneigh.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/ip/ipneigh.c b/ip/ipneigh.c index 11f280d..0735424 100644 --- a/ip/ipneigh.c +++ b/ip/ipneigh.c @@ -234,15 +234,9 @@ int print_neigh(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) parse_rtattr(tb, NDA_MAX, NDA_RTA(r), n->nlmsg_len - NLMSG_LENGTH(sizeof(*r))); - if (tb[NDA_DST]) { - if (filter.pfx.family) { - inet_prefix dst = { .family = r->ndm_family }; + if (inet_addr_match_rta(&filter.pfx, tb[NDA_DST])) + return 0; - memcpy(&dst.data, RTA_DATA(tb[NDA_DST]), RTA_PAYLOAD(tb[NDA_DST])); - if (inet_addr_match(&dst, &filter.pfx, filter.pfx.bitlen)) - return 0; - } - } if (filter.unused_only && tb[NDA_CACHEINFO]) { struct nda_cacheinfo *ci = RTA_DATA(tb[NDA_CACHEINFO]); @@ -418,7 +412,8 @@ static int do_show_or_flush(int argc, char **argv, int flush) } if (matches(*argv, "help") == 0) usage(); - get_prefix(&filter.pfx, *argv, filter.family); + if (get_prefix(&filter.pfx, *argv, filter.family)) + invarg("to value is invalid\n", *argv); if (filter.family == AF_UNSPEC) filter.family = filter.pfx.family; } -- 1.7.10.4