| Message ID | 20250617144427.2013807-1-stefano.babic@swupdate.org |
|---|---|
| State | Accepted |
| Headers | show
Return-Path: <swupdate+bncBD2ZDGN6SEKRBVP6YXBAMGQEJHZRKXA@googlegroups.com>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@legolas.ozlabs.org
Authentication-Results: legolas.ozlabs.org;
dkim=pass (2048-bit key;
unprotected) header.d=googlegroups.com header.i=@googlegroups.com
header.a=rsa-sha256 header.s=20230601 header.b=qxVTUGof;
dkim-atps=neutral
Authentication-Results: legolas.ozlabs.org;
spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com
(client-ip=2a00:1450:4864:20::138; helo=mail-lf1-x138.google.com;
envelope-from=swupdate+bncbd2zdgn6sekrbvp6yxbamgqejhzrkxa@googlegroups.com;
receiver=patchwork.ozlabs.org)
Received: from mail-lf1-x138.google.com (mail-lf1-x138.google.com
[IPv6:2a00:1450:4864:20::138])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384)
(No client certificate requested)
by legolas.ozlabs.org (Postfix) with ESMTPS id 4bM8lp5z1vz1ymg
for <incoming@patchwork.ozlabs.org>; Wed, 18 Jun 2025 00:44:37 +1000 (AEST)
Received: by mail-lf1-x138.google.com with SMTP id
2adb3069b0e04-55220256289sf3146317e87.1
for <incoming@patchwork.ozlabs.org>;
Tue, 17 Jun 2025 07:44:49 -0700 (PDT)
ARC-Seal: i=2; a=rsa-sha256; t=1750171481; cv=pass;
d=google.com; s=arc-20240605;
b=Pt+6KtWaMbXTk2a06dSUmXZ8FFHdHK/su7wZ6xDcKgaz/DQVJuLUMWk2QqNmJ7YF2h
f6OEDlkoWUH8dOh7xTdkxbn2K3C6S3tgzsBAyEeUnZmKT/NrgHUiudp0GwdAl/wwCF1S
7SCMhZxkK7gxDe78ISDDdZFS4Q/AErKJewezWtvyAPiXzwHbUZY2YLkZ8sAN6kNyvWuk
5At+vkiVc2Q50cQVO6bqvGTX2rPuYQ3vb4qKT/EGYbTdQk2REg5OlaTvo+ndaj4nM1i5
pbnCLrCMDvyxHLC+iXXWQ0s0lTPKcWiF+y04nj7KiH/aMfDc1sGieK0La7VEp4oTO/aG
UEyQ==
ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20240605;
h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post
:list-id:mailing-list:precedence:ui-outboundreport:mime-version
:message-id:date:subject:cc:to:from:sender:dkim-signature;
bh=zT1es/uKxrU8jwB/vMa5hAZXWvl9sb1MI8pFp8TiduM=;
fh=bcZ7w9WtczRwkLw9pexXmvRAsyhwMlRUQmDWXWxdroM=;
b=IsOXR7GjK9vr+Gd+FJomkaaFBbJAhSaMiaRePq3Tq9LvVIrZVkFJNqSIIYbUkXFs0v
KXdBGoIxWdf5mbc5ym6HBfd0SWvgrNjYjj8KczQm9gupcZd7SoMcTMk1cv/bJz4sr9lD
vPLhZd2um+nbb8fwDgkrtnWIb8XmZzv1omOdhyiE1OJSqeEGc1pH86J3woHyYtTLs+wQ
t8GHNpktSHRu6IoIMTBB7Arz5NwZVhYDsc5edxxOOYV6wjSMMz06m5/5gPKClNIXdbPk
qDeOrqnF3Ik6kYV5YI24dtNJhCbIHCSRfe/Meja06DzOmmjqV9p9sir9dGBD6z6vGZiF
gN2A==;
darn=patchwork.ozlabs.org
ARC-Authentication-Results: i=2; gmr-mx.google.com;
dkim=pass header.i=@swupdate.org header.s=s1-ionos header.b=pw+qYF1k;
spf=pass (google.com: domain of stefano.babic@swupdate.org designates
212.227.126.187 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=googlegroups.com; s=20230601; t=1750171481; x=1750776281;
darn=patchwork.ozlabs.org;
h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post
:list-id:mailing-list:precedence:x-original-authentication-results
:x-original-sender:ui-outboundreport:mime-version:message-id:date
:subject:cc:to:from:sender:from:to:cc:subject:date:message-id
:reply-to;
bh=zT1es/uKxrU8jwB/vMa5hAZXWvl9sb1MI8pFp8TiduM=;
b=qxVTUGofNCu6cQn38ZL4YOmgeUpyiYqkITqVR2/2ltVgAIS5bryg7DeKe3xYbMHL4t
mz6DUuhypI57gyoKIiLSwKdIBVL7rjMQnHg5iD1HaTfekSoWzNRnyCQCBZIqzZCpyAIP
3RpV60WYdt23hOEFQv//YRX1NBx1WFw+BZ/oIEAbHWkLX36LIMZ4G6165jPYKgvwjUKJ
g71yDKzOKmgKnwQQt3BbT8IGs77KhkSUaXex0Pig0czR2yoh3B1eCY1mnuiQU+puPXyE
PU55+z/OxcqlMUAui6Xy5RP/A+TX68qMJKKPAS7EZHAF9ZVu9QvinLHL3b/yE0Z45VEn
sskg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1750171481; x=1750776281;
h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post
:x-spam-checked-in-group:list-id:mailing-list:precedence
:x-original-authentication-results:x-original-sender
:ui-outboundreport:mime-version:message-id:date:subject:cc:to:from
:x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date
:message-id:reply-to;
bh=zT1es/uKxrU8jwB/vMa5hAZXWvl9sb1MI8pFp8TiduM=;
b=RbJoBQGZmFDWDNfFT0idCqTr2agFuGw5BtSkApEtVEy2aUJoucBKYW5plwZq26F0vF
M6bQdRHXumWQkFgRFSOYDVw5+7OpC1xPxX+8PDcKCil2QNk4WNm8wDcRNjAjLUxbRpBJ
Dzq8M15aIRDvYovmu45jTBUKZPVRTD4B7J2BXncqPu2oj3SXsAmhwh8YwGihIT/1hjmx
TQJRm3/cLmSLg/yizfa1eCjmfeMZmt+oX1/nz2wavD4vFP3JOGd1kIgRx7c/Bn0+w00+
756w3NkC0AovB5Wfm4jLI/RfTM+kUQQxJZJMKAbXG+wEJL2wjFRhdPYmqkr3Id10bvs8
bzOA==
Sender: swupdate@googlegroups.com
X-Forwarded-Encrypted: i=2;
AJvYcCWvxGjDTWK042pc8tOYLciK4O9no1Wq7cn7nnNYs66STEtp4uTQJLzXtdE2QLIH+PURB4NvDFdjSA==@patchwork.ozlabs.org
X-Gm-Message-State: AOJu0YyP6/lX0FeVHgLcAyRA8FOAcHmcItBW/RQTep7tcQJYBmq8x5T3
oq5KbZVQ8gJuMikiJhvhWYlKzo+L46n3zEBXx/2ounnd1/piCiAlitVi
X-Google-Smtp-Source:
AGHT+IG6uaPHv9789wnd+y8d8jlpeRWqeFLFxQquk7q1RxxH/Zgu5YU+1fLo/Op1fDwVOZcp8nwPFg==
X-Received: by 2002:a05:6512:31d6:b0:553:647a:e488 with SMTP id
2adb3069b0e04-553b6e710bemr3724795e87.12.1750171480542;
Tue, 17 Jun 2025 07:44:40 -0700 (PDT)
X-BeenThere: swupdate@googlegroups.com;
h=AZMbMZcy4nlXWXlwySzbFa9Wt6JtBCGoc9+7S8JKac3/EeedJg==
Received: by 2002:a2e:3016:0:b0:32a:6c94:9a22 with SMTP id
38308e7fff4ca-32b31afe826ls8520051fa.0.-pod-prod-09-eu;
Tue, 17 Jun 2025 07:44:35 -0700 (PDT)
X-Received: by 2002:a2e:b893:0:b0:32b:3c11:5177 with SMTP id
38308e7fff4ca-32b4a4acd07mr39653261fa.21.1750171474742;
Tue, 17 Jun 2025 07:44:34 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1750171474; cv=none;
d=google.com; s=arc-20240605;
b=O4cS00PX1xoW3twtVJCxQduZaZ8HsKz94a2xycI2dQe1A9pkBcgke2vK0ppP/GMzD0
DBml3bmnnHId7A7qMSIJJj22HXPpmhBeY3AOFKi8L0JqqJFyHZgawzx0D6tXPLMZ8yTI
gke6zjV0q+vkv/DwNhBmUZ9H9s1qhp6DFIBsP9stKzufCZsR+EKfCWbSC23B2JevqolW
ks7z4IqKH5aqElseL7RI3hUZNNKBS2CseCaA4pBCRHmPA9I9nMHcTmhWOUP65uQij/22
hmrkSr8McSNnchPW0ULpp4BkV6yGpMX38aoPupT+RgSIhD0am3bb8N1jnvNNBvfpmPKe
ydaA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20240605;
h=ui-outboundreport:content-transfer-encoding:mime-version:message-id
:date:subject:cc:to:from:dkim-signature;
bh=bXy7Yi5Q9x/CMrY6pXsdVCUTIF/2hLt182KveVVfNCs=;
fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=;
b=FB4OwAIlnwYmGt/tBGl2aOLCsgDeXGWucEWzkWhMkSZsNakoXnSBz2Qwt/gpkCMB/O
HVV0IlO3W3HZ/KKVdabfptAr89Mak5zMRVMOdqr7uBN+eAJJKBds+Q6ZGOestK06CnFc
XOLdeOljih54hFTIiYm6w2tMd+il1Vy3FEZtWq8sHdmJGbMSrG3b4Dz5h7IpMX7eypbc
Fg+Ow2tesDen8JDVW281HFRxMONhtSp5J9P8kGFwXc8TSSLdwU0R2kATvYdlpUjOKm1E
0mXM1yeweI+oGsXJa/POm9RqIWN7B6bk1jVAVJJpQwFWuqGBmZNo4ewYhghu3kqhFFGQ
YSfw==;
dara=google.com
ARC-Authentication-Results: i=1; gmr-mx.google.com;
dkim=pass header.i=@swupdate.org header.s=s1-ionos header.b=pw+qYF1k;
spf=pass (google.com: domain of stefano.babic@swupdate.org designates
212.227.126.187 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org
Received: from mout.kundenserver.de (mout.kundenserver.de. [212.227.126.187])
by gmr-mx.google.com with ESMTPS id
38308e7fff4ca-32b3300f062si2592121fa.2.2025.06.17.07.44.34
for <swupdate@googlegroups.com>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 17 Jun 2025 07:44:34 -0700 (PDT)
Received-SPF: pass (google.com: domain of stefano.babic@swupdate.org
designates 212.227.126.187 as permitted sender) client-ip=212.227.126.187;
X-UI-Sender-Class: 55c96926-9e95-11ee-ae09-1f7a4046a0f6
Received: from paperello ([88.217.136.221]) by mrelayeu.kundenserver.de
(mreue009 [213.165.67.97]) with ESMTPSA (Nemesis) id
1N7Qp3-1uqZDw2gMH-00s5k0; Tue, 17 Jun 2025 16:44:33 +0200
From: Stefano Babic <stefano.babic@swupdate.org>
To: swupdate@googlegroups.com
Cc: Stefano Babic <stefano.babic@swupdate.org>
Subject: [swupdate] [PATCH] BUG: flash_handler: decrypted-size became
mandatory
Date: Tue, 17 Jun 2025 16:44:27 +0200
Message-ID: <20250617144427.2013807-1-stefano.babic@swupdate.org>
X-Mailer: git-send-email 2.43.0
MIME-Version: 1.0
X-Provags-ID: V03:K1:4FLl4QoQOUeEs240M0FayMQFJvbg1MeLRwqbx0xuqkLGmRIYp5R
AKqpglCgYCPBClOpTSg6wDb/rl4ZmmctW0W48s7I81A+lAzq8CJVIbqGwmkSZ5y2bos8K+4
xSUc2IUjFoLJZvwtUci3zXdtGTDLv0dGT6LM3qB4SxXXk9rJEHOpTckFYMAp8xws2eW6EAh
NOoEI60SHm6HS/KRNJgAQ==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:sOKXjqSIpqU=;KRUe4J2GqgyP9fOZFAZXAXCRv6N
Pr5nmM/kHcRGw4jR6BGaoeqYph0fwSUZfUeCfIT17Hpbiwp0FBuIMcbgYVcFzx+zzwFyMOSXt
BvifxJdH84ttF5eRlLwcJ3uTbILHbslzKqjHZU98eGmii/HQ9wEw4FTJRhmbR1R6m/RWndeX9
+0SwaM1yuoRJtgZDyL54my2SsOCTaeYFOgPwqV7iUNE3x7m7wtxpBLWQ64ENfmfUpxksflnSr
um/K56eDbJtkP2UX9B816EkBbu9U0vcTd4eFFoYjMUa3CvX9T/FOS3KRd1TTnr9mr7eCY/gSG
2vjkFtRhCmwvpv82uZXbk6JbnLNRGIyH63cqvASGj+LTna3VIADLybIaFalrvj8REH9/oLCZ3
GXztsJtJKcJK7SugQlky+lwt+W/ZFUyc7B0NFoqPFQA4mzXxsyd+DKY7sBOqLZFW2xrkibf6z
SvDBsDbI0ox3WRjWHYqqR8ZEzHXmaEG373segExjKFaboPQRrKljVPvwCTFmqFCQj4wLwdbx1
Kdn3qWjglXOpYNz4nAUCsBAcrPq37tzYKkFhjiJcwPS8mtJe1BwDdDYSsGXE0tMJ1apdUtWeK
6tY4MMjf8sAAX08h/HMuafKUI1TLaKGN09RUmhcqSuugE+umnUtYw7lhVV+lIxlJAsfXLf4/V
TIL/40KA3NiKdaz2g/xlKnXfD8P7ZcMpiTsk02boA97BsrEa0oY5Ud+g+X+IlYrFgQ8FKn7cM
pjHeFat9N31sYK6ah7uBUIygugUmnzsJpUXKLQgskjgwUrvMHKFAT1MdcbpzdQFPTIATYruNZ
49GGnSgvg0vxPAKYTU+Insz2DxuyQd93JUJku7mCMRYApq5BKJTXZwkwQKSbiYYJjm40YpbuI
aEliCVeepwEldiuo2Pylafy7TLBUtGIUaYLxoVQK0e6WsbpResWuKRMzhN0E2DEykTt2bu/D1
x3w0Z8/AXCvWOj/AkRC6fkSUEzsXx5trI8a+mSCgQD/t1jQJCWA7EG3L11YnV5aH31aT5yAMv
TCmcnA2ljaJYSQHD99ty4vNypT6iGthLXKToT+LK9zMi4w/2THK/jbKfBCmICw4nZ5GSk/HQQ
ULohGX9dVBxycjmrrHyewsRJ/wuceo5BTdJrYWa25y2Git++TjszpIvmuuEwcYpRQdEqEedjH
R36kc5YInlPg96xviiXnt2mefvpkQ7/elM3vH9YgkiFo7VfijAc8vXH8rlgpOFtJ2BjEjCPjw
0QxnPo+36pKVz7ledGIqxkLtbVJwPKBI7pFHmcEcZoLb/6VxhzL3KAV403KBj9Pp4oA3pCSVb
vR+TqYSeBAVqgVNxDpehqT+R9QPDm65cY/wkcO2omjg8spXaYBbz/AxdtISaJR/TVgtBT4Tgv
aUcpU1IZeG9F9lX/AndHbegnzZ9n+f/w9ijEo4QW7uEWCy90WL0VKs2bGH
X-Original-Sender: stefano.babic@swupdate.org
X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass
header.i=@swupdate.org header.s=s1-ionos header.b=pw+qYF1k; spf=pass
(google.com: domain of stefano.babic@swupdate.org designates 212.227.126.187
as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org
Content-Type: text/plain; charset="UTF-8"
Precedence: list
Mailing-list: list swupdate@googlegroups.com;
contact swupdate+owners@googlegroups.com
List-ID: <swupdate.googlegroups.com>
X-Spam-Checked-In-Group: swupdate@googlegroups.com
X-Google-Group-Id: 605343134186
List-Post: <https://groups.google.com/group/swupdate/post>,
<mailto:swupdate@googlegroups.com>
List-Help: <https://groups.google.com/support/>,
<mailto:swupdate+help@googlegroups.com>
List-Archive: <https://groups.google.com/group/swupdate
List-Subscribe: <https://groups.google.com/group/swupdate/subscribe>,
<mailto:swupdate+subscribe@googlegroups.com>
List-Unsubscribe:
<mailto:googlegroups-manage+605343134186+unsubscribe@googlegroups.com>,
<https://groups.google.com/group/swupdate/subscribe>
|
| Series |
BUG: flash_handler: decrypted-size became mandatory
|
expand
|
diff --git a/handlers/flash_handler.c b/handlers/flash_handler.c index 953e44eb..bf534e70 100644 --- a/handlers/flash_handler.c +++ b/handlers/flash_handler.c @@ -463,9 +463,14 @@ static int flash_write_image(int mtdnum, struct img_type *img) priv.imglen = get_output_size(img, true); if (priv.imglen < 0) { - ERROR("Failed to determine output size, bailing out."); - return (int)priv.imglen; + WARN("Failed to determine output size, getting MTD size."); + priv.imglen = get_mtd_size(mtdnum); + if (priv.imglen < 0) { + ERROR("Could not get MTD %d device size", mtdnum); + return -ENODEV; + } } + if (!priv.imglen) return 0;
Commit 3f230e0e30 dropped the fix of 64ff18b65 to fallback to the whole MTD size in case no decrypted-size or decompressed-size was given. This restores the changes and uses the MTD size in case no property is set. This avoids compatibility issues when an older SWU will be installed using a newer SWUpdate. Signed-off-by: Stefano Babic <stefano.babic@swupdate.org> --- handlers/flash_handler.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)