From patchwork Wed Jan 4 00:36:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 710787 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3ttX214BHrz9vHw for ; Wed, 4 Jan 2017 11:36:57 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="DDCWC0ut"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AEC9FB3872; Wed, 4 Jan 2017 01:36:51 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZxBz_QrANRlZ; Wed, 4 Jan 2017 01:36:51 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 34498A762A; Wed, 4 Jan 2017 01:36:49 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 957D7A75F3 for ; Wed, 4 Jan 2017 01:36:43 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sg3z5ekxsL3G for ; Wed, 4 Jan 2017 01:36:43 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by theia.denx.de (Postfix) with ESMTPS id 0E5C1A75EE for ; Wed, 4 Jan 2017 01:36:40 +0100 (CET) Received: by mail-pg0-f65.google.com with SMTP id i5so35097259pgh.2 for ; Tue, 03 Jan 2017 16:36:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CRAb5T8lIIp4S7VjBXbRre5pmGmFzuFyqun86ftQtHI=; b=DDCWC0ut4W00U9J8wZ09IN26HFSEp4tJAd8NueidB28PDvE70Gu5fZHGp3LSWqvXny V3868uYbCpFKt0loVO8Nod0XSBz+r9GC5tCqJTj8l8GDlHt5X1pozwf96wVW0gODp3Hp /46zH22L7iXisKgetZ0VstX2rX1F7pUnBSJ8bnQvSnx+7+Q/yZqaSeF1v8lH0WaAsCQd rA8n6jOP8244vJqR6JGPlWjtmzHOFOUHK9pE+X8DZj7lGmJnvnclZwNe6j+jfoH8vOYO +JVZuuPil2UBE7+5ngNjnTX9trRMD8p85ewv8duaI+WixGb0+jb9SBsqd2si/WJBXwSD yaHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=CRAb5T8lIIp4S7VjBXbRre5pmGmFzuFyqun86ftQtHI=; b=F3PptithwABOxNMdWbSZ3OhDC5OIUp91/p+mW3o+cdKhsB7r8IBWUDkXQWZKScAf7S q5wpuLGhDnSu3UdGPy7Tc4B464t+UKlVdT3sYNhVETWNcMqa6o/9FbDC45f+HY4Q02m4 XOK+6I6S0HYV08jTOEcC4NV9ID+mejxSrfYvtPDCwoDDZ6puuQmpyAG+MYlwl2TDZ+41 Dlq7l9W5JD38hdaCzOMdQxAfFrSFutvNtAzIe+ZtA2OuUHd4zkp9I1vmwNe6sXHp82mn nWIOkjnhC4pI8ipqp7/8zoCAuvi5SXmCEW3O7VRCw6QzxKatioZAjlP+yQQcpeEkpEo4 09Cg== X-Gm-Message-State: AIkVDXKacXhezqBOpa8g4QCPtu6TRldVeUGyYUpDZrrDLDYViYVvC2t+yBSF+5RNtf/3gA== X-Received: by 10.99.250.69 with SMTP id g5mr119736846pgk.15.1483490198658; Tue, 03 Jan 2017 16:36:38 -0800 (PST) Received: from chrisp-dl.atlnz.lc ([2001:df5:b000:22:bcf8:f15e:950f:438c]) by smtp.gmail.com with ESMTPSA id e1sm128234445pga.37.2017.01.03.16.36.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 03 Jan 2017 16:36:38 -0800 (PST) From: Chris Packham To: u-boot@lists.denx.de Date: Wed, 4 Jan 2017 13:36:26 +1300 Message-Id: <20170104003626.4211-2-judge.packham@gmail.com> X-Mailer: git-send-email 2.11.0.24.ge6920cf In-Reply-To: <20170104003626.4211-1-judge.packham@gmail.com> References: <20170104003626.4211-1-judge.packham@gmail.com> Cc: Tom Rini , Chris Packham , Joe Hershberger Subject: [U-Boot] [PATCH v2 2/2] lib: net_utils: enforce '.' as octet separator in string_to_ip X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Ensure '.' is used to separate octets. If another character is seen reject the string outright and return 0.0.0.0. Signed-off-by: Chris Packham --- Changes in v2: - new END lib/net_utils.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/net_utils.c b/lib/net_utils.c index 8f81e7801033..d06be22849fb 100644 --- a/lib/net_utils.c +++ b/lib/net_utils.c @@ -28,6 +28,10 @@ struct in_addr string_to_ip(const char *s) addr.s_addr = 0; return addr; } + if (i != 3 && *e != '.') { + addr.s_addr = 0; + return addr; + } addr.s_addr <<= 8; addr.s_addr |= (val & 0xFF); if (s) {