From patchwork Tue Nov 11 00:38:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Westphal X-Patchwork-Id: 409124 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3BA0914011B for ; Tue, 11 Nov 2014 11:38:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751617AbaKKAiT (ORCPT ); Mon, 10 Nov 2014 19:38:19 -0500 Received: from Chamillionaire.breakpoint.cc ([80.244.247.6]:33350 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751464AbaKKAiS (ORCPT ); Mon, 10 Nov 2014 19:38:18 -0500 Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.80) (envelope-from ) id 1XnzTM-00069W-OY; Tue, 11 Nov 2014 01:38:16 +0100 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH iproute2] utils: relax strtoX checking in get_time_rtt Date: Tue, 11 Nov 2014 01:38:21 +0100 Message-Id: <1415666301-24900-1-git-send-email-fw@strlen.de> X-Mailer: git-send-email 2.0.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ip route change dev tap0 192.168.7.0/24 rto_min 1ms Error: argument "1ms" is wrong: "rto_min" value is invalid get_time_rtt() checks for 's' or 'msec' and converts to milliseconds if needed. Fixes: 697ac63905 (utils: fix range checking for get_u32/get_u64 et all) Signed-off-by: Florian Westphal --- lib/utils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/utils.c b/lib/utils.c index dc21567..987377b 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -144,8 +144,8 @@ int get_time_rtt(unsigned *val, const char *arg, int *raw) if (t < 0.0) return -1; - /* extra non-digits */ - if (!p || p == arg || *p) + /* no digits? */ + if (!p || p == arg) return -1; /* over/underflow */ @@ -154,8 +154,8 @@ int get_time_rtt(unsigned *val, const char *arg, int *raw) } else { res = strtoul(arg, &p, 0); - /* empty string or trailing non-digits */ - if (!p || p == arg || *p) + /* empty string? */ + if (!p || p == arg) return -1; /* overflow */