From patchwork Tue Nov 24 08:54:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 547894 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 29A341402CC for ; Tue, 24 Nov 2015 19:55:17 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DEC754B6B2; Tue, 24 Nov 2015 09:55:14 +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 kNwWTP2U99Vn; Tue, 24 Nov 2015 09:55:14 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C49854BD1D; Tue, 24 Nov 2015 09:55:13 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4EA144BCAA for ; Tue, 24 Nov 2015 09:55:08 +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 gsS0LZ3IxVMo for ; Tue, 24 Nov 2015 09:55:08 +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 na01-by2-obe.outbound.protection.outlook.com (mail-by2on0125.outbound.protection.outlook.com [207.46.100.125]) by theia.denx.de (Postfix) with ESMTPS id 57B684B7EA for ; Tue, 24 Nov 2015 09:55:03 +0100 (CET) Received: from BN3PR0301CA0032.namprd03.prod.outlook.com (10.160.180.170) by DM2PR0301MB0686.namprd03.prod.outlook.com (10.160.96.24) with Microsoft SMTP Server (TLS) id 15.1.331.20; Tue, 24 Nov 2015 08:54:59 +0000 Received: from BL2FFO11FD020.protection.gbl (2a01:111:f400:7c09::102) by BN3PR0301CA0032.outlook.office365.com (2a01:111:e400:4000::42) with Microsoft SMTP Server (TLS) id 15.1.331.20 via Frontend Transport; Tue, 24 Nov 2015 08:54:59 +0000 Authentication-Results: spf=permerror (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; konsulko.com; dkim=none (message not signed) header.d=none; konsulko.com; dmarc=none action=none header.from=freescale.com; Received-SPF: PermError (protection.outlook.com: domain of freescale.com used an invalid SPF mechanism) Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11FD020.mail.protection.outlook.com (10.173.161.38) with Microsoft SMTP Server (TLS) id 15.1.331.11 via Frontend Transport; Tue, 24 Nov 2015 08:54:59 +0000 Received: from linux-7smt.suse (b51431-11.ap.freescale.net [10.193.102.134]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id tAO8sWnJ023192; Tue, 24 Nov 2015 01:54:55 -0700 From: Peng Fan To: Date: Tue, 24 Nov 2015 16:54:20 +0800 Message-ID: <1448355263-545-1-git-send-email-Peng.Fan@freescale.com> X-Mailer: git-send-email 2.6.2 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD020; 1:kqg7MqQ+LDDP6PRy+ZPtGZpd5Y3Y/AoAEHmAsU5nSICI+86nHmQIpGWTsBoRbTgE8f5+WCU23MfC/yezN16+Xey0rj4IM+D3h7Q6/9zB62N46A4fVl1/wiv3ECrP6CWDygAGKylYVPq18K+6xN0iw1Va5cZwuhlSKNQQVmOCzLgTy+h1h9UFVZIL1azJlY+CBqqDn/iIhW1BIpQUsRi1jkweQqoffnHlXB79D+LjqKMQuXEZxHxWdg3gCX0TymN3lJ+vX8bgtRRtpH79ZtnLbs19wP0GFh+gd1WLFaxdhtDwDEMzui8poOi1c9K/fOiM2Fo4DHDwlGeIyIrS54wur/xQMEeeVinh6pzpK2TlJ8a3mTvS7Q9OevnE8h2Lwp25fopKsw9HlMvEvxsK+ChP858trM+8v8O9eTJIMxHQuUI= X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(448002)(189002)(199003)(86362001)(92566002)(6806005)(5008740100001)(104016004)(48376002)(5007970100001)(586003)(2351001)(229853001)(11100500001)(50466002)(47776003)(106466001)(189998001)(50986999)(50226001)(69596002)(36756003)(5003940100001)(19580405001)(19580395003)(87936001)(85326001)(77096005)(110136002)(5001960100002)(81156007)(97736004); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR0301MB0686; H:az84smr01.freescale.net; FPR:; SPF:PermError; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0686; 2:6XxNGQRH7uZDkFdlo8OSxQfPTtwbEV7YJKQlw1h5inftYywU9rXFZBZwhwGdb2XdO9RbfiABw3t4gvpQHOmLPTRQUW7EYeE9Yhwm7GCUiqB6k/IdiyKWq7WcQHHMstTO9TwTtHmuj39zyym8tuN/sQ==; 3:R4UDxOy4c8u2Bpz4MknFDI1E1x930fmFdVNk01iaA7kFzChpqfFAFq2N7wIweBrhyxDsafqObQsjel1umby4sGK1jCpf2cMUc7U9j4atGAH/7d/RwLicXgpfP5JkAy+HrCc5APoWyYif1nasqRwwXVHMR4t28fMw/+UXNKY2VVfgRaCJG9e4cyKdr05lDHkAGdT0ocsvGbIom64iJbfcu31s8PglrY2RCMvkTzD2668=; 25:kve++KELhpAMcwbnWAhjHg9d/Ft6jiON+gsUawuATqi8ADtS0GAlH8wwkKDKSIXc3MwtfCLKVe3d56t2lIEXOuliWM1i3Vi39qGATpMWqHTH+3deELSJ5YGfsn6zUO9oRlA+GI9C3iJcokMVTHBvzJj3tUCpwsbS0wL1OzPKcoHiFvhGYHN/QgzGQ2UQT5OnMCYYtNYiBA8OoEv0wHDjOnb3pKciAXAPlWkUlJ3sgn+AVv9AFA7VEkAPVREekrvR8nJBlNmlqPcRv8w49EMAmg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB0686; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0686; 20:CdJB+0Q3Ze+6B2WHTypvfx8If5QcysOfVEX5OWSwoZNrZb/ayA0yhxqVmNWHTg5V2CHIGa7hDmITFlAv2mUipNcDpHYhnPbsx2HRswr+CfCe4+k23cVoVFyd/H1bC5py9gqu/qS2dLvKm+tYwGO2M8ixcZko0XRv+plbJ6zyO+ihQOGtSnVGSKJ2LZLx+5OdL7fzSjpLfwwNP6o7UHjxFlP3yKBaVpSPP++/OMEKJy4RixAadRFA8ILvlMCl668acatvozLhd1Y9xlHQcQCJimDgm8134CMkYOizHkr64D8hJVXVTuHC9HpaIT+bMMK4e0sX10GeeaXgunbkOJ0aZu1/eqEH+WBrInRLh+h+5jY=; 4:Hs24Lo/YxZWzJzDhJK/WOA2TFdJNUSre30LCfx2MISrspZQm/C6HYcald2JdN4HUJuaMbN8/WdDGsKQpt/5CsMWjPgR7EmXG8Y2s1i31WrOYC+eevJu2R/WrkIlxESzeFxSFbyHMhqu0HOal7sKE3NL7Qh/XIH8CeAQxzR4AGPA1tvOSOGrKN49Ja9sm2zZgHGAdeZLjacwY3bi0XfS7FHnx7jQEye3vKxrOyjsG7b7nYlY5CDsYUTRwsaVezKwKFxTf2O6p+ZNBi9FT+gYIAGT6+uQgGZdSCxkB184J2ROj4Rk2qHAqSbyOGA9Qv8KJAkajqOXafXsWK576Enjeur+POddIJLWioc8SreBNMZ5YCuTm2OHhHsx55J7Hv4+lAc0SQoLQ9Y/LbXwHqB0QrE+nR1hr4bHv7W0s/ig1JUgHxuHj0lwiSdeqGPOQLFIFMWZr8axSL6MRAclnRck0WQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(126837547833334)(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(520078)(5005006)(3002001)(10201501046); SRVR:DM2PR0301MB0686; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0301MB0686; X-Forefront-PRVS: 0770F75EA9 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0686; 23:jI6lKCKMkDMX9pclCiOEvwUTbEPcJZ+cF/KuX9ACQGT2NCabmrkkXyeFgicLmGbeHVP7knqtns+xLhnVp8HNVYhM8dUl/UKaLcf8X+oVyYHdEefJJ2LN+pxAv5ZasI7OlTTarb1aGpwFSEfDslUhv55mIEzlNUqaP6fEyM3fIJLMg53llyams8DLe+ZfB8AqgvsLe7HZFgXVyZ2e41r7iqqZSUVFnLiNZIJRauuXMVDuDR4RxFV1q8TNZRAZYvhcnkXYDu/vk4IIYIXuJQgE0eoPXPbCqi4b/SBBVW0ELRDY832XywSnUClHFbl5Qt5XKH0KrfKK6hshRntKWNUdpo21JDk7lOV2fk73G9wFw/i2Q9DpVcxuDVoP6Xkki/y00E+/opYg0rObBDRBAkk1soUrdW4RD21nhjFI6DVBUfi2mWyzPHUKxRrblVw42n/UDKoqs3as0dNMVQykEv15M1eM8W7/lbhKJEEg1zJEvWgbZEsb7EqaFwpJpDpwN3mwjbf+NGMQKdlIKiWttgdr+Ms67IeEFWUvXPklTOG95KfmRE8wNZ+rKDLlpx5R4Ro/4/FsvuVWnvadvSmSs+Gmrbzl/tpw1xa/cYYqKfVuQkZBM6IageJ/dpVphTEPwvfIUhTWHAVEQcdIBs6085K6dUghZ+J/Pqm4Gjq5WHqW13kzRQUuRuNGwabgA6WLThZWyz9Z2Jo8BCDoP4xerw7tRvJXU7At6ueRb86KAee7bcR+5OnAiUu2wpCNkwdt+HgG83wcQ5IQgW2q6qbMbbb4qWIo06uSR+BzsEInd+pZnZRUln63vyb7OKVpMFlWfFOu7yaVt7zELe52sUv+yCv508sU9XsybePFxIebbLzgjGofOLYZYKKCjt3jG726KImxWBL1SiWw3Mc9UznxQitTEruLGGBIXN25kkiYva+Lk+SSvNfLOjE0QUWf5tlEuBby X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0686; 5:UojZmsiJgJe9nQ4Ad9timXVpZQ+x8z+ZygDz0P91AcWlbdbpJ1NlWyvEXjDo0etStH3Z4xxY0rL80oa0el62UAc7JRI2drmDF1YWru7RElx7bg88bMjrM/4SxXmQaSBIrRP0K/xI4Hd5W60ImwFaxA==; 24:wzDVHvUN8lNF0BQYFtfb6HtKt4KXBPqtIzmwuwTiJ0vBqaZunyfAWka7dsXpLKvHBZzJBJ+zqeArNqxsuZzaya8AK491ZIkcb0om4rViXcA= X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2015 08:54:59.2954 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB0686 Cc: Jan Kiszka , Joe Hershberger , Tom Rini , York Sun Subject: [U-Boot] [PATCH] common: bootm: check return value of strict_strtoul 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Before continue, check return value of strict_strtoul. Signed-off-by: Peng Fan Cc: Albert Aribaud Cc: Simon Glass Cc: Jan Kiszka Cc: Joe Hershberger Cc: Hans de Goede Cc: York Sun Cc: Tom Rini Reviewed-by: Simon Glass --- arch/arm/lib/bootm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index ee56d74..a477cae 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -290,7 +290,10 @@ static void boot_jump_linux(bootm_headers_t *images, int flag) s = getenv("machid"); if (s) { - strict_strtoul(s, 16, &machid); + if (strict_strtoul(s, 16, &machid) < 0) { + debug("strict_strtoul failed!\n"); + return; + } printf("Using machid 0x%lx from environment\n", machid); }