Message ID | 20231215142251.52393-3-Michael.Glembotzki@iris-sensing.com |
---|---|
State | Changes Requested |
Headers | show
Return-Path: <swupdate+bncBDY5JUXLVIEBBT6C6GVQMGQE4TDTU4Q@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=MrKfkhEw; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=OyurekJc; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::33a; helo=mail-wm1-x33a.google.com; envelope-from=swupdate+bncbdy5juxlviebbt6c6gvqmgqe4tdtu4q@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-wm1-x33a.google.com (mail-wm1-x33a.google.com [IPv6:2a00:1450:4864:20::33a]) (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 4SsBJy5PJ1z1ySd for <incoming@patchwork.ozlabs.org>; Sat, 16 Dec 2023 01:23:14 +1100 (AEDT) Received: by mail-wm1-x33a.google.com with SMTP id 5b1f17b1804b1-40c35d1d776sf5633275e9.3 for <incoming@patchwork.ozlabs.org>; Fri, 15 Dec 2023 06:23:14 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702650192; cv=pass; d=google.com; s=arc-20160816; b=qjVoq6mna+kV2W+m+XPFGXaQFx70aUKaphhEfOkR1O/AllsUzEmlHYne3BBssHUTy9 y0BcL2AXDInhW4m2mp8AllxAysvf/Fw+WQwpFveQ+Y5x0leMnqR9XYTubcI5Ijy3Nt0v HVEN/VCtHVF1JBe0kq7MY9F8E8PRqEYp01wLbidGF7qnunLUimAg/gvfNoJR1jeP4dvS RsT4HXcBjk7LwbJ/sQtKRO40rYMpeREFDkkzb/IZqeXI46Ao34nEBfogd4ylxVDhbufo 8dM6yqplALaOQ7oaRq0SHlK6q0WNYzCa1B53BZDBIyaueuU1RL6XxMte+VsgP1KAd3Lu x/1w== 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 :dkim-signature; bh=C977uK59+r0kRZ1RyQqPQdpOzckvjGnvkYytPS+RTvs=; fh=zydHuzCQWrku2OPQyZfraJZFcOpEXLQ/YBcu3QNiBd0=; b=rlDZVufzv/A43Hp0UM9DyhVjQaS4fYftN7NLmUaeQokGN0umQDmDty3UuacSbIr+fT fzmFiQfn8exRpvUMzc3EByByavQXITnaEkYVOAL36/iOkwfA3qS1v01USrfb0TmAR0Ui TN7eSI/1OKSZOxf/UdE0cs0aiEjRawMF68F/Irec9IpPtadKPvUY2BT4iMuCB1u7FZTN KqGevNUD+5bPy08QV/6p6CY+Oku3Z7uyfvpmG5QEa29d323vrY0idR0cdBiF2mtC8lN7 1zZjQo74Kg6Sm33jOkW0Pbibsvig22pO5JsMDRxhesouLz658DabVfLibdzvT4gjyE84 2sEg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=lP17UNUH; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::631 as permitted sender) smtp.mailfrom=m.glembo@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1702650192; x=1703254992; 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:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=C977uK59+r0kRZ1RyQqPQdpOzckvjGnvkYytPS+RTvs=; b=MrKfkhEw8zRPhD26JSeSsFDtkGbP95w+IM2yFfAM/zPSSVrrfrxVqe+FJi2c33kpl2 X7bxQIgAJQO2Lki7t/LL9tl//KB/gbI6Z3owhuyJU7hXwhZIPoIjpRZhpA/pmVe3bIO9 8FdYNt2r9qPVcgXiwSzIBRaqnQ4eXDmQMGQ0DIrSLowizDhy1nnTT2RmCWCg6obXj0TE QaQmZ1YKO1IronBXIRl3N4FJeIv8ZyXN5xxmmFuGgmNDYzuMHxUzo/wmXADDtrzDqch+ c7zWNFKTUPBjH9hVpvCJTZqoPz2eQin/FcWCQ+hcw5PffjwFRERLiCDWnHJ6vq8qNLVs o2lg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702650192; x=1703254992; 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:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=C977uK59+r0kRZ1RyQqPQdpOzckvjGnvkYytPS+RTvs=; b=OyurekJcIGqtx/XMKa7d5OkMPLAMAVDXun81ZvUBu1dLgVnfPQ9WiCx3nBedNd4uM2 hbgpVufAkIffyLsUJYZi0cVchW/k1G0PmOgD+Wlz/u0mXUEzibi0jY2+aw3ulVL4h9Sr rpSR+UAeZF9KLYx8cqDzU6pTQU82KaDj4PoSpU9yx0QFNKN4p4ZeUl5N3nU+Vj1PV8Mm H6c8lrCSJWxgbp3OKgPodvfY4sfa5XqwCTuR1OGGubTEgHYLYM6IDtgKuxnyCbCgkYCl fo/U+20HU6JzRE3k58E6lJwo1fhYijePqWITychRbC1dBFrZveZtmFw/t9XGxip7bzN/ 1LnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702650192; x=1703254992; 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:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=C977uK59+r0kRZ1RyQqPQdpOzckvjGnvkYytPS+RTvs=; b=W3BjsMMGiqUE/svyeF3VxenZgdACjL7HzhfQKy/kz4XsYFVx2Lt+kp9XSuT7HktPoF XGLs0H4tneLgB0XkrbC+GXyCg0HFEVPucCGmhqyRtMwK9BYYLhfX/uo6Xp/xb2rpntAV Qj+Xo9ill8mFkAE1bTJWmuy4THgm8DufNbvAgfUA+2TNLZ4IQKb4sW5m1CkrgfXDJGNP j+uxSpPC2zVQ592EtwaTrbYRuw4kzIO+UEg/5aE42IvDvQd4xUofDbh6W3SM/WDNKRFz Y3Cbs784H3xxinL6GHLDjh+HkqnvZTBNFqRjimSG7Vcarx2QR9QtfVXA9vd5m1n2WYqr mnBg== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOJu0YzlZaaaX1UdOrUxrOVkaXE2VkXo26+LQNtiOWwTgWQbqYuWb84I C59b1rAmWSyfvIv0hs4SBb0= X-Google-Smtp-Source: AGHT+IFeDyrhBDBkvugSGIkxhIavLS+Y8mZGBOmMi+DA9a4MMxWIlyq3VWEWO0TdBRTQLZlwLWHi0A== X-Received: by 2002:a05:600c:4710:b0:40c:6b69:1885 with SMTP id v16-20020a05600c471000b0040c6b691885mr480781wmo.213.1702650191912; Fri, 15 Dec 2023 06:23:11 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a5d:6b50:0:b0:333:57a5:61cf with SMTP id x16-20020a5d6b50000000b0033357a561cfls377575wrw.0.-pod-prod-01-eu; Fri, 15 Dec 2023 06:23:09 -0800 (PST) X-Received: by 2002:a5d:4745:0:b0:336:4a5c:e12c with SMTP id o5-20020a5d4745000000b003364a5ce12cmr1228808wrs.116.1702650189522; Fri, 15 Dec 2023 06:23:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702650189; cv=none; d=google.com; s=arc-20160816; b=FOLqg0psqqNIUkKGa0gO0zebO5g1mP87ckXnXVEf6GOgDbZwSKNquMvlKEUJmpqjsD G4GAuw6bYXUzPC4Xu7cTXrVr9Kkt17CxSWr2/97B3V1saw8ZXTxhvFCMWUplUNzO4adb j2TULhOv6FCvoPNSM2qoiUSoQ3yaUtqqreJl245bBA7b35VU1fN8qPOhKVHrfLil/2TT 1kQ3Bk+GmvOpLnOpJmgEERntqZ3rKMZf53qlP87fk0Zia9YRbIDl78FftongwOnAokvf fG2elSWYVq+tu73RasfmZpgR404yQH3RGQBBURSYIm4gqhguoO4wEL6FaODWc6kyyHru KeUw== 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:dkim-signature; bh=kUthooyiqUbwj7+9xalNgbZ7LZb4AF3SOWcipO1KIjk=; fh=zydHuzCQWrku2OPQyZfraJZFcOpEXLQ/YBcu3QNiBd0=; b=fzf693oYDkpxLt4FV56JxYuHJO1efLi+LX4aRtKQ/o8zQGxr2DHwqgPIwMOGGGLEeW x1OG4mv2573lmsOiuDsPwRFtqhRcXJnkgZeTfEBN3Fy5n9yC3SY24DVz+az9KiHJz+FB sHYmQlRAckXbWXUzoAf0AjqyfzbGWINa0+zd7lgpmRpnDc6v9tSSs5Gw/8S9SjkQ/Chc Fh/u3PZvDm5+M23qQT0l1Xyl9kebbzzMz4ly746wCNKOsfLgf48HO2teqYZI3MU/oNJy KVxQmZctzgXixD7JYUR62nHNsCHm3qYKZZuefE4eH5oUgSiGniBAh7ZyIywTUqnAafd8 Lqyg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=lP17UNUH; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::631 as permitted sender) smtp.mailfrom=m.glembo@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com. [2a00:1450:4864:20::631]) by gmr-mx.google.com with ESMTPS id l17-20020a056000023100b0033654ba83c8si41392wrz.7.2023.12.15.06.23.09 for <swupdate@googlegroups.com> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 15 Dec 2023 06:23:09 -0800 (PST) Received-SPF: pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::631 as permitted sender) client-ip=2a00:1450:4864:20::631; Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-a22f59c6af8so80363466b.0 for <swupdate@googlegroups.com>; Fri, 15 Dec 2023 06:23:09 -0800 (PST) X-Received: by 2002:a17:907:2d2b:b0:a19:a19a:eadc with SMTP id gs43-20020a1709072d2b00b00a19a19aeadcmr7406351ejc.149.1702650183840; Fri, 15 Dec 2023 06:23:03 -0800 (PST) Received: from PC-2635.irisgmbh.local (dslb-002-203-161-041.002.203.pools.vodafone-ip.de. [2.203.161.41]) by smtp.gmail.com with ESMTPSA id vx6-20020a170907a78600b00a1e852ab3f0sm10944029ejc.15.2023.12.15.06.23.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 06:23:03 -0800 (PST) From: Michael Glembotzki <m.glembo@gmail.com> To: swupdate@googlegroups.com Cc: Michael Glembotzki <Michael.Glembotzki@iris-sensing.com> Subject: [swupdate] [V3][PATCH 02/10] util: BUG: __swupdate_copy accepts invalid ivt Date: Fri, 15 Dec 2023 15:19:39 +0100 Message-ID: <20231215142251.52393-3-Michael.Glembotzki@iris-sensing.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231215142251.52393-1-Michael.Glembotzki@iris-sensing.com> References: <20231215142251.52393-1-Michael.Glembotzki@iris-sensing.com> MIME-Version: 1.0 X-Original-Sender: m.glembo@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=lP17UNUH; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::631 as permitted sender) smtp.mailfrom=m.glembo@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com 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 |
Add support for asymmetric decryption
|
expand
|
diff --git a/core/cpio_utils.c b/core/cpio_utils.c index f2bfdb5..5b99904 100644 --- a/core/cpio_utils.c +++ b/core/cpio_utils.c @@ -514,9 +514,9 @@ static int __swupdate_copy(int fdin, unsigned char *inbuf, void *out, size_t nby if (encrypted) { aes_key = get_aes_key(); - if (imgivt && strlen(imgivt)) { - if(ascii_to_bin(ivtbuf, sizeof(ivtbuf), imgivt)) { - ERROR("invalid image ivt length"); + if (imgivt) { + if (!strlen(imgivt) || !is_hex_str(imgivt) || ascii_to_bin(ivtbuf, sizeof(ivtbuf), imgivt)) { + ERROR("Invalid image ivt"); return -EINVAL; } ivt = ivtbuf;
Signed-off-by: Michael Glembotzki <Michael.Glembotzki@iris-sensing.com> --- core/cpio_utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)