From patchwork Mon Dec 5 06:54:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Gongyi X-Patchwork-Id: 1712138 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NQZBh4jnYz23ns for ; Mon, 5 Dec 2022 17:58:20 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id D20C93CC1F5 for ; Mon, 5 Dec 2022 07:58:13 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-4.smtp.seeweb.it (in-4.smtp.seeweb.it [217.194.8.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 7097B3CC1E6 for ; Mon, 5 Dec 2022 07:57:40 +0100 (CET) Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-4.smtp.seeweb.it (Postfix) with ESMTPS id 916E310005FA for ; Mon, 5 Dec 2022 07:57:39 +0100 (CET) Received: from canpemm500005.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4NQZ8x2lv4z15N5b for ; Mon, 5 Dec 2022 14:56:49 +0800 (CST) Received: from ubuntu1804.huawei.com (10.67.174.63) by canpemm500005.china.huawei.com (7.192.104.229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 5 Dec 2022 14:57:35 +0800 To: Date: Mon, 5 Dec 2022 14:54:32 +0800 Message-ID: <20221205065432.242539-4-zhaogongyi@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221205065432.242539-1-zhaogongyi@huawei.com> References: <20221205065432.242539-1-zhaogongyi@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.174.63] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To canpemm500005.china.huawei.com (7.192.104.229) X-CFilter-Loop: Reflected X-Virus-Scanned: clamav-milter 0.102.4 at in-4.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=7.0 tests=SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-4.smtp.seeweb.it Subject: [LTP] [PATCH v3 3/3] lib: Adjust the position of the checking of the return value X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Zhao Gongyi via ltp From: Zhao Gongyi Reply-To: Zhao Gongyi Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" we need to check the return value before the checking of the endptr, otherwise, it will report out of range when calling of SAFE_STRTOUL("a100", 1, 10000000): TBROK: strtoul(a100): 0 is out of range 1 - 10000000 and it is expected that reported as: TBROK: Invalid value: 'a100' Signed-off-by: Zhao Gongyi --- lib/safe_macros.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.17.1 diff --git a/lib/safe_macros.c b/lib/safe_macros.c index 0fb5580ac..1ade829aa 100644 --- a/lib/safe_macros.c +++ b/lib/safe_macros.c @@ -614,16 +614,16 @@ unsigned long safe_strtoul(const char *file, const int lineno, return rval; } - if (rval > max || rval < min) { + if (endptr == str || (*endptr != '\0' && *endptr != '\n')) { tst_brkm_(file, lineno, TBROK, cleanup_fn, - "strtoul(%s): %lu is out of range %lu - %lu", - str, rval, min, max); + "Invalid value: '%s'", str); return 0; } - if (endptr == str || (*endptr != '\0' && *endptr != '\n')) { + if (rval > max || rval < min) { tst_brkm_(file, lineno, TBROK, cleanup_fn, - "Invalid value: '%s'", str); + "strtoul(%s): %lu is out of range %lu - %lu", + str, rval, min, max); return 0; }