From patchwork Mon May 30 06:02:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dominique Martinet X-Patchwork-Id: 1636790 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20210112 header.b=biSV9xXk; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::d3e; helo=mail-io1-xd3e.google.com; envelope-from=swupdate+bncbcwivbv7sugrbjn42gkamgqeaki6lgi@googlegroups.com; receiver=) Received: from mail-io1-xd3e.google.com (mail-io1-xd3e.google.com [IPv6:2607:f8b0:4864:20::d3e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LBPwS6D1nz9s0r for ; Mon, 30 May 2022 16:03:19 +1000 (AEST) Received: by mail-io1-xd3e.google.com with SMTP id k17-20020a5d9d51000000b006653f2bc513sf5031435iok.10 for ; Sun, 29 May 2022 23:03:19 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1653890597; cv=pass; d=google.com; s=arc-20160816; b=k0D69W2SURlspwdWTibx6EfCQdqxcF0Vpl2AYGgWLr7rPbjc2LEOoNtY4XXr9hjbOj dmmwqylyWKhDofXeoRUejJiz/YtY240u4vm5UrsWxg3Tay+SD0zNr7gM8FLJWSFM/Uoq f576tQOxUC81ynWJXOjgrDCGH1tbdJstpKuS0Jm97vTQBhJeo3vPM6o29/aKFGy+3lQ8 S+QtEYdfS5ARdEkf5yTj9vArCP/EFUT3PUKcXTcDqvBGeAIGq6AjbOuhnV1HSvLvQWI/ IZKLYLyOWryC519rLmkYwMCtuoCsQnbTX0pB4BXoOUri/fgYlFcAq/yudfgLT7j0fCbT bbig== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:sender:dkim-signature; bh=IIooCele3+XwjU9BmmFJYbgtTUbAQN5PdWAK4NeWhlc=; b=RV6NP9ScmZZlAboc1ow5FLXAqr7Ls1oPF2ii2WwB+GaMV6DetohnwJwfMit4VSkyUV Ehzz3bf7PMQ29K4U1X5WqAmXn+luoDk/IxYUimDO9T7sdtwpLzIdNLqn14GJYmhXM3Sc 5OrrdCSkplh6a5WQvnim0JeQlGCqCw0Eey2jBtRxXWt6A8NuFbAeBeOycd6nPrRMBNhJ srDeiQgYa8UZeNzEuZnbea9ICW5nHzjAyTWmZemq2C9I9oOWC3wghC/1Up4X8ubwViZK s9QdTjNdxOqc+xUHGUuvlg5H7ZBR8jXhpfFimP6K5LEqJ1EXUu+J1f/qayytqMYSKRr1 zcxw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) smtp.mailfrom=dominique.martinet@atmark-techno.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=IIooCele3+XwjU9BmmFJYbgtTUbAQN5PdWAK4NeWhlc=; b=biSV9xXkoSsyBJgUM2zat3rgv3mDPhxYgZxXhSrXkfvEPRlEcrWDxqeA8ocqiDcmkx q3yVndMmtdOoVttq3x5uGD1syVnTi1EqYBYU4dOwTkArG2HOIqObCnXuLdzSjhQb8f3j RmKbZEquXTEoMat7cmg3ZgJ7rdu8yxWI/Tf1rbzO0IenFLPgkPJvbgAfB+2VF3g630Aj IAyYeiyx0s4MeGiAhPlWcFiKUk9++xLzjbGIjvbF9u6u9qBu4H+C8bRbZwW88MKnafMi 1r0lH/q+bH2nulcOb0BpjwsidtXkTyXQq7Q+3AUnhvz7Z0cZnbb3V1YnlsAut5JYAOW1 PCOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:x-spam-checked-in-group:list-post:list-help :list-archive:list-subscribe:list-unsubscribe; bh=IIooCele3+XwjU9BmmFJYbgtTUbAQN5PdWAK4NeWhlc=; b=4p9wW8YQTUMlZCRrw2biUjBghTS6hPXuFO4qQKylPteo8kYsPLoxOOZzTi62L4qnJf a3y5BjCP9IQwGR+P2Sv6+9r8d9JRCCb7CdUQeu4B8iDwKPUIUj0qM+sjukA06kGe/x3h lUeALapi/zjRPPAxRELw6X4L/d8h9BfUVm27rH/Sn54PjjsUsgs9ZtZ+OpS8EDggY/yy RUVcnuEi6jzWWQl3fN60+2YlZxWRMKNY8WuAz4Ko+wtUN8ZQflG6/tEFnUqIfCU7kGFq fBsezIvamD76hCswyijfjlp+AldlHnzRqVDVAD2iGg4/i/7hzEBvWb+4WqrFYad4xmbz n+UA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM533Jm5uzMGv9J1qLr3mzcFQlGz9gV9csaMi8ymQjWbAecG+bnGmq zHIWzFLF+2oGtrB85aMmiQk= X-Google-Smtp-Source: ABdhPJy0ohYSJIxTjsHJbSAIgjtzeXEczcnDhrIZ2UWVbDVH0nZvYr7DlHBBhpsb8EsZ8LkRhMdlmw== X-Received: by 2002:a05:6e02:12ee:b0:2d1:7bcd:f7cd with SMTP id l14-20020a056e0212ee00b002d17bcdf7cdmr23200649iln.173.1653890597392; Sun, 29 May 2022 23:03:17 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a5d:938c:0:b0:662:ff20:2e4c with SMTP id c12-20020a5d938c000000b00662ff202e4cls1975838iol.3.gmail; Sun, 29 May 2022 23:03:17 -0700 (PDT) X-Received: by 2002:a5d:9ed7:0:b0:65b:3312:9946 with SMTP id a23-20020a5d9ed7000000b0065b33129946mr24366805ioe.10.1653890596905; Sun, 29 May 2022 23:03:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653890596; cv=none; d=google.com; s=arc-20160816; b=gHrU+gVYQ7ajeJqXAgLQxw5GzqJB8BvDZ/6qb6nMLjDHsWv04AgiJR/u4MnkWBTFj+ HkJ4kOVpZtg9RdkJrKkpHS57XUW3CiI0eaqp6HH4QyzPImsO9jrL0vU2Pz9Htn9eTHZF a5tES+QYanAMNa5fyd/JqE6N1FkvoAjvk5Y9ij5q850k56uwCB4utLtd4QjqKarcMXQZ lXzq2KGRPdCIvwwyQOaqH7GPq81jrbJuZy53egzRobjO9ui+/ZvoUH9CMP2hxzK/bUgN foJETivMm/pPAsTPNaPd4B9oqp3Pk/Q0Qy6Uo12WKgOVb2g1m1i5OQ0nIUxyWRT2jevV ig2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=9yWZxk2kmc1WKBFrNWRZuGGswvRTL8XQ7PheAsxADgM=; b=cXSq+HMlrB8FyyNP5PixaQLoQspPNJl/Aaj0BcOnbiRnuHjyVXj9Btc4hpjjEar4n8 QvrucBaJ0kgrkUUtk8s1NnCUfIixaXj1nhMmx9X0PfHh8Eoj73aj5KycgrzzVJ1LYCgG uDzGWwv/U7WcTHrxbL5iYUloiiGTzaby1y1NdX0LKcI356Jf0YHWDEJuMXzSt0+RdhbD yqbojog8xQGX/KGoQ/Z2bDxEot2A8Qw7au6e1xkRLf0O/g2j4tj4w3ceRaMqNOTOuOH0 T/0WdBTxAnioA3nxsje9czKA2SRgf6NtL9r12yg94x90EtUXBCY32qMyJWgoC/QJFQit Ay1g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) smtp.mailfrom=dominique.martinet@atmark-techno.com Received: from gw2.atmark-techno.com (gw2.atmark-techno.com. [35.74.137.57]) by gmr-mx.google.com with ESMTP id l10-20020a05660227ca00b00652f6c18b70si590898ios.0.2022.05.29.23.03.16 for ; Sun, 29 May 2022 23:03:16 -0700 (PDT) Received-SPF: pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) client-ip=35.74.137.57; Received: from gw2.atmark-techno.com (localhost [127.0.0.1]) by gw2.atmark-techno.com (Postfix) with ESMTP id 46C7120D6D for ; Mon, 30 May 2022 15:03:15 +0900 (JST) Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by gw2.atmark-techno.com (Postfix) with ESMTPS id 1877920D6D for ; Mon, 30 May 2022 15:03:15 +0900 (JST) Received: by mail-pg1-f198.google.com with SMTP id q6-20020a635046000000b003fb882bc1d1so3576777pgl.23 for ; Sun, 29 May 2022 23:03:15 -0700 (PDT) X-Received: by 2002:a17:902:724a:b0:163:89ee:23ea with SMTP id c10-20020a170902724a00b0016389ee23eamr17292552pll.12.1653890594194; Sun, 29 May 2022 23:03:14 -0700 (PDT) X-Received: by 2002:a17:902:724a:b0:163:89ee:23ea with SMTP id c10-20020a170902724a00b0016389ee23eamr17292534pll.12.1653890593965; Sun, 29 May 2022 23:03:13 -0700 (PDT) Received: from pc-0115 (103.131.189.35.bc.googleusercontent.com. [35.189.131.103]) by smtp.gmail.com with ESMTPSA id u16-20020a17090ae01000b001d6a79768b6sm4949633pjy.49.2022.05.29.23.03.10 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 May 2022 23:03:11 -0700 (PDT) Received: from martinet by pc-0115 with local (Exim 4.95) (envelope-from ) id 1nvYUf-005RIC-3j; Mon, 30 May 2022 15:03:09 +0900 From: Dominique Martinet To: swupdate@googlegroups.com, sbabic@denx.de Cc: Dominique Martinet Subject: [swupdate] [PATCH 1/6] save/get_state: fix gcc warning about out of bound strnlen Date: Mon, 30 May 2022 15:02:59 +0900 Message-Id: <20220530060304.1296389-2-dominique.martinet@atmark-techno.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220530060304.1296389-1-dominique.martinet@atmark-techno.com> References: <20220530060304.1296389-1-dominique.martinet@atmark-techno.com> MIME-Version: 1.0 X-Original-Sender: dominique.martinet@atmark-techno.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) smtp.mailfrom=dominique.martinet@atmark-techno.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , We do not actually need strlen here at all, just checking the first byte for '0' is enough as strlen was only compared to 0. This fixes the following warning: In function ‘do_save_state’, inlined from ‘save_state’ at core/state.c:57:10: core/state.c:26:13: warning: ‘strnlen’ specified bound 16 exceeds source size 5 [-Wstringop-overread] 26 | if (strnlen(v, BOOTLOADER_VAR_LENGTH) == 0) { \ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ core/state.c:35:9: note: in expansion of macro ‘CHECK_STATE_VAR’ 35 | CHECK_STATE_VAR(key); | ^~~~~~~~~~~~~~~ In function ‘read_state’, inlined from ‘do_get_state’ at core/state.c:81:25, inlined from ‘get_state’ at core/state.c:113:10: core/state.c:26:13: warning: ‘strnlen’ specified bound 16 exceeds source size 5 [-Wstringop-overread] 26 | if (strnlen(v, BOOTLOADER_VAR_LENGTH) == 0) { \ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ core/state.c:63:9: note: in expansion of macro ‘CHECK_STATE_VAR’ 63 | CHECK_STATE_VAR(key); | ^~~~~~~~~~~~~~~ Signed-off-by: Dominique Martinet --- core/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/state.c b/core/state.c index 2ec01f5d73ef..27481971a232 100644 --- a/core/state.c +++ b/core/state.c @@ -23,7 +23,7 @@ * environment/ */ #define CHECK_STATE_VAR(v) do { \ - if (strnlen(v, BOOTLOADER_VAR_LENGTH) == 0) { \ + if (v[0] == 0) { \ WARN("Update Status Storage Key " \ "is empty, setting it to 'ustate'"); \ v = (char *)"ustate"; \ From patchwork Mon May 30 06:03:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dominique Martinet X-Patchwork-Id: 1636791 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20210112 header.b=o/XLAltf; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::d37; helo=mail-io1-xd37.google.com; envelope-from=swupdate+bncbcwivbv7sugrbi542gkamgqelun4hkq@googlegroups.com; receiver=) Received: from mail-io1-xd37.google.com (mail-io1-xd37.google.com [IPv6:2607:f8b0:4864:20::d37]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LBPwS6pn9z9s2R for ; Mon, 30 May 2022 16:03:19 +1000 (AEST) Received: by mail-io1-xd37.google.com with SMTP id s198-20020a6b2ccf000000b0065e4872af2dsf5016639ios.21 for ; Sun, 29 May 2022 23:03:19 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1653890596; cv=pass; d=google.com; s=arc-20160816; b=sVqYJh8c+w+Q2xNGabWB9/AB3WNwKsMnjTb/mPJ3DNYVjcDFuFWB+9Cp+hQiDDPUss +Lip61ZwEWNHll8NmYS5nKUj6YRONSLoR39Y4CVYIT8ASBswrQ2rQO/FBWcncGqfsYIV /TwHDMcbi3Kjq1PPKKVKR5iCKgNJjBBQO8HZAU6G6vNvqGXYSb7n4e+WoDqQmWD072NR K0V3DECkGbBgyjnMJ1aLrpbviWbMv6dBacY70zOvK7w37BqSXv9eLYPmhd66SDPJcpXU 3IYvRS69fAKYRYw8ki7lCwp89xlxPWknVq51WBQyuB9UCeiyBJI9y1kImLpHGNs85uTZ +S5w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:sender:dkim-signature; bh=0ARJ4QYh2b1Z8TDFZ2vOESikb6TrDBoPsMRVPF/kfYw=; b=LLPZ7RJnwaHPk6aUShA+VyYEuGkFMjJnYzv8Q5A/qMj+/8u53j+JkDOFTUXnwkqy58 GKePZ19oFRQqVTaB5sUguld96l9DTU4SBsCn58V/tyCUyrv+yukj5jG7QVhO1LPWVxyO QtQ9Lak9hUnupbIZCwhJmiIfWpA5kZFbUUDj2cdFYiPyniR7PUOodEkr16CS8rlL9/yu 28J2kVKQ0G4ZlwsGR+iUGSBe8eDuwRwGaclDLICftv1TEa0tJCwcrh0rbF+k3XOHDHq3 ygyyxp//AyQpuxdRp0dATFQ/WzDP6GmLvvPkPVHhccCjy5YKv/Mfvi2g/+RIjBFx9L9c ONcg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) smtp.mailfrom=dominique.martinet@atmark-techno.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=0ARJ4QYh2b1Z8TDFZ2vOESikb6TrDBoPsMRVPF/kfYw=; b=o/XLAltfLLBS2aEpj7bciv0izUMNhq5WIFXeZQ2NLQV9FVqsxzr+mdADwRySct0ajQ svnxksGk+HFd1bQDaczGYm75SlZIKZfkNpusYLgmL1oUOJDt+1V0VrYVH9vFEgTgm8jy ZxcFbKBuyuGD50XTkmZLW+H0U5N3nb9Im6u6UDiDacUGB2jSzjj9OpFn6ZX2uBR8QHmZ UqamA9oVG/6MfrNYefyeTIRU/GYxkHVFkqV2d76X+yB5yuFifBCy8ZXsAkLigrXXFOWy eZ/7ljU+Tjx/DVf1GqnDl60fzeTQiDiSANh6HENl+SUrYXzlLv0FySgsXON2CbWZaA7W +Eaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:x-spam-checked-in-group:list-post:list-help :list-archive:list-subscribe:list-unsubscribe; bh=0ARJ4QYh2b1Z8TDFZ2vOESikb6TrDBoPsMRVPF/kfYw=; b=6SnTwcTaDUR2v9EGW+KcvjZdo3wYSx+YnZXcKk+5s5EHxbuLAFtlAjz99FKAaSK12M DELJ0fCIpoh53TwR45lVBf9YYzBBgkSycRpxjCuEgzLV2DjxgoAzQG3r89KoNgph1s8g MkG1m5SbO7WYHvixNIzW80+evsSI3TfkfqkAg41pumdvGh1MN4ZRp+1PbIWVqYExzaDU T94/LfEF9KyGU2wiPLUeo48KuWgJShZ/g+FeUG1WmXZ9MeZEYEUvJ++KxVyAqjCYezlP U4v3PcMgANlvZWUdT8Yq+lGgG1qE7F2N7C4XeZjsXBZnw7nRSKdmpVEv6EzAJxW4nbHf nscQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM532YWfcKGyqdXHjxWGWbQCsxdZeFXWE0tO97EgPy4MAsZ3dAARHw +GFtF7SlCiHfUrQB6UKnHjQ= X-Google-Smtp-Source: ABdhPJxB5RT0fgG0XM5C6BSbVL5ZwA9QWbmnQk/pDyLNtYa+SL9k58NxOiw7uVs0YCcHNBlUfirWuQ== X-Received: by 2002:a92:c70f:0:b0:2d3:956a:b0e7 with SMTP id a15-20020a92c70f000000b002d3956ab0e7mr4451790ilp.320.1653890596190; Sun, 29 May 2022 23:03:16 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6638:34a0:b0:330:fa54:92dd with SMTP id t32-20020a05663834a000b00330fa5492ddls1049721jal.3.gmail; Sun, 29 May 2022 23:03:15 -0700 (PDT) X-Received: by 2002:a02:1105:0:b0:330:ec01:f04c with SMTP id 5-20020a021105000000b00330ec01f04cmr8343501jaf.87.1653890595642; Sun, 29 May 2022 23:03:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653890595; cv=none; d=google.com; s=arc-20160816; b=aRi/IsTyqBPBeGHYhp6xc39UZA1eXl62vMAZAgmN08FzCQesDc+TggNmVrBlZYNGP5 0ukexFtJCQCofI9slmO6noRYr3XzrNRY0AdXa9RG7xI8mEHekZWCIo4DXxfdqvoPTidb xMT0P2MAh0TpgzMH9CWjLpKi+eYyOeG/jq5beuN32P6XJYilJST8PXz9OHsnfVsWMfY2 ZE8oNa1GEje1FBtUl1eRhYclD2H6vaIbHgS1cirXpvI2fL6ebSLPN6xTG4ZNWFgVrrH2 RzlBpywPB4Oxn/YybLAQgNRW70TQsnXrj7i50+jC86bPMWPIc3A8iDgkC3Yyk5ELKtnU zpgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=EYrh0fBcwDW0jxOMVmI1TIg6/kWajBOIyDqSIK10bV0=; b=TeVIKdRPo5nKiSqykRuxoR1XBy6Nzw+FZxp7/eSUDqFPyCcVBxcnQCfcEfUfPhhLqj hTDGE6wRwKBh91dKPZUmHIjARqbrwCyuw+g8GwErdKwcuIvlvOo4kS8JxLRgxPpZdA3P 5kS7xNkPW6W8sqj4svlpK0kfvXxDwmlPlq5wc6SMhilhtYnN5phDI+jbSVwdabYucll4 8FxUJrY1MpeGzr1T9zS6Z9TIrMLt5YrxcuzBUzzAabWUNqakmFy2pouLSv4glY2Prfhn 2E+9dpad0JxjvKuixmlk1SQ0JQ5PeToN9REsEpxGR324K9E/CV3xqq2h36KH7xhs+pgh WeOQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) smtp.mailfrom=dominique.martinet@atmark-techno.com Received: from gw2.atmark-techno.com (gw2.atmark-techno.com. [35.74.137.57]) by gmr-mx.google.com with ESMTP id g9-20020a056e021e0900b002d3b0cebdc3si27113ila.2.2022.05.29.23.03.15 for ; Sun, 29 May 2022 23:03:15 -0700 (PDT) Received-SPF: pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) client-ip=35.74.137.57; Received: from gw2.atmark-techno.com (localhost [127.0.0.1]) by gw2.atmark-techno.com (Postfix) with ESMTP id DDEED20D2E for ; Mon, 30 May 2022 15:03:13 +0900 (JST) Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by gw2.atmark-techno.com (Postfix) with ESMTPS id C1A8E20D2E for ; Mon, 30 May 2022 15:03:13 +0900 (JST) Received: by mail-pg1-f197.google.com with SMTP id i9-20020a632209000000b003facc62e253so4144656pgi.11 for ; Sun, 29 May 2022 23:03:13 -0700 (PDT) X-Received: by 2002:a17:902:d510:b0:163:622b:63db with SMTP id b16-20020a170902d51000b00163622b63dbmr23595864plg.135.1653890592885; Sun, 29 May 2022 23:03:12 -0700 (PDT) X-Received: by 2002:a17:902:d510:b0:163:622b:63db with SMTP id b16-20020a170902d51000b00163622b63dbmr23595847plg.135.1653890592646; Sun, 29 May 2022 23:03:12 -0700 (PDT) Received: from pc-0115 (76.125.194.35.bc.googleusercontent.com. [35.194.125.76]) by smtp.gmail.com with ESMTPSA id p11-20020a1709028a8b00b00163247b64bfsm8135268plo.115.2022.05.29.23.03.10 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 May 2022 23:03:11 -0700 (PDT) Received: from martinet by pc-0115 with local (Exim 4.95) (envelope-from ) id 1nvYUf-005RIG-4J; Mon, 30 May 2022 15:03:09 +0900 From: Dominique Martinet To: swupdate@googlegroups.com, sbabic@denx.de Cc: Dominique Martinet Subject: [swupdate] [PATCH 2/6] mongoose: fix cs_md5_final mismatched function declaration Date: Mon, 30 May 2022 15:03:00 +0900 Message-Id: <20220530060304.1296389-3-dominique.martinet@atmark-techno.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220530060304.1296389-1-dominique.martinet@atmark-techno.com> References: <20220530060304.1296389-1-dominique.martinet@atmark-techno.com> MIME-Version: 1.0 X-Original-Sender: dominique.martinet@atmark-techno.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) smtp.mailfrom=dominique.martinet@atmark-techno.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , This fixes the following warning: mongoose/mongoose.c:1113:33: warning: argument 1 of type ‘unsigned char[16]’ with mismatched bound [-Warray-parameter=] 1113 | void cs_md5_final(unsigned char digest[16], cs_md5_ctx *ctx) { | ~~~~~~~~~~~~~~^~~~~~~~~~ In file included from mongoose/mongoose.c:22: mongoose/mongoose.h:1872:34: note: previously declared as ‘unsigned char *’ 1872 | void cs_md5_final(unsigned char *md, cs_md5_ctx *c); | ~~~~~~~~~~~~~~~^~ Signed-off-by: Dominique Martinet --- mongoose/mongoose.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mongoose/mongoose.h b/mongoose/mongoose.h index 6a095cbb0620..f0dc22b4c3e7 100644 --- a/mongoose/mongoose.h +++ b/mongoose/mongoose.h @@ -1869,7 +1869,7 @@ typedef struct { void cs_md5_init(cs_md5_ctx *c); void cs_md5_update(cs_md5_ctx *c, const unsigned char *data, size_t len); -void cs_md5_final(unsigned char *md, cs_md5_ctx *c); +void cs_md5_final(unsigned char digest[16], cs_md5_ctx *c); #ifdef __cplusplus } From patchwork Mon May 30 06:03:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dominique Martinet X-Patchwork-Id: 1636792 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20210112 header.b=ouuqNP8i; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::113d; helo=mail-yw1-x113d.google.com; envelope-from=swupdate+bncbcwivbv7sugrbj542gkamgqemkkgcla@googlegroups.com; receiver=) Received: from mail-yw1-x113d.google.com (mail-yw1-x113d.google.com [IPv6:2607:f8b0:4864:20::113d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LBPwV1vNGz9s0r for ; Mon, 30 May 2022 16:03:21 +1000 (AEST) Received: by mail-yw1-x113d.google.com with SMTP id 00721157ae682-2eb7d137101sf86568007b3.12 for ; Sun, 29 May 2022 23:03:21 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1653890599; cv=pass; d=google.com; s=arc-20160816; b=z1p5fh+OrVVkvTPBc5BVNkQyQhUCVCj2SZ1CwRy06zd3PdHSpDoGo/FlhUbv1nNeqv SzeRKu3w1RYbn2wsocoJ+UdCCc4KJVQwk6FarQzX/qfan1ZQ1S2rUwk9xQBCC1gSrZNz zoYACFABuuBpmofYTEkb+Lg4tpe37tsmp/rG3BnzIZlVERbViGqigHqjMYlUL0hBAfm9 1ozuObKZnu3sBNR9OoGVFIVFkMMZQRjKrxrnt4EyGMBDhcZMl3QT/nY42bdtPAGH2pge OzuYGLFK59TwNr++ZAyAiTQEcfGsuL5kLaLO9Bkt1yveCQ91QIAxY4u2XZa9eD8bwLB+ jn+A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=eCpl0UWNJXYAddPEK4hq7MrSHLzmjlD/ldnnfG1KWAY=; b=Np5g3t4ik5KU1lGoVoydXoPOpITQ0bqpEFZC18YGGCY6qf41A6b4yzFXaty0KWQkTY zxX5De/OXw/b63ozqoO5bnA9Hmlo7rKotk7wU1DvpxEwle76Hx1RRQMZTc7KnnBlFfDt jMgCW5mH5IYxhIW/oy7YGbEO8UMj6OBHoZ2veHjXqfLaTTTzUATzd6mzKUGx1NCpUbJs J82+TXesf8VY6IEgtbJszgUEukp3cW0yK2NKF2D3SleDYwf+awtdlQAhN80J/BR7YpWw HmSjmKHVL0JfKUCER8boKTkq8Tp0MOgvo35J20Ip+BgQHXS/JvLpopUfM//Vr6XCNnCW DuMg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) smtp.mailfrom=dominique.martinet@atmark-techno.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=eCpl0UWNJXYAddPEK4hq7MrSHLzmjlD/ldnnfG1KWAY=; b=ouuqNP8iZ+RDQQLjNRH+DZhxBBdrNzKd2kLH1RFGlxqhGL29ZtIA2Fga9YelAm9Xj+ 3JdI1kAt9jPHgimWY2BlAZtJzS8SqHqUZ29/PcKaZiTFSJzyaqw0duwJx6Vt6Nae/6WA UwZsr024yfxUpQvjXjVRNWP0nZ7J4bdSY4CZ/xVsaQ2J4X2zv5Mu/rxwaRqMwXlSCN4S 6HAT63fcgMyWy2IPI8qUOroEOEL74txq5UfxJ77gSoF/iduqnhsFNYFh7uDJys+QW2aP q4hYlBHPqVCd+GWQhk/kDYxz+t6CsjvcqbLzocjcmY5/44giVN6RYQubeDuW7V2g8t26 Ynfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=eCpl0UWNJXYAddPEK4hq7MrSHLzmjlD/ldnnfG1KWAY=; b=Dc7VEe1tR9l2HQXbxorKQJqa7NC850daDLH01qnmYPhRui9Al+1NRhGYLo2cmmfQ8l fnPpV8U8xwCbMNYLRuuhxiiRskquxjhXtmd0uXcqeaag4EPpaJd7jJExLxQ15d0UWSGw O3rRo6qGoZwCdaOvWsFXfOrwsUqGmb1r7+WY8RVe9Bkcm4ATFd+Hs+pSFr5WvSn9XsD1 gScqSdKjJXad8q+u7B2PpF8+xjbFeVHOx0nTkeblhThQOIWbI6ZEY1j5qnJITcw0A+Y3 R/0bZXsPFRZiv0tp5rM5DPxBYontDi8YuI4AWBUj3dzE9j216acPLQCO/v1r6bz+NZkH MJfQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM533cOqedx3jnLp80e/5HgjJRTSXQv8GOE6LjDcGo63rs0f3gthTw HuaKIV9UMkmxXEyX5i+uRFA= X-Google-Smtp-Source: ABdhPJwRmi87v6Oos1gYWzEDXmVdO6ezTYkrl59vqszZ1WY6cQKlyjOhAQaQWry+oiwTw1CW5m9EBg== X-Received: by 2002:a0d:cc8e:0:b0:30c:1230:90c with SMTP id o136-20020a0dcc8e000000b0030c1230090cmr11975258ywd.469.1653890599382; Sun, 29 May 2022 23:03:19 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a81:108f:0:b0:2ff:9c64:9c25 with SMTP id 137-20020a81108f000000b002ff9c649c25ls12263436ywq.8.gmail; Sun, 29 May 2022 23:03:18 -0700 (PDT) X-Received: by 2002:a81:993:0:b0:30c:2287:7e6 with SMTP id 141-20020a810993000000b0030c228707e6mr8691565ywj.262.1653890598816; Sun, 29 May 2022 23:03:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653890598; cv=none; d=google.com; s=arc-20160816; b=srp923TzowlgDJgrTxZYa075QF0pauBQRaNgdseejqq7Do/QBwUEY/ZxZrFeSE1JKL Xw6kZuwEYeE5Eme9oArwukJ+F/y6JRHYLPCbNa/3ihm6DvezftPT3YQEXg1t96tCDvVj TWB+FD1KfZd/K32G2Sye5j3EwJFcx8PeAoHbusOssvacuZV55acqNW8yk0Yp1cFfUhmi 5bwAuvSsmWtZq0H7i6/VCbkREyP8f2Gsh+FSwuOVdDwLFm94lDGocBlfAbO4c0lR1/E2 V+g5oBzwXm3bETnjsaod6soq5QvHKIVJt7YkNJd6/8a6p3rQNRc0hj9PkaEHoB1/sbMv PAJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=cgI86EKyR5SKfI17e24pjW5wRI+KTgaa6UyWBAwsxFU=; b=vrQQ4/qvkLlaqf1rjyDhn7S7e1On5q/0VFCkB4jtEB5U4FbQHJryir0FnMV6Iy1/Eb WPBQ46NejY/IYGD8A9q18f02wCtxYk9Sn/Wxs7z8fHyILIAK78cOrMbQRMeoRc/K4Kkp 4OjA3KZ2SyrPUi8ZoBip0+FNivLWjf6MeBQredEzFsx9oQkwOUZWkPPEzFwBxKk9Uu1Y jpizeX27+DomnU1PBt+DCzaDeyocwap7zELctp7xnuBnbsXMV3BwqjpnfxYt2i03p0Xq IcXrLWvcC1wL+Yeo36QuYxZPJdt4Un38lWJWuWqaXDNqGYziTnMbz2MFBIcvTQ9m1gPS K4Kw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) smtp.mailfrom=dominique.martinet@atmark-techno.com Received: from gw2.atmark-techno.com (gw2.atmark-techno.com. [35.74.137.57]) by gmr-mx.google.com with ESMTP id x6-20020a25e006000000b0065c92486654si346613ybg.4.2022.05.29.23.03.18 for ; Sun, 29 May 2022 23:03:18 -0700 (PDT) Received-SPF: pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) client-ip=35.74.137.57; Received: from gw2.atmark-techno.com (localhost [127.0.0.1]) by gw2.atmark-techno.com (Postfix) with ESMTP id C3BCF20D70 for ; Mon, 30 May 2022 15:03:16 +0900 (JST) Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by gw2.atmark-techno.com (Postfix) with ESMTPS id AF5E920D70 for ; Mon, 30 May 2022 15:03:16 +0900 (JST) Received: by mail-pg1-f198.google.com with SMTP id 35-20020a631563000000b003fc09751ce5so611214pgv.10 for ; Sun, 29 May 2022 23:03:16 -0700 (PDT) X-Received: by 2002:a17:90b:4f81:b0:1e0:7643:36ae with SMTP id qe1-20020a17090b4f8100b001e0764336aemr21223746pjb.124.1653890595752; Sun, 29 May 2022 23:03:15 -0700 (PDT) X-Received: by 2002:a17:90b:4f81:b0:1e0:7643:36ae with SMTP id qe1-20020a17090b4f8100b001e0764336aemr21223734pjb.124.1653890595521; Sun, 29 May 2022 23:03:15 -0700 (PDT) Received: from pc-0115 (126.88.200.35.bc.googleusercontent.com. [35.200.88.126]) by smtp.gmail.com with ESMTPSA id n19-20020a17090a929300b001cb6527ca39sm5946739pjo.0.2022.05.29.23.03.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 May 2022 23:03:11 -0700 (PDT) Received: from martinet by pc-0115 with local (Exim 4.95) (envelope-from ) id 1nvYUf-005RIK-4s; Mon, 30 May 2022 15:03:09 +0900 From: Dominique Martinet To: swupdate@googlegroups.com, sbabic@denx.de Cc: Dominique Martinet Subject: [swupdate] [PATCH 3/6] grub: fix double-close on error Date: Mon, 30 May 2022 15:03:01 +0900 Message-Id: <20220530060304.1296389-4-dominique.martinet@atmark-techno.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220530060304.1296389-1-dominique.martinet@atmark-techno.com> References: <20220530060304.1296389-1-dominique.martinet@atmark-techno.com> MIME-Version: 1.0 X-Original-Sender: dominique.martinet@atmark-techno.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) smtp.mailfrom=dominique.martinet@atmark-techno.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , fp is closed in 'cleanup' label: do not close before goto Reported-by: gcc -fanalyzer Signed-off-by: Dominique Martinet --- bootloader/grub.c | 1 - 1 file changed, 1 deletion(-) diff --git a/bootloader/grub.c b/bootloader/grub.c index 2d901b33293d..21bb6ac41a4d 100644 --- a/bootloader/grub.c +++ b/bootloader/grub.c @@ -52,7 +52,6 @@ static int grubenv_open(struct grubenv_t *grubenv) buf = calloc(1, size + 1); if (!buf) { ERROR("Not enough memory for environment"); - fclose(fp); ret = -ENOMEM; goto cleanup; } From patchwork Mon May 30 06:03:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dominique Martinet X-Patchwork-Id: 1636795 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20210112 header.b=i8IeCiXE; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::a3f; helo=mail-vk1-xa3f.google.com; envelope-from=swupdate+bncbcwivbv7sugrb2n42gkamgqehcm6zwa@googlegroups.com; receiver=) Received: from mail-vk1-xa3f.google.com (mail-vk1-xa3f.google.com [IPv6:2607:f8b0:4864:20::a3f]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LBPxn4TwMz9s0r for ; Mon, 30 May 2022 16:04:29 +1000 (AEST) Received: by mail-vk1-xa3f.google.com with SMTP id bc22-20020a0561220d9600b00333205f8148sf943223vkb.20 for ; Sun, 29 May 2022 23:04:29 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1653890666; cv=pass; d=google.com; s=arc-20160816; b=uSYmgOYtqHvlPraN3ioIG/BmSiztO7k86Uei98F8CIWmlqaQgeHTVpciCueis+lk7E fYIjFx9uJ7ps/HIBAqx/txsoeGMC9SgJOzpD5tMA/N9Np0+nPy7LM1/GEmMKRDZXfoi3 gkTWCbUP0azNAST2W6lGN6CNxEs6MwJzZaT2QeZCcDS4d5ze/CEp4S2Fh95IWnHFrQqO n8DAUFhpR/tb+LxhQL5YYfNSI/Nonphek5+94p7FGfZU/bmaYsBDnbgGXFGmGzNaG0kI Comqg1cfD+ZwibPMJ1SoQw53o4PSHMDZsemAbUaDOxshnNy71mCtXSjE6sT8BaW2nSpv N88A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=YmwIkzYZ1OKRUmvTcs9LeWMsFk9Eb4HPSTlM2goI9JQ=; b=ElhJloXjzlLmhNF2xXBzwIX5qrBguyUuAvidWhSbFqQhK/qp8SlJJHhKJrbClCCftN ZOGmHd4N1uvyTNqly9qixMWUNbHU8znfF3nZSDMmD8ataV8WRspUfalsSyKW62CTyKL5 ubjVkXqsjHbujlaQC1RpUVZcm8fl+KAj44UjqNVy4zZy2qPKlKuSJt3ulU3rE81ZtpZD 7OXMMfg1Kfc5yZn+7HAyo0F73dORuc1/yEF9zVy3P+8h/1xMY/8wsO1t1rGNWShtZF1L 7zilcx9/s8EqReQk1LK7QKy+gYkSICtG386uH2jI//4evmsCdcY887HqEM6UtTbooFWm yecg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) smtp.mailfrom=dominique.martinet@atmark-techno.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=YmwIkzYZ1OKRUmvTcs9LeWMsFk9Eb4HPSTlM2goI9JQ=; b=i8IeCiXExqvkmm2198C3y8uai3d6EC/8zbFkOHmzo14zRaVvEqxVwkOE+wLsFM+1JY /P/nGBBxlNZ78O50AhehlMs8gvNZRqVeqxJXUjZeFwKJoY5+PYqrMWtW57j7bc+sj175 YBGPmGo8ghLBisbjuKZnSIfyA6YLb3r6d5AkNx2DWXVTImobgUfq7+HfVD4NFzBQZgyK lH4JPz/zVeUqF6mIgvbcQCwkHGnF9w8VYQV7xKru7PZdIQm4zDEM93Y2HZG1Y+g+OhQT zEcIV31wGA8nteC4Ud8ifZSJ/RPxD+34ZneNLM4fBKFiu06lTvJuVMh5cnW1rTdshX7d 0DBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=YmwIkzYZ1OKRUmvTcs9LeWMsFk9Eb4HPSTlM2goI9JQ=; b=63sPnU2NDNjndBIBr9YND1/F8LgJpUzhnkVPOmJZqHBMyGQA31UycQLgzrAkK1DCMB GqmQl3gCugc/qHrlKxQCkFsbWhFUZDXgXKKhHfyS9pXAfcTrGFTiE02pCQL2GU6cM7fj RgaZ+M9UtbcA3csTYqsqDgphQcPinVYipzfzgpfYQlNw+6BWgVjpMx30cCIOc49XAcFZ LYp+FggjVojRwCTZdacAq5TD5sc9TnSH8flFJJX+eYhVihqSjj7ipl7mGnVrObkel3pJ A11/i0hxTAhdBt6tCmVEcKIK2LezCz9qro/2M2gPq8OV+KX70Rv4zix8QzQvT7EhyFeG r4vA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM532C4jIhH0pwLWYnihHYsuMXlGryOt/ZhTaNCAtShE+Hi9cmW/fL S7GPn4ikOE37/qrlH26pGmY= X-Google-Smtp-Source: ABdhPJxKqB5LBLz6D55H+GPF2/FK5+zg0kKCSIu76WBXCFl3fC/w7f7kwLRl5WTMOYhMbC4Eo6YJbQ== X-Received: by 2002:ab0:5945:0:b0:365:7d38:d80a with SMTP id o5-20020ab05945000000b003657d38d80amr17697364uad.89.1653890666139; Sun, 29 May 2022 23:04:26 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:ab0:6f02:0:b0:368:e5e0:cef2 with SMTP id r2-20020ab06f02000000b00368e5e0cef2ls1850004uah.0.gmail; Sun, 29 May 2022 23:04:25 -0700 (PDT) X-Received: by 2002:ab0:66c1:0:b0:35f:c5a8:8a2e with SMTP id d1-20020ab066c1000000b0035fc5a88a2emr17812342uaq.98.1653890665546; Sun, 29 May 2022 23:04:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653890665; cv=none; d=google.com; s=arc-20160816; b=EgLA+gnOxqFSd/JhAPY2rTV1lKH+Nb4Ougazk3OVs2rlxaV3X2I7oi0mlZ29JmIXBy +35P1x9bFjdg/9qEN9nDec3hVnu4j4TvSFG39ZeYF6o7kDqZmu774Mms18ECDgM4a3Pk auwPgAad15Dx2jAhia+7q6R+oLQy9x6YcLwp1PaQozw5QXM/n2SOy8Dn1rqZWpshOfCI 09rW+PKXLJf4wZosIk56+INk1Vvha73vgRTnMk0GoemdF/+RUderuGR+uvPPoOaHYuOo PVHht6iR3wBotlhT43UtmQJwuHRzHhB7J65zM0z+1btmtlvzZrWD1059QN3XF0JLFmdQ QPdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=OrWXMw3ZTav00Hb7LgTH0uDFvlBUgAsg+NuDVz5H5n0=; b=qEpBRnmyvkaeHIVdi3v7kmZsQFccdoBm3t65xC2RVxR9DnQhOMILq8dxT8ZkqmLguk zV1cJGRjmrCp9mLo4+zomWGxVdmfdWCHBvXcxLzOwLDeqUL9fCsMD+KW0lGkCPistV5o 8SL6FvNkbQ+dVluxPrEBrGXhSdb9ElY0i8EsEC8Rj7Iz5lOpu9FOj3FJltCQbzITjnVf L1viqYFo/ktnFJ2jEYqI9E7Zu4NPYO1j5+VK6XljDTlUmfGQK6owp3O6xVGQSzvQ3Lf1 /N6bQlVPPfYqKHn6ECU1WP9zsV9EGX2k3/BMKEB6xKX70cfgf5ftQ4mOB/w8Sh4ccvzl Azjg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) smtp.mailfrom=dominique.martinet@atmark-techno.com Received: from gw2.atmark-techno.com (gw2.atmark-techno.com. [35.74.137.57]) by gmr-mx.google.com with ESMTP id e9-20020a056122040900b00357324ba38csi542366vkd.5.2022.05.29.23.04.25 for ; Sun, 29 May 2022 23:04:25 -0700 (PDT) Received-SPF: pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) client-ip=35.74.137.57; Received: from gw2.atmark-techno.com (localhost [127.0.0.1]) by gw2.atmark-techno.com (Postfix) with ESMTP id 988D620D2E for ; Mon, 30 May 2022 15:04:23 +0900 (JST) Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by gw2.atmark-techno.com (Postfix) with ESMTPS id 84ECB20D2E for ; Mon, 30 May 2022 15:04:23 +0900 (JST) Received: by mail-pl1-f200.google.com with SMTP id s7-20020a170902ea0700b00162028433bcso6734106plg.16 for ; Sun, 29 May 2022 23:04:23 -0700 (PDT) X-Received: by 2002:a05:6a00:1502:b0:518:d3bd:c9eb with SMTP id q2-20020a056a00150200b00518d3bdc9ebmr28786674pfu.86.1653890662606; Sun, 29 May 2022 23:04:22 -0700 (PDT) X-Received: by 2002:a05:6a00:1502:b0:518:d3bd:c9eb with SMTP id q2-20020a056a00150200b00518d3bdc9ebmr28786657pfu.86.1653890662324; Sun, 29 May 2022 23:04:22 -0700 (PDT) Received: from pc-0115 (103.131.189.35.bc.googleusercontent.com. [35.189.131.103]) by smtp.gmail.com with ESMTPSA id y129-20020a626487000000b0050dc76281b5sm8114224pfb.143.2022.05.29.23.03.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 May 2022 23:03:11 -0700 (PDT) Received: from martinet by pc-0115 with local (Exim 4.95) (envelope-from ) id 1nvYUf-005RIO-5Q; Mon, 30 May 2022 15:03:09 +0900 From: Dominique Martinet To: swupdate@googlegroups.com, sbabic@denx.de Cc: Dominique Martinet Subject: [swupdate] [PATCH 4/6] parser: set_find_path: properly return to-free string array Date: Mon, 30 May 2022 15:03:02 +0900 Message-Id: <20220530060304.1296389-5-dominique.martinet@atmark-techno.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220530060304.1296389-1-dominique.martinet@atmark-techno.com> References: <20220530060304.1296389-1-dominique.martinet@atmark-techno.com> MIME-Version: 1.0 X-Original-Sender: dominique.martinet@atmark-techno.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) smtp.mailfrom=dominique.martinet@atmark-techno.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , properly set 'tmp' through an extra indirection instead of leaking the string array Reported-by: gcc -fanalyzer Signed-off-by: Dominique Martinet --- core/parsing_library.c | 5 ++--- corelib/parsing_library_libconfig.c | 2 +- corelib/parsing_library_libjson.c | 2 +- include/parselib.h | 2 +- parser/parser.c | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/core/parsing_library.c b/core/parsing_library.c index 3e2ebaaee475..e1574c1434ae 100644 --- a/core/parsing_library.c +++ b/core/parsing_library.c @@ -196,7 +196,7 @@ void get_hash_value(parsertype p, void *elem, unsigned char *hash) ascii_to_hash(hash, hash_ascii); } -bool set_find_path(const char **nodes, const char *newpath, char **tmp) +bool set_find_path(const char **nodes, const char *newpath, char ***tmp) { char **paths; unsigned int count; @@ -204,7 +204,6 @@ bool set_find_path(const char **nodes, const char *newpath, char **tmp) char *token, *ref; bool first = true; int allocstr = 0; - (void)tmp; /* * Include of files is not supported, @@ -287,7 +286,7 @@ bool set_find_path(const char **nodes, const char *newpath, char **tmp) } free(ref); - tmp = paths; + *tmp = paths; return true; } diff --git a/corelib/parsing_library_libconfig.c b/corelib/parsing_library_libconfig.c index c6625767506e..1f0bfcdcc409 100644 --- a/corelib/parsing_library_libconfig.c +++ b/corelib/parsing_library_libconfig.c @@ -155,7 +155,7 @@ void *find_root_libconfig(config_t *cfg, const char **nodes, unsigned int depth) if (elem && config_setting_is_group(elem) == CONFIG_TRUE) { ref = get_field_string_libconfig(elem, "ref"); if (ref) { - if (!set_find_path(nodes, ref, tmp)) { + if (!set_find_path(nodes, ref, &tmp)) { free(root); return NULL; } diff --git a/corelib/parsing_library_libjson.c b/corelib/parsing_library_libjson.c index 4d208d4611c2..9b207aa1d4a0 100644 --- a/corelib/parsing_library_libjson.c +++ b/corelib/parsing_library_libjson.c @@ -201,7 +201,7 @@ void *find_root_json(json_object *root, const char **nodes, unsigned int depth) if (type == json_type_object || type == json_type_array) { str = get_field_string_json(node, "ref"); if (str) { - if (!set_find_path(nodes, str, tmp)) + if (!set_find_path(nodes, str, &tmp)) return NULL; node = find_root_json(root, nodes, depth); free_string_array(tmp); diff --git a/include/parselib.h b/include/parselib.h index 66ea2b5afdb6..a22839b8a0db 100644 --- a/include/parselib.h +++ b/include/parselib.h @@ -98,7 +98,7 @@ void get_hash_value(parsertype p, void *elem, unsigned char *hash); void check_field_string(const char *src, char *dst, const size_t max_len); void *find_root(parsertype p, void *root, const char **nodes); void *get_node(parsertype p, void *root, const char **nodes); -bool set_find_path(const char **nodes, const char *newpath, char **tmp); +bool set_find_path(const char **nodes, const char *newpath, char ***tmp); #define GET_FIELD_STRING(p, e, name, d) \ get_field_string_with_size(p, e, name, d, sizeof(d)) diff --git a/parser/parser.c b/parser/parser.c index eebd58172e70..3091ae8e4c05 100644 --- a/parser/parser.c +++ b/parser/parser.c @@ -145,7 +145,7 @@ static int parser_follow_link(parsertype p, void *cfg, void *elem, for (int j = 0; j < count_string_array(nodes); j++) { linknodes[j] = nodes[j]; } - if (!set_find_path(linknodes, ref, tmp)) { + if (!set_find_path(linknodes, ref, &tmp)) { free(linknodes); return -1; } From patchwork Mon May 30 06:03:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dominique Martinet X-Patchwork-Id: 1636794 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20210112 header.b=E56i6jmI; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::13b; helo=mail-il1-x13b.google.com; envelope-from=swupdate+bncbcwivbv7sugrbsn42gkamgqen6dbmia@googlegroups.com; receiver=) Received: from mail-il1-x13b.google.com (mail-il1-x13b.google.com [IPv6:2607:f8b0:4864:20::13b]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LBPx73WPbz9s0r for ; Mon, 30 May 2022 16:03:55 +1000 (AEST) Received: by mail-il1-x13b.google.com with SMTP id l8-20020a056e021aa800b002cf778c63casf7832001ilv.10 for ; Sun, 29 May 2022 23:03:55 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1653890633; cv=pass; d=google.com; s=arc-20160816; b=r4NUk7kDf/+S3bMxhaPwxo8xGBlOir70eE+Q9tvBbbZZYUADP0ONWgtRgo8Rs12Ayj MhSUyPnP/zav/Naviq8VjltP9Rt2jZc77BOykX60begLKpshDZaQP0hlNKNWQ6yGsPuO 1ePSx0m0RClW4bz8cCCnHV4u5kiFa51GZGcxrdf9xlT8Us4/mBkFuojmepHNtgUwCxUs oGzzWnG+1FkV0mbFNzjas/3RToA54IEru4IzI2bgwHgXZPNyZeBSceFZFs211n1M3ZKI 68qO30LX1UDYQ7pF+L+ROwEXWm0bpq2QrnR41ziK1Ubf0TyhCj0ntYesXZgztFiO+qlW 51fQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=PNXfXtYEeNVWHezEgecgmgpnI/S/iUQBGJAbo6seLTI=; b=kgzkxsB3ktjWcw7lyzy+jA7cfBCHnz6aMoT8LYDZ+jPOClTOHAGgvIX7jJXwwlMRHY QTkG7QkK73CDreW9IVxNeFOQR7ly5fY0b7VLJKMVhEl4BX9nRUQrldRmqFKsNTtabNfx 7Bc5bUccdM/DOMsGWOuiym5P25Q6mFNVD4F3zFT1RhTZtSkaolDhr0H7FZX8RJ8pIuT7 9cH0OGZcBj+6s2MsQvsjs8RsQ84GTjfmIuV1lJWNhAH5+BD41N3VYV96HCkp3kgNyiEJ KB6fHVWAwk9pZvfnQVSJ2YBj5dxYfkh1frFMXU+TwDDuvNjkgy/cxl4WRvvgnzMGy0qE VdwA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) smtp.mailfrom=dominique.martinet@atmark-techno.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=PNXfXtYEeNVWHezEgecgmgpnI/S/iUQBGJAbo6seLTI=; b=E56i6jmIW7x669nSCly7klFQkZzICnOKFhDjCSq3/4fLZSiNpbGIRSBQt0NtRZBdBV 3mxRUGg3lGv+GuI3Eex/0izEjRbyVGN+ps7cvjnKAxuReJ5vfL1ldWmqM2ushTZm6T76 6jLCkbwEXngfCBYw6w8nIKJ8+gMaj1yjW9MteZKV8fPqGkXD6tQ21Dft7W0N5ZTsqFy/ sOgz0YSIghbOUvbH+6aWO+TKrQzAGFN3lt0P0KBqELWf+uCjwV5917CQBtJc1DVCyaWz tf4ZDAZgMe/CG+8F5NWmKANgxEcp4lY27q0iFdDhu/xtdnNuLAD89yTq9fSNLK1NVm/X GZ/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=PNXfXtYEeNVWHezEgecgmgpnI/S/iUQBGJAbo6seLTI=; b=E4xGy4lHDPg2HT04NF0TUG6Qx5JqOwS3uDlWJOPG1EByGdeRHD7KAkL+CNwDPtuI5G a509GCfiZyJ2/azpNCnZFzOYOY6/LaUL8YHKvZWI4BJeTJNIK+CWmrhrIB/uxm9uyhz1 3QIYP5yvj7b8khB92Xts+SiR2LmVV5lHa6mtWq6KybHv53JSrhIDQF4uK/jTjDgH/CU4 7PIQV31Wqtkk6ltafYPSkSlCfHQKPjH5dskaH8FLjKd68jBm8FQRsEoQmZ5oCl6wY450 GNPPAZJEmWI1jDvAjh1pwztuy/A73KWjnqxLqrCgg1DrsNyB41q1V6SA5Hx+M2mzF95R WvQQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM531rPP94+DYHwbZ9GjQ/EGdIs9MeEcV12hj/wBhiqfx1nTipmLXL wMV5BC/gUwn69nIwvK9uIw0= X-Google-Smtp-Source: ABdhPJxFsVXcgySc2KhtZtnUaMc/ki7jD9qYyQXra/Y68HlwAWeBmdpx2fQfCR3QJTEITkd/g44GLQ== X-Received: by 2002:a05:6638:2688:b0:32e:c5ec:1b51 with SMTP id o8-20020a056638268800b0032ec5ec1b51mr20037423jat.100.1653890633312; Sun, 29 May 2022 23:03:53 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6602:2e12:b0:665:7e29:64c1 with SMTP id o18-20020a0566022e1200b006657e2964c1ls1419625iow.1.gmail; Sun, 29 May 2022 23:03:52 -0700 (PDT) X-Received: by 2002:a6b:8f90:0:b0:65e:a211:b930 with SMTP id r138-20020a6b8f90000000b0065ea211b930mr20024388iod.35.1653890632851; Sun, 29 May 2022 23:03:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653890632; cv=none; d=google.com; s=arc-20160816; b=QMTo8JSHmuHkhbElzrnr2VG6IuRRB5aQikreuCPTM72s2RdH85yMtuwEqJ3E8wfhJd RnPBmMAr1f9VePtJeaTsKfmdbmdwZ/2SRLRMrDIoUsOd6RlTPHpXdNR+l2mPkKqmX3L/ v2l5its9HbwoBngDcoLM/OJku2SdvNUrlVfcJBDlm6e/ipZ7h/y1P3e44dP7u5PcFZo3 tWkf9LYZf/ZEq7R2F8T6YnAT3XA78V36Bu2e/lm/VyHwpWnIQX5S62y9ZfKbvcnUomuF UQsaDQqHHE9jD1ifUW+7RAb4yub5s9+ZZ0N7hj1l/zcvSHEPAXx6JJVXtSngh0lxgvUy zJtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=BubweshuxN2ZCrfqOzSwLk0OTqfUQuWzBkNo/gN5Co0=; b=MSQfneES/ulJ6TgE8Id9GoQS4WOO5YQLUqjoSjIXdVaw4kl6TiTg7QYNrvFtJgabD5 VemEOgyKhKNPbCevsB6a2wKv3LGIfzCV6H/KumDnLb0+44V9LzEh4Amp4f7aSFPhXm2x 4uafaJAOjiZrosUR98/ijnsWmdUkpY0wW/csUdj3oMIyUYsWVCsus3URzaSYINm1/5MG ZndAY0NwO44G+3+2VCFN6BV0t7fFkiQyWDXJa41JeuuHKq/+GwoU9jTUewgV/6wEhshP hy18JVZG1vIWIwCb+ggoIOMlkaa/4/Vvvqc5MBVapM9nJBFoAwjh+MAFYB3QPlTELv8J kbqw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) smtp.mailfrom=dominique.martinet@atmark-techno.com Received: from gw2.atmark-techno.com (gw2.atmark-techno.com. [35.74.137.57]) by gmr-mx.google.com with ESMTP id q4-20020a056638238400b0032e8c96c6f7si539974jat.6.2022.05.29.23.03.52 for ; Sun, 29 May 2022 23:03:52 -0700 (PDT) Received-SPF: pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) client-ip=35.74.137.57; Received: from gw2.atmark-techno.com (localhost [127.0.0.1]) by gw2.atmark-techno.com (Postfix) with ESMTP id 73BF520D6D for ; Mon, 30 May 2022 15:03:51 +0900 (JST) Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by gw2.atmark-techno.com (Postfix) with ESMTPS id 4132F20D6D for ; Mon, 30 May 2022 15:03:51 +0900 (JST) Received: by mail-pj1-f71.google.com with SMTP id gn21-20020a17090ac79500b001dc8a800410so6145028pjb.0 for ; Sun, 29 May 2022 23:03:51 -0700 (PDT) X-Received: by 2002:a17:902:e94e:b0:15b:22a7:f593 with SMTP id b14-20020a170902e94e00b0015b22a7f593mr55043924pll.148.1653890630404; Sun, 29 May 2022 23:03:50 -0700 (PDT) X-Received: by 2002:a17:902:e94e:b0:15b:22a7:f593 with SMTP id b14-20020a170902e94e00b0015b22a7f593mr55043910pll.148.1653890630169; Sun, 29 May 2022 23:03:50 -0700 (PDT) Received: from pc-0115 (126.88.200.35.bc.googleusercontent.com. [35.200.88.126]) by smtp.gmail.com with ESMTPSA id gi1-20020a17090b110100b001e095a5477bsm5895177pjb.33.2022.05.29.23.03.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 May 2022 23:03:13 -0700 (PDT) Received: from martinet by pc-0115 with local (Exim 4.95) (envelope-from ) id 1nvYUf-005RIS-5z; Mon, 30 May 2022 15:03:09 +0900 From: Dominique Martinet To: swupdate@googlegroups.com, sbabic@denx.de Cc: Dominique Martinet Subject: [swupdate] [PATCH 5/6] pctrl: parent_dead_handler: use _exit instead of exit Date: Mon, 30 May 2022 15:03:03 +0900 Message-Id: <20220530060304.1296389-6-dominique.martinet@atmark-techno.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220530060304.1296389-1-dominique.martinet@atmark-techno.com> References: <20220530060304.1296389-1-dominique.martinet@atmark-techno.com> MIME-Version: 1.0 X-Original-Sender: dominique.martinet@atmark-techno.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) smtp.mailfrom=dominique.martinet@atmark-techno.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , exit is not thread-safe and should not be used in a signal handler (could deadlock in e.g. glibc malloc/free if the signal comes during one) Reported-by: gcc -fanalyzer Signed-off-by: Dominique Martinet --- core/pctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pctl.c b/core/pctl.c index 8f49de74ca06..a66c7d6793bc 100644 --- a/core/pctl.c +++ b/core/pctl.c @@ -63,7 +63,7 @@ static pthread_cond_t threads_towait_cond = PTHREAD_COND_INITIALIZER; #if defined(__linux__) static void parent_dead_handler(int __attribute__ ((__unused__)) dummy) { - exit(1); + _exit(1); } #endif From patchwork Mon May 30 06:03:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dominique Martinet X-Patchwork-Id: 1636789 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20210112 header.b=mkvnEkQf; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::639; helo=mail-pl1-x639.google.com; envelope-from=swupdate+bncbcwivbv7sugrbjv42gkamgqelmt5qbq@googlegroups.com; receiver=) Received: from mail-pl1-x639.google.com (mail-pl1-x639.google.com [IPv6:2607:f8b0:4864:20::639]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LBPwS6ZPlz9s0w for ; Mon, 30 May 2022 16:03:20 +1000 (AEST) Received: by mail-pl1-x639.google.com with SMTP id n8-20020a170902d2c800b00161ffe6804esf6721078plc.21 for ; Sun, 29 May 2022 23:03:20 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1653890598; cv=pass; d=google.com; s=arc-20160816; b=T3LebMc++Qf11jGey/6bpC0KqvM0Ie45354sN3r256pMAKeS8HssDSWH/ue4TNM2jf JhBP+/kB2riFObO6JXTnklCAQHDoZHyBSuGPDUbizW+/6pNtRn3Ae3Ar+iQpZQGVHRqo kO1dIF2z8uBohgnBCE68t2MjZrMfXDoIs9CKLPEZHJ9QjEjoIqLPtow2EFGqNKv3LMnl IVQyq9gXJqERaMxl4t2l59nVDkkkRIMsXstguCes+0b3f2FR3ipo/76y2+t6zUpE4bNo TYXnwiAa9zBEXPoYQKF6bvgiYibLDw84k96kf+TLOJ7jps5ClgpNkv7/t26ZHLFxtj2j ThCQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=hDS8FGEahx/sZNg4iWpiUsSOaWftRJuQDnxl5yVqNP8=; b=vIz7yqO7Np8OXFv9lV8NZNdtlSfpfQHHdam2a9oD9DOyQEsAthWK9svbLNEWirfrDi tbAHswnHfOsoZPBhRupP7aj2z/to1T3WS+SQ7dZzz09GvK1nARwD/5xD/2W0GYCrSsCL nyQHne2skKVgpdwc6mbqOfkxT0VNMAqXPgl75JaEWMgKSjbg8/CdJq1dbXGyssLZlpPV vf6dWeG93lU/wOjkRsz68s9fX7jmJRXgmkJuNQ8G82VNPbSLfE50N+V/mkLb32xOA6GN YXK+CUU/+c4qN84YZpusQQCfnewRagZIFg+ZNtRnSued10v2sw++B/efD4FcN9k6Bprx m24A== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) smtp.mailfrom=dominique.martinet@atmark-techno.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=hDS8FGEahx/sZNg4iWpiUsSOaWftRJuQDnxl5yVqNP8=; b=mkvnEkQf0WM6yYmPp+l9FrnYnImEu7GGYqsfk/9D8KXJ5LLYQ3lB8qLlItbcJ4UfGG N9O93oKiYgRLmvcC5e0/bJXWf/bbdt9QCGzHJ4GozaDjJc/W2gnjCVtVNINvGkp2rIXU CaTH6mwedPVB4Gw5P0Jc304CIGu7d9umpKdPXYGnD9q1V0jpH/5KxHj6zvV2msT304es AzvG5x6Ctrjmio8/qvwpcgMVKcKw1Zh2dAJZhqmE2stTXMAoXpIeLpnIAeqyRweujg92 r8HZoJ+rDMGBvx6RPrO+o5Ufn45/xtjWvKW4XPeRKTb8KVTRYo0m9Zbjg5ng/AAoebQD OpLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=hDS8FGEahx/sZNg4iWpiUsSOaWftRJuQDnxl5yVqNP8=; b=uK8Y2i16W24FbalpINGIVG0naGMuh1vn74/BwbM7LqxF6SCbz4gDXLikCzZ6uP7H8O 4jVD6X0CNZVS5cPZhSIbIugeI2jc4yRs8vlBjPattd7w6zcm8gswfQdbQoOs4hIm2RgK m874LcI2cjP5j//LSaqsWUgxsVMX+WvIMlpxhOVQ1gKz/sZrryx6br33UoVlZopW6ds9 aoSoyVmJnlUv4V2+RSTlP3/T1jn2unISW/ZuoV3nTGApGjjkIURS2WBvqpu1/d5yRDKp nney8kQ2Kbb0Fzs3t1JPFfUL93BipBTjtv9+dQDa4CFCJfNZFU9y2vd+r+JbvvusVypN 4/Bg== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM533ZF59aZvBgLhz/sfaqIsXx9R58SNTJnV3X7Xcro/rkbKk0OTkU UN7V1RKavrLThlV2pDbX9Ls= X-Google-Smtp-Source: ABdhPJyaNPtH0s7KXMhjNMQibbhb5ye2RKE7UBOzPV7WZifSosxSCWzNts2Son1VB9XiCNH5bB7zeQ== X-Received: by 2002:a17:90a:77c5:b0:1df:dc04:526e with SMTP id e5-20020a17090a77c500b001dfdc04526emr21432557pjs.225.1653890598326; Sun, 29 May 2022 23:03:18 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a65:6e8c:0:b0:381:309f:14a0 with SMTP id bm12-20020a656e8c000000b00381309f14a0ls11861014pgb.2.gmail; Sun, 29 May 2022 23:03:17 -0700 (PDT) X-Received: by 2002:a63:884a:0:b0:3fa:ad94:9408 with SMTP id l71-20020a63884a000000b003faad949408mr25583209pgd.562.1653890597400; Sun, 29 May 2022 23:03:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653890597; cv=none; d=google.com; s=arc-20160816; b=LVwRbbBd9bp6IHGG4g6VJXIIc2nXFXnB34C7FGF7jqtLHs87jzKxuRSUSO0hR5hrtH 7DUqOkAQVn3wBpH+hOq98YlatoKY0d3SawQXw4IWYAyy5p10qx75FdShbhEN1vLicDT5 7/bCDDNI7z5iseUk26ITBMipb0zPcd2yKi/vjYkecGNfvHEaRRU8vZDEK1AfBLgrKhlC lLfqWxqAcBY5341T3xrE5nyh46nXskkWlVrrk/lzm+0GP9LN4n83NOxPPYB2pkgYDrPc XNvnKmk+YWNeBRQFpMx9SLp0tHpy+HsYw9Fe1O6UuTLhYfXIf+dbhtsEesApN+gcVWi0 G5Dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=x1qQF7i+tfjIn6BowE49n6fjK1wx+T1Lp6oP/8uwrbU=; b=xHfGSPsasADRsFjUQ01oRmxH4dOyCOunRL+iieabhY85u3TKUyQcJPAy4yIFkYo8jc 0bGvcMBpNif/k7eN74iYMJIrsQs0ofwxZOhNQteKsN+Gi3V0xEv+hGM8Y0tBdQhwB7uW XXWy8HtN6KKjgNDvN4SC3Cv/zrJHAczKBHq3MSdh5WMfGTeEroiWIObsaC3ItOeDgyY0 oPwWjiLIDhBcHr/FXmvaDt4281aa+YfOa+D2M8EioaHyodaRYYr3xk7NTLzW1IOClTY4 99ci8x1oqbfqplXcaAvmWfFo41D9eQAPk6raN/Gsvh010caviOkHnbkAL9oAOGv3wuA3 KfWw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) smtp.mailfrom=dominique.martinet@atmark-techno.com Received: from gw2.atmark-techno.com (gw2.atmark-techno.com. [35.74.137.57]) by gmr-mx.google.com with ESMTP id w3-20020a170902d70300b00156542d2adasi419235ply.12.2022.05.29.23.03.17 for ; Sun, 29 May 2022 23:03:17 -0700 (PDT) Received-SPF: pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) client-ip=35.74.137.57; Received: from gw2.atmark-techno.com (localhost [127.0.0.1]) by gw2.atmark-techno.com (Postfix) with ESMTP id 48C1A20D6E for ; Mon, 30 May 2022 15:03:16 +0900 (JST) Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by gw2.atmark-techno.com (Postfix) with ESMTPS id 34E4220D6E for ; Mon, 30 May 2022 15:03:16 +0900 (JST) Received: by mail-pg1-f198.google.com with SMTP id u8-20020a656708000000b003f70a43fe1eso4144601pgf.3 for ; Sun, 29 May 2022 23:03:16 -0700 (PDT) X-Received: by 2002:a17:902:e845:b0:163:ebca:a025 with SMTP id t5-20020a170902e84500b00163ebcaa025mr1533169plg.81.1653890595277; Sun, 29 May 2022 23:03:15 -0700 (PDT) X-Received: by 2002:a17:902:e845:b0:163:ebca:a025 with SMTP id t5-20020a170902e84500b00163ebcaa025mr1533151plg.81.1653890595033; Sun, 29 May 2022 23:03:15 -0700 (PDT) Received: from pc-0115 (76.125.194.35.bc.googleusercontent.com. [35.194.125.76]) by smtp.gmail.com with ESMTPSA id f3-20020a170902ab8300b00163f2f9f07csm357576plr.48.2022.05.29.23.03.10 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 May 2022 23:03:11 -0700 (PDT) Received: from martinet by pc-0115 with local (Exim 4.95) (envelope-from ) id 1nvYUf-005RIW-6Y; Mon, 30 May 2022 15:03:09 +0900 From: Dominique Martinet To: swupdate@googlegroups.com, sbabic@denx.de Cc: Dominique Martinet Subject: [swupdate] [PATCH 6/6] core/utils: fix missing NULL return value check Date: Mon, 30 May 2022 15:03:04 +0900 Message-Id: <20220530060304.1296389-7-dominique.martinet@atmark-techno.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220530060304.1296389-1-dominique.martinet@atmark-techno.com> References: <20220530060304.1296389-1-dominique.martinet@atmark-techno.com> MIME-Version: 1.0 X-Original-Sender: dominique.martinet@atmark-techno.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of dominique.martinet@atmark-techno.com designates 35.74.137.57 as permitted sender) smtp.mailfrom=dominique.martinet@atmark-techno.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , in case of allocation failures string_split or strdup could return NULL. This is not actually possible on default linux, but static analysis is always noisy about these... Reported-by: gcc -fanalyzer Signed-off-by: Dominique Martinet --- core/util.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/core/util.c b/core/util.c index d9df906f090f..3724182f1e4d 100644 --- a/core/util.c +++ b/core/util.c @@ -979,6 +979,10 @@ static char *getroot_abs_path(char* devname) { int fd; char *path; + + if (!devname) + return NULL; + if ((path = realpath(devname, NULL))) { if ((fd = open(path, O_RDWR | O_CLOEXEC)) != -1) { (void)close(fd); @@ -1120,6 +1124,8 @@ static char *get_root_from_cmdline(void) if (ret > 0) { parms = string_split(buf, ' '); + if (!parms) + goto out; int nparms = count_string_array((const char **)parms); for (unsigned int index = 0; index < nparms; index++) { if (!strncmp(parms[index], "root=", strlen("root="))) { @@ -1132,6 +1138,7 @@ static char *get_root_from_cmdline(void) } } } +out: fclose(fp); free_string_array(parms); free(buf); @@ -1181,6 +1188,8 @@ int read_lines_notify(int fd, char *buf, int buf_size, int *buf_offset, } char **lines = string_split(buf, '\n'); + if (!lines) + return -errno; int nlines = count_string_array((const char **)lines); /* * If the buffer is full and there is only one line,