From patchwork Sat Oct 17 21:03:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 531870 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (unknown [IPv6:2600:3c00::f03c:91ff:fe6e:bdf7]) by ozlabs.org (Postfix) with ESMTP id 022A41402A9 for ; Sun, 18 Oct 2015 08:04:02 +1100 (AEDT) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id EEEF710CA4; Sat, 17 Oct 2015 14:03:59 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e4.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id CACC210C49 for ; Sat, 17 Oct 2015 14:03:58 -0700 (PDT) Received: from bar2.cudamail.com (unknown [192.168.21.12]) by mx1e4.cudamail.com (Postfix) with ESMTPS id 2AA691E0145 for ; Sat, 17 Oct 2015 15:03:57 -0600 (MDT) X-ASG-Debug-ID: 1445115836-03dc53014c0e610001-byXFYA Received: from mx1-pf2.cudamail.com ([192.168.24.2]) by bar2.cudamail.com with ESMTP id Nw7L7BCexqppNvGB (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sat, 17 Oct 2015 15:03:56 -0600 (MDT) X-Barracuda-Envelope-From: blp@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.2 Received: from unknown (HELO mail-pa0-f54.google.com) (209.85.220.54) by mx1-pf2.cudamail.com with ESMTPS (RC4-SHA encrypted); 17 Oct 2015 21:03:56 -0000 Received-SPF: unknown (mx1-pf2.cudamail.com: Multiple SPF records returned) X-Barracuda-RBL-Trusted-Forwarder: 209.85.220.54 Received: by pabws5 with SMTP id ws5so29185pab.2 for ; Sat, 17 Oct 2015 14:03:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Fh2fyeyju+fUedwcxml/YTjljATeeOYywbiw09EJ7qc=; b=iYQyIhhhDQnNqsmZu4UxwfDjnl8ko+kQEBspglyXvclhNtw2cpvt+4TATexIVKD6AQ RVqtXab6hgTIEcZDZs7dVzQYAFkx8DnG5wIZJefHDbRBbCNmmIE99vMm0jogepMi5kru wy1H78c2ehruF6z/QNc9W3sXaKot1ZAtkYQViXSQbx3ROvBvWt//kc+9FMxr7YnpHUl9 AaTlhNAcObSSs4d+GCbiwQZ9fixfD5/+mfW2IgSmcbM0RcR6TD++0spI/Ax2Pne6DN64 xGcBmzu4AVjVKmgduyDnCiAJugMaPx8n74KyhHmFs8M+udtLABDu20pclPd0cylS9fWb nwtA== X-Gm-Message-State: ALoCoQmMFN49IHahh3o5puFuJ3ypqJZnqEYoOQbeeIZ21MpPRAVKs5bvMLcSdhsWRX6tOOzzEzfb X-Received: by 10.68.110.165 with SMTP id ib5mr24836058pbb.58.1445115835481; Sat, 17 Oct 2015 14:03:55 -0700 (PDT) Received: from sigabrt.gateway.sonic.net (173-228-112-197.dsl.dynamic.fusionbroadband.com. [173.228.112.197]) by smtp.gmail.com with ESMTPSA id rl17sm28422738pab.2.2015.10.17.14.03.53 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 17 Oct 2015 14:03:54 -0700 (PDT) X-CudaMail-Envelope-Sender: blp@nicira.com X-Barracuda-Apparent-Source-IP: 173.228.112.197 From: Ben Pfaff To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E2-1016029688 X-CudaMail-DTE: 101715 X-CudaMail-Originating-IP: 209.85.220.54 Date: Sat, 17 Oct 2015 14:03:53 -0700 X-ASG-Orig-Subj: [##CM-E2-1016029688##][PATCH] packets: Make ip_parse_masked() pickier about formatting. Message-Id: <1445115833-16291-1-git-send-email-blp@nicira.com> X-Mailer: git-send-email 2.1.3 X-Barracuda-Connect: UNKNOWN[192.168.24.2] X-Barracuda-Start-Time: 1445115836 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Cc: Ben Pfaff Subject: [ovs-dev] [PATCH] packets: Make ip_parse_masked() pickier about formatting. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" It's happened a couple of times now that I've entered a typoed IP address, e.g. "192.168.0.0$x", and ip_parse_masked() or its predecessor has accepted it anyway, and it's been hard to track down the real problem. This change makes the parser pickier, by disallowing trailing garbage. Signed-off-by: Ben Pfaff Acked-by: Justin Pettit --- lib/packets.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/packets.c b/lib/packets.c index e7d0cb3..342d8b7 100644 --- a/lib/packets.c +++ b/lib/packets.c @@ -415,17 +415,19 @@ char * OVS_WARN_UNUSED_RESULT ip_parse_masked(const char *s, ovs_be32 *ip, ovs_be32 *mask) { int prefix; + int n; - if (ovs_scan(s, IP_SCAN_FMT"/"IP_SCAN_FMT, - IP_SCAN_ARGS(ip), IP_SCAN_ARGS(mask))) { + if (ovs_scan(s, IP_SCAN_FMT"/"IP_SCAN_FMT"%n", + IP_SCAN_ARGS(ip), IP_SCAN_ARGS(mask), &n) && !s[n]) { /* OK. */ - } else if (ovs_scan(s, IP_SCAN_FMT"/%d", IP_SCAN_ARGS(ip), &prefix)) { + } else if (ovs_scan(s, IP_SCAN_FMT"/%d%n", IP_SCAN_ARGS(ip), &prefix, &n) + && !s[n]) { if (prefix <= 0 || prefix > 32) { return xasprintf("%s: network prefix bits not between 0 and " "32", s); } *mask = be32_prefix_mask(prefix); - } else if (ovs_scan(s, IP_SCAN_FMT, IP_SCAN_ARGS(ip))) { + } else if (ovs_scan(s, IP_SCAN_FMT"%n", IP_SCAN_ARGS(ip), &n) && !s[n]) { *mask = OVS_BE32_MAX; } else { return xasprintf("%s: invalid IP address", s);