From patchwork Mon Mar 18 10:28:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu MEGE X-Patchwork-Id: 1913066 Return-Path: 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=bdjB1VDZ; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=CewP1UT6; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::239; helo=mail-lj1-x239.google.com; envelope-from=swupdate+bncbdmlf7xf6mjbbqvo4cxqmgqehuqltta@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-lj1-x239.google.com (mail-lj1-x239.google.com [IPv6:2a00:1450:4864:20::239]) (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 4Tyrfc70Qmz1yWy for ; Mon, 18 Mar 2024 21:28:23 +1100 (AEDT) Received: by mail-lj1-x239.google.com with SMTP id 38308e7fff4ca-2d47e55e058sf30259661fa.3 for ; Mon, 18 Mar 2024 03:28:23 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1710757700; cv=pass; d=google.com; s=arc-20160816; b=IwLV+zaOOBtIdbOpKL5QdfmsDTZdx97H7Em0SYSGYCzIbSBPB5QnZeOoZ51fWI9Fi1 tLmXanKEbM6KMC869e1zda/YOS2Zg0RCobEluXBcPvms2pBO1x/axJyNtlxmPGrfEgxH lOHyZUSotPS3ux6QD+8wFjsGB567M7mkPwOIjUGzcorFGlcLsaBdUs9oATnf9e91jGDP 6u24kxA2zBRlNaOn4bBY6R41bpA7/8gg5DTRFwhE/yO5xGfazWmTbiYL9ZUXdlHfrFZP lzf3/cQ6ovYsmrzx/Conf3Ijou4OGvdiKfMMegcLI2VBydQ/xz3sv8tTbZslaLQsu45w jR2A== 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:subject:from:content-language:to :user-agent:mime-version:date:message-id:sender:dkim-signature :dkim-signature; bh=APBU3qN5hOhf9P5vPqAqljwtVHPqykA9kvqxp3WPnQE=; fh=dVxIMxvTfmw9ktyhSLMXXGkrPvq8H1OlGQcaE9fuBcs=; b=DlzSKS/k73Vnypc1vvYrXGSm2k9VuqwuZbLtS20i0kVwF7ir5OQ4FY2CpydxlTBo1C v9sbqq2p3oo6IK/Qz+2FMkFWVOmF54kRen9TkzO4Irj9WUYMG9QdsXZoIKz2SmIeMpGg sY2u9RUqVtaivgVJYy/2kBvfItgv6x/2D4QW/IirHVmT5CXYXCx0K76VZa3/Uft33RJr k3jdHhjI9wEx0Q9J3KcR8MIWAo1hpESO15bLOb0x+SR7FfURi6VbtLoc28Z7aTugN6Sq Mk+w7BWX5F+uDLT96MNQLvNVsCsj1fq0fXPk9O3hqagHVMjhfVA+5kGCnZvGTn4qJPVP ubmA==; darn=patchwork.ozlabs.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=LI5TVUs6; spf=pass (google.com: domain of mege.mathieu@gmail.com designates 2a00:1450:4864:20::32c as permitted sender) smtp.mailfrom=mege.mathieu@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=1710757700; x=1711362500; 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:subject:from:content-language:to:user-agent :mime-version:date:message-id:sender:from:to:cc:subject:date :message-id:reply-to; bh=APBU3qN5hOhf9P5vPqAqljwtVHPqykA9kvqxp3WPnQE=; b=bdjB1VDZvQ3d9r5Vtbip314d3Vw1THZVMmIq4SMgOR1/oNi/aISW+DALBjNwXmAKT2 JLtyfYboIC5V1JKNDaZyjRj0l7cPGihAo6K3mRhoHWDZrCOX2JfuNrmY+cq3ponzImug dWO4t3d7CnbN/q9BZdVutDyaEVH6SuG7StK/1Gsutm845+k3Q56r337JY0TvATKzJeRv n6YfoU/OWj90t06VUYHYKzVTdZ46Y/JyDT7QaaTJu6wZFUFWN21hpDYE23SmKrDQcUfA WjCrfFtbEMFRRRIfX5jPNrI6uUQUesK5g76z0Jxda/cL69IuO/0xIv1zC0QPPT21apPA t3XA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710757700; x=1711362500; 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:subject:from:content-language:to:user-agent :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=APBU3qN5hOhf9P5vPqAqljwtVHPqykA9kvqxp3WPnQE=; b=CewP1UT6wZ70KOLrhpf3F/304AmbPFMUVhZKSAl7WZJr6Kiznvdv6UZAK7yrIMTehk KYsdKAha3AvdStXsgwmGb7vJhXAQUxlSFZLGaZhCNrIYNyxVi09ubFFHn+QwoE9kNTYe C5OGdTi5qgATvVklImuxNKytV/QTUYTeBklj8IJVYIP5M12tTm+deB0F7h2qxahtIXhZ wMPhRLM0pzzjbXtgS7BMug0OTLbIBq89Z5mWjV2Tkd1/LHUPxcRXuxKXYtZC7Cff8Mp9 80J22z1VQPwXRxvPu3TLcdPTQFrbmeJjRIy1rzlaxnT41x9JnJnprDOR1LBaDcaBYjm5 Nz8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710757700; x=1711362500; 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:subject:from :content-language:to:user-agent:mime-version:date:message-id :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=APBU3qN5hOhf9P5vPqAqljwtVHPqykA9kvqxp3WPnQE=; b=Loh9ftDDsqfPy/syupE/lHRh7+NMJTudxqFAtDjCec4N4FYZSNg8PfFHG/QiQHhEyh P7LWTNwU1nl6UpJu6e0jINn9d3lK3qtRAv4P4bWpo3gw8xl16FzYChyy/GyoApw4TUjj 85IK1VrkLJ4QJXLt2V1AbOW5D4sv4zS16aq6cUeZXIv8YBvmbEFESQUoHsJUzB98xqsI aYxNzmmi7B5FruQkp3XjvdA1kEiMjWcDpTJldTXdvNeiFdx+vmeoyXh1yHpWnjssOJ0I 4+0sxcEITPVmeUM//dz9vy8rO17WqeFLyas/+3Dg9ZBPSdkPKASQIJciieLgwj8quFCy IJ2w== Sender: swupdate@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCUZHmKWwbuUP6yS8Jr6eVShTcIdUr3HKVtHmF+SrBvek10f7VG6V4BXq5lwrS3zEnrqHnHekLPYVg3rNQIG6y6QsN8/0ITlQ/4CqaiGSg== X-Gm-Message-State: AOJu0Yz+i/svrDwSDsrThZn/6UGuNq1J/LaHnnnIWbIi8FQk3IWtESPc A0CBsmAMUaF5fygoLvOzjyRbZJ64LOa5A564R1n/IG84up9CHONb X-Google-Smtp-Source: AGHT+IGKmo68HjRL0N8oSut5je9GhIN73mwVOzilb4kQaV2A6BL4D07wSCBJ680Ydl12kQousJEj8Q== X-Received: by 2002:a2e:7c02:0:b0:2d4:2958:6daf with SMTP id x2-20020a2e7c02000000b002d429586dafmr8013863ljc.20.1710757699160; Mon, 18 Mar 2024 03:28:19 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:9b46:0:b0:2d4:6f90:4b60 with SMTP id o6-20020a2e9b46000000b002d46f904b60ls62649ljj.2.-pod-prod-03-eu; Mon, 18 Mar 2024 03:28:16 -0700 (PDT) X-Received: by 2002:a19:2d15:0:b0:513:c8a6:5628 with SMTP id k21-20020a192d15000000b00513c8a65628mr8555892lfj.10.1710757695664; Mon, 18 Mar 2024 03:28:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710757695; cv=none; d=google.com; s=arc-20160816; b=fxTkIhyHGdD4VdKFwz5qEw9XinrZxxP7HrbHJiesQFBD5yKXdQBVoHqUXW7VtmP5yl dsZfd+Rw6urFS1LUatTePRt9e/WI8Jx/cqJKvFvNha+f7heMJwDn0Ea5PG6IADyYkgcu IPl4b06MA1ajzfNdjiunoZH8Nh6FPTfsgKeS0Td1kWa/ITcBzYYHFOEzdX0MH1Hr3rBI g0UuwjEpXxw1M47/gJf6qUYAEGzLxBc64Qu4iCrNq2Lfb68evro61C8eP65CvCwcL0Qc w6JibBtUsQu1n45BDVR2NLkATOAc/X6JXuu9IE54KFRD/QjnK2IdDjWwPZELpFCo+Eu/ ZjUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=subject:from:content-language:to:user-agent:mime-version:date :message-id:dkim-signature; bh=IGGdc9erTYJaLyhTRIhQiX6fc2WDgPN2ZP5Z6gFY3qM=; fh=LAzrlkKku7PbGcuRznSePBLY+dZ59EyLBy2LiOB8yoQ=; b=gLSuwzY9IMgg76NcVy1JQZ2mdACvt24vu9SY8CRpjlo3hbO2cVCFb3XmfmhZC4CfCZ UcQjrPTnQ61p+8lrG8S1PsdCQ5+2Lv4q+2M2YkgOdIlvZXO4BuH1DdnLMrRHbN7TPJl1 HXUDis2Dx5OlB4e85eOcXrk0V/OdOsqBFHZo7EIdxoS/5d2FPx/f5kmjkit1/1ybQouZ CelhFbVEjZwemJyzg5Ml2YbZpKVhC+g3ugklge8GKkf+EnGeJ8OuC8URakEPOTWhTNtu xmqvS8R9PaLncW1/m5XE8K5hs6RmKcDSYDIEHyDo+YmCcqIZskmEWR0QxlRL8KCkfRBa SuGw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=LI5TVUs6; spf=pass (google.com: domain of mege.mathieu@gmail.com designates 2a00:1450:4864:20::32c as permitted sender) smtp.mailfrom=mege.mathieu@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com. [2a00:1450:4864:20::32c]) by gmr-mx.google.com with ESMTPS id a26-20020a19f81a000000b00513599140b6si523050lff.6.2024.03.18.03.28.15 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 18 Mar 2024 03:28:15 -0700 (PDT) Received-SPF: pass (google.com: domain of mege.mathieu@gmail.com designates 2a00:1450:4864:20::32c as permitted sender) client-ip=2a00:1450:4864:20::32c; Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4145edc6d38so190585e9.3 for ; Mon, 18 Mar 2024 03:28:15 -0700 (PDT) X-Received: by 2002:a05:600c:314e:b0:414:630:2691 with SMTP id h14-20020a05600c314e00b0041406302691mr4579667wmo.6.1710757693969; Mon, 18 Mar 2024 03:28:13 -0700 (PDT) Received: from ?IPV6:2a01:cb1e:3f:868a:ff43:6886:5dfc:c470? ([2a01:cb1e:3f:868a:ff43:6886:5dfc:c470]) by smtp.gmail.com with ESMTPSA id r15-20020a5d694f000000b0033ec6a1b37esm9535795wrw.8.2024.03.18.03.28.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 18 Mar 2024 03:28:13 -0700 (PDT) Message-ID: <021e9e51-53d4-4cad-910a-56a0c431a9ef@gmail.com> Date: Mon, 18 Mar 2024 11:28:11 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: swupdate@googlegroups.com, Stefano Babic Content-Language: en-US, fr From: Mathieu MEGE Subject: [swupdate] Delta update - Issue with squashfs image source X-Original-Sender: mege.mathieu@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=LI5TVUs6; spf=pass (google.com: domain of mege.mathieu@gmail.com designates 2a00:1450:4864:20::32c as permitted sender) smtp.mailfrom=mege.mathieu@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.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: , Hi Stefano, I am currently facing an issue with squahfs images and the delta update handler. The situation is: * Two raw partitions (p1 and p2) on my target with a squahfs image inside * Try to update p2 with p1 as source * p1 is already mounted * I configured the source size as "detect" in my configuration, as I can't be sure of it before update (very useful option) (Suppose to update A/B RO rootfs embedded system type) The delta handler tries to "mount" the "source" in order to found the image size. Used later to compute the zck index ... > Here the problem comes. System refuse to mount again p1 on a tmp directory (default rw mode) while it is already mounted in ro mode. In fact, everything works like a charm if we call `mount` with `ST_READONLY` flag option. Which is a good thing in all cases (any type of image) here. diff --git a/handlers/delta_handler.c b/handlers/delta_handler.c index a5f29148..3b9a7a45 100644 --- a/handlers/delta_handler.c +++ b/handlers/delta_handler.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -931,7 +932,7 @@static int install_delta(struct img_type *img, if (filesystem) { char* DATADST_DIR; if (asprintf(&DATADST_DIR, "%s%s", get_tmpdir(), DATADST_DIR_SUFFIX) != -1) { - if (!swupdate_mount(priv->srcdev, DATADST_DIR, filesystem)) { + if (!mount(priv->srcdev, DATADST_DIR, filesystem, ST_RDONLY, NULL)) { struct statvfs vfs; if (!statvfs(DATADST_DIR, &vfs)) { TRACE("Detected filesystem %s, block size : %lu, %lu blocks = %lu size",