From patchwork Fri Jul 5 06:54:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dominique Martinet X-Patchwork-Id: 1957128 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=RUDtxnCS; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::43c; helo=mail-pf1-x43c.google.com; envelope-from=swupdate+bncbcwivbv7sugrbnvrt22amgqeqx7plta@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-pf1-x43c.google.com (mail-pf1-x43c.google.com [IPv6:2607:f8b0:4864:20::43c]) (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 4WFkls46z6z1xql for ; Fri, 5 Jul 2024 16:54:49 +1000 (AEST) Received: by mail-pf1-x43c.google.com with SMTP id d2e1a72fcca58-70af548db1esf1127818b3a.0 for ; Thu, 04 Jul 2024 23:54:49 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720162487; cv=pass; d=google.com; s=arc-20160816; b=q/OPw5d98BGPGg6BawIDDJy0Uv9LCno/wD+2L6Vdk/4jgeNVwZLjm6vNGxnV90j50z geXr0gwbcX46OjtRHb/cz7/4yJa/Yv8Y69+Gug/pevGCvNP0IxOwDYPCkp/QYlnfrCir D+sb+Z3TDDbWhwOW+EGixhBspkoSxvQUTYgCQBlalvIdprPNO7tHM6NVZdufnJP/w+9V vONQGc6VEEBoeruPCE4z52JIZrekxDYmMdqv27tGcLfzk2vJ8VhSoNIZEtb/wU2SjMf6 FpAScwPdDcqyDQx5HUreud2V+jm6qQS7jGVoGyDGrSj3/DCjR/D3az0aDNVZ7WS0Lr9b vpMw== 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=ZtMKKGTRuMhDm2FXfFTT4N5hwBMMa+c8I3LZT2m9YBE=; fh=YUfoV18q0FID5OrymrdDDQhiEhLDfyMrOXaEYnuMTWo=; b=bld1MfueL7fxqSuHw+fFA7yi+njiSBMbfAgWz/pWGOQd4Ub/g5nnYQiBS1Cri4b4Ng HpkpyIhVTDjgmQeHB+hwArrcb5oylt8Igx3LsYMV/MgNJAyq0W6nJkn8aqZVLXi3V/6I GeN+HTPR6EMFGZF3nFaZYA8+dow6H3uZMw+hkmmjA7kaL6K2mD+JqYMU+utvHjg25Nzw +rlv359/QZaOgKU4E13SDRo5fKfxzl/tVKTR0Wtu+22VsVO6JcZN5Jytw98ABjpGr5pU lylIFsJidfwNZV7C6LSDyVu+VpHDW/0Gx7dtwV9kJzVyDbjrj+u8Brka+NrPyjOK1Qhh rh8w==; darn=patchwork.ozlabs.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@atmark-techno.com header.s=gw2_bookworm header.b="huj+ei/M"; dkim=pass header.i=@atmark-techno.com header.s=google header.b=LQWcg58X; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=atmark-techno.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1720162487; x=1720767287; 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=ZtMKKGTRuMhDm2FXfFTT4N5hwBMMa+c8I3LZT2m9YBE=; b=RUDtxnCSoUjYr5sgZP4xAjHgGrTZ0RMkRlvtBWZGY9+2jzj6Ea8ijZ2bkA6pAdeM+2 /LVl2q0X+vxgWzXqGfzCMSA5P+zBjghxdN5a/jI0cN0Eo+4r0Yr0BoUAOwlBFvPclKMr 91shkf7Yw6fDzTAjOsTvq2iDXx4RA5yRKOJ8NPswoqbpuxTbvqfG5X5NcSTBlmpUdYlF Wf2TGsbQUm2xGyAwV37THn7bBLFr0C5chpohVYZacoUyPBGbtvT0H2eGv9ChF5CalWCC zJtml01wvIiTxsP+R7lH2Z5WnojEnxdTtpAHm1jWm/m5pueyz4+FjPKHUAjbgpaNno/5 U1+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720162487; x=1720767287; 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=ZtMKKGTRuMhDm2FXfFTT4N5hwBMMa+c8I3LZT2m9YBE=; b=jlwhDVzXmRXyjaBPndoywRMU6tUR2hkq45NUmXp1vIDC5EzmPbUrAsdHL7wdbbkosJ +uBXgxazBZr54Q1kKznRpM8R8xfs1iJ7wVkVu8ddH8YhwZiZkLEHUgmEragw6wUpHIcH 8S9bJTzUHyM9G9X867B6eS4Oe080rcegnIedpH9yK9Bgq84NGB7xZiTh3/P/hqTY8p6q Y6RTwQgzIikz/YAiNMlypGYdYU2rPD3vDEmg2B4LErSjdO/Z1Wi/If7PgOCdDyGMzUuL b0HGjH7MUI2U33OvMQS1llJQfCsxj9wMrBjWdz8D61yovmWkZXiQQvBvlpZNLSShdYBa QbtA== Sender: swupdate@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWyFJcbU71i3SCQ/+diKOAbUFynfLm0yFZBCxABpeI1e/uooSKrL6DlghiFL4+jG31x8U1vrMtvJL+a0JSF8NNUSD2HDAEt9wvPPRkSFw== X-Gm-Message-State: AOJu0Yy5DujHELc/sAJA14U7ANISJak4SDMJXSgUloeDehLhiOcxY9lz pXSYtm+XUq6K4Jw8mS8uBAYzTEyu0PmCKNTQK33P5fr44YyxouEl X-Google-Smtp-Source: AGHT+IGbXFQIQ1s27W/7c4mevTZyUqZCgYh+B3J8A9ZwP8zWrqEAf3d44oeAUsI8adPRl5YwEdwv6g== X-Received: by 2002:a05:6a00:a27:b0:706:1ff1:c5ff with SMTP id d2e1a72fcca58-70b019a5101mr4466495b3a.1.1720162486984; Thu, 04 Jul 2024 23:54:46 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6a00:3c8c:b0:706:6f90:b0fa with SMTP id d2e1a72fcca58-70aff00160els1153865b3a.2.-pod-prod-00-us; Thu, 04 Jul 2024 23:54:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXraVAXbCyr3gKZVlLHlQvW8h/OtKyDpYsnrbdCj7sx695uqLDIrVCjVVwv4gFBn6DjVCQ88eit7/milFAbbTdOUrN9BG3T1eAK X-Received: by 2002:a05:6a20:a11d:b0:1bd:2547:71cd with SMTP id adf61e73a8af0-1c0cd19926fmr5041442637.10.1720162485269; Thu, 04 Jul 2024 23:54:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720162485; cv=none; d=google.com; s=arc-20160816; b=E0sWi3EnR8d6ddIGQjx6NWbaaxBfaXeo/LhI8JGxX0Tyj9AM00Yp/a3i/UySxANxid VL9AvJZ5+pCUCztn64M68l9AdIt4Af8jowZ9PQ2fokq7UmCxo/r/9FNz/5mm3ohnly15 37fa8HYXReMVgGgzAwSHU5l5GCQqzSvRVulNv8SA4vEpxHc36Avtarw+DQ2Cyz2KXRPE zPq6hMuHWFsXccbkttLDeENM7VXIuAfMWScCy8hCxUC1xlxgHSZ/WpcBf16Yttcn7/SZ NMTZb8Kp4l1i1DOhp9GEqcdy31yD3LK4VTEJUzyGcJt4BeOSOi+9hDh8z6eACm+/PwT8 KiUg== 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:dkim-signature; bh=npaLbyIwlsBXB39bX1bgOjZ5RRn7xXQwdH/B3dp9wEc=; fh=pjPBNcNQ/AYb1s50UL3nUE3XbLwPzlW1bKXB3utLwnY=; b=FDQqTl6jEPmrczKwg5yvr3GC1AaxG5JLmc5IaMshRbzVRFVUNIaBjGIn2xLiQm6/+/ bvLcbW6/cyLESLGg9DOLcXvFJMWFu8mECwqAdm5f8jpKqehNLtpnpwNXWL1zA3a0e0cM xYBiijOx0+fcDcKloOB+AbHLLGpKgclTEdNP8tfhQEXXF47FO4f1UIiG/RYpzqtsphKE HW9tNmcr3/BflILkza0QqChPQdeek8M/VQcgFELbhl48M5339TbOCKxR54E0yxaaFWxX mBdDtmWk6jurlobY3gpywg8pJXlUCspLmBiZdaYByjrKwhBmEiKRIRU56HPiX2sEMIG9 T4zQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@atmark-techno.com header.s=gw2_bookworm header.b="huj+ei/M"; dkim=pass header.i=@atmark-techno.com header.s=google header.b=LQWcg58X; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=atmark-techno.com Received: from gw2.atmark-techno.com (gw2.atmark-techno.com. [35.74.137.57]) by gmr-mx.google.com with ESMTPS id 41be03b00d2f7-72c6a8df9f9si699540a12.2.2024.07.04.23.54.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jul 2024 23:54:45 -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 B717047D for ; Fri, 5 Jul 2024 15:54:43 +0900 (JST) Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by gw2.atmark-techno.com (Postfix) with ESMTPS id 561DE372 for ; Fri, 5 Jul 2024 15:54:43 +0900 (JST) Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-70af7dc9780so1177803b3a.1 for ; Thu, 04 Jul 2024 23:54:43 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCXpuedJ5lmew/HhhWalBsSZkL2uTGYFy5smZBNwZnpeHbnclX9nGLmksdPlX5LjtH0wxMcqwVbM21pa/+U+5K1VD9POb1h+NTXu X-Received: by 2002:a05:6a00:6514:b0:704:3580:8e16 with SMTP id d2e1a72fcca58-70b01bdd3dbmr4635951b3a.17.1720162482311; Thu, 04 Jul 2024 23:54:42 -0700 (PDT) X-Received: by 2002:a05:6a00:6514:b0:704:3580:8e16 with SMTP id d2e1a72fcca58-70b01bdd3dbmr4635933b3a.17.1720162481886; Thu, 04 Jul 2024 23:54:41 -0700 (PDT) Received: from pc-0182.atmarktech (117.209.187.35.bc.googleusercontent.com. [35.187.209.117]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b09ea7c63sm1189046b3a.168.2024.07.04.23.54.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jul 2024 23:54:41 -0700 (PDT) Received: from [::1] (helo=pc-0182.atmark.tech) by pc-0182.atmarktech with esmtp (Exim 4.96) (envelope-from ) id 1sPcq8-00F8cO-1t; Fri, 05 Jul 2024 15:54:40 +0900 From: Dominique Martinet To: stefano.babic@swupdate.org, swupdate@googlegroups.com Cc: Dominique Martinet , James Hilliard Subject: [swupdate] [PATCH 1/5] hawkbit: fix process notification not sending logs Date: Fri, 5 Jul 2024 15:54:30 +0900 Message-Id: <20240705065434.3608030-2-dominique.martinet@atmark-techno.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240705065434.3608030-1-dominique.martinet@atmark-techno.com> References: <20240705065434.3608030-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; dkim=pass header.i=@atmark-techno.com header.s=gw2_bookworm header.b="huj+ei/M"; dkim=pass header.i=@atmark-techno.com header.s=google header.b=LQWcg58X; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=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: , ipc_get_status_timeout() returns the size of the message on success, but ipc_get_status() returns 0 in this case (both return a negative value on error) Changing the function to use ipc_get_status() didn't update the return value check: fix this, and also properly check for errors. Also remove obsolete comment describing the return value. Reported-by: James Hilliard Fixes: da48265ad29f ("suricatta process notification: improve ipc_get_status scheduling") Signed-off-by: Dominique Martinet --- suricatta/server_hawkbit.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/suricatta/server_hawkbit.c b/suricatta/server_hawkbit.c index 9c3e97418361..26260b6bd5e0 100644 --- a/suricatta/server_hawkbit.c +++ b/suricatta/server_hawkbit.c @@ -1003,7 +1003,12 @@ static void *process_notification_thread(void *data) bool data_avail = false; int ret = ipc_get_status(&msg); - data_avail = ret > 0 && (strlen(msg.data.status.desc) != 0); + if (ret < 0) { + ERROR("Error getting status, stopping notification thread"); + stop = true;; + } else { + data_avail = (strlen(msg.data.status.desc) != 0); + } /* * Mutex used to synchronize end of the thread @@ -1017,12 +1022,6 @@ static void *process_notification_thread(void *data) if (data_avail && msg.data.status.current == PROGRESS) continue; - /* - * If there is a message - * ret > 0: data available - * ret == 0: TIMEOUT, no more messages - * ret < 0 : ERROR, exit - */ if (data_avail && numdetails < MAX_DETAILS) { for (int c = 0; c < strlen(msg.data.status.desc); c++) { switch (msg.data.status.desc[c]) { From patchwork Fri Jul 5 06:54:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dominique Martinet X-Patchwork-Id: 1957130 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=QKMgFadA; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::f3c; helo=mail-qv1-xf3c.google.com; envelope-from=swupdate+bncbcwivbv7sugrbonrt22amgqeiabk2dy@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-qv1-xf3c.google.com (mail-qv1-xf3c.google.com [IPv6:2607:f8b0:4864:20::f3c]) (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 4WFklw3G6zz1xr0 for ; Fri, 5 Jul 2024 16:54:52 +1000 (AEST) Received: by mail-qv1-xf3c.google.com with SMTP id 6a1803df08f44-6b5ebf8a8f3sf17451236d6.3 for ; Thu, 04 Jul 2024 23:54:52 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720162490; cv=pass; d=google.com; s=arc-20160816; b=SQalTt9OShRgnutoL5y8xgevmyrSsXvGCoZpIWtV4RnY5p4nXEacQNMeiS5u46luIX NJkFnTMHBSTc4u9Bqhbgc3jAJc1WdxJaxabO5rIvdfUz1ugQKNk9B/dW0uap9ByfN1j9 06gTlPK7lLUHHrmCeGMyo7ScvZiecMRxyfViT0CC4/g1KUO0/CPaPMLbVL2XxLNtpnco /Bf6+b96/X3nfTY/Or4gB9GVcX5z6lZLll2j+9Y07G6WXh42QwTKaaGdAju5VYDvsAYZ Jbq6u8vhf7JSCk7/iLEy6azPDy0YeTuGC5FNVe4MtbqTjETqpmi7aUdeWFtNLjscolZ4 y5Yg== 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=+At9LjHaD0WW5CtUCSClsUtPdm0wbNJX3efT6gxgbYs=; fh=VkblWxYYZcuD2+TfvKVyYWyFFcNJnhNC69K6zucvXo0=; b=SxD7JZMBZyJBw+zuCzE5265j2fhZvqfG4t88BBpizqxb3D3thkWBT8+b3hrDOaNDd+ quSRWbtv2FhI7NDr6Q+ateZjurovkvUA1r6FXebs8dZckf0ge7svrJgxHQ7FhSkp4SnS k0QYcT8hJwtf7ndCcKSTF/+MlFyFVCl7PbTS++bnMkCaHoqpsidP0652L5Ptrcx2tl5S HLPrwq9Bbq2+wNG8Ga+WQfG2XlrIEE3hICc3645V/K4blW6fuvP8EgNrTPuIspWmvZbn 4HC4FftSU169pKve0+gVu6crUgqyGsj2sUgNlYL0cG/M6AItJ4JqnOfxflKINYA7wKWf oeAQ==; darn=patchwork.ozlabs.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@atmark-techno.com header.s=gw2_bookworm header.b=EwF9Oa72; dkim=pass header.i=@atmark-techno.com header.s=google header.b=RvaqKZgE; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=atmark-techno.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1720162490; x=1720767290; 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=+At9LjHaD0WW5CtUCSClsUtPdm0wbNJX3efT6gxgbYs=; b=QKMgFadAz3NRjVshV5XdP3sK8O/zhhO4eJJEKH3A3/TWUKeMlgwxvvTFp+zJaOWrjA lbsPXfhsK9lU9s+kbqo/Mke4x+5XGj2YaDwKHnsZgEEPEEd06bSBrIyzAEr1Q+MVt/cB XdVVnTeFZR2AT+ssrMCwC8ObNUvuDVAoKqBa11+cdxb9Ekz80Wc0X4As64HJBD6hn4Dd ibE+qvZmRJxWVHuaN3je3wddDcgp2RAs2bvgjUAad9s5ILJ2SWiZT1lp61j60zbvz7B0 a4eh41DpNaltUTeQpufrxAntc3aFxJhdnAxd0ll4hWffZjjsesfzWkBri9CwgAuLZTFl eD7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720162490; x=1720767290; 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=+At9LjHaD0WW5CtUCSClsUtPdm0wbNJX3efT6gxgbYs=; b=pViCKSlQwRdD4CB1U43XHS8uKVcjfoLDXJvrobwUIIlqzgycTdHTioG1mAbT0g7WBm Dye/wvoBaQ0H4otJjmuDfGz/dRswMjuzfpUjrc6n9OsGqPkKF/VUbIWP6hLxUe0SDCkr XC2JDtTtR8k5iNO0dBa/qjN3kQAiYJLFi/JyhyJPDRPQjIbtOXu3MD9OyorZjEr9jjDb Qb+gf7Vx48AxLHedIxPSMasZyGWSN4UXKTiZHKNwRTQPy/Pu4gKXGl+h6DEcH4QoPpUU s0k7py8l4AaH9bYh55wsNrGYOpsARwZGIkRbnoRy2QMPK3+fzM3qfmHw4NDcOZQ5CQAg lHpQ== Sender: swupdate@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWLUM2tqXsa+bGesoKQgBV0VDFW+MYmhIP7Zi6469uDALd4x2MNYMMLqAOEr4GO7Tu7ar66czp+e6wt8wCRK6KcdljPs0v5vZjAdm2U2g== X-Gm-Message-State: AOJu0Yy/iVdG0cXnV7Nov9h6dpDdFkp1EEv+3bM//hAEXJkWmiDjLXG7 nmpOxC/INoWH6r92pDamj40LgYXsOnEhKBRjWbTTJFYBFXXGKk32 X-Google-Smtp-Source: AGHT+IEwQqfR8Bxs99cnFMlIsarEFh0Q21UILJOtlI5n5VBgA/NcnffXENhok+vIq6CBQekaWHIVDQ== X-Received: by 2002:a05:6214:c84:b0:6b5:e665:7f7 with SMTP id 6a1803df08f44-6b5ecf8ed45mr39161096d6.9.1720162489773; Thu, 04 Jul 2024 23:54:49 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6214:5189:b0:6ab:8f81:8496 with SMTP id 6a1803df08f44-6b5ea7f4516ls19061576d6.2.-pod-prod-01-us; Thu, 04 Jul 2024 23:54:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVUHZEtn2bSbEIsawS5grD29jFMPji4fQpuPCFmwZzq0g9y4Bv9rwHNDv72vCvJPv7GCHotZYXsEcpZuKaObuP6qA74S6BNR7NS X-Received: by 2002:a05:6214:226b:b0:6b5:655b:99be with SMTP id 6a1803df08f44-6b5ed03fb0cmr44368146d6.43.1720162488626; Thu, 04 Jul 2024 23:54:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720162488; cv=none; d=google.com; s=arc-20160816; b=iXf7NKnoZyFQbY7M5Wl9BK0TgZ8NhXAOqA+TJdAdfEoCXxxI/oF7wMq44D4hJj9BWk JfHrJ3PQ9cdKE2PFPK/duWsEU6Vq1Pp86KGnXKJAa0ECA6aRXXK3v7nkp2MBcEIFrMad fHpS7Eiy7RjqpZ0ecL3qzlqOj/EWB7d20l2B3p3rCtAJSfjAKw23mCFWvlZZbvULL4hW dhko16VhjGliU5Hv5RXL9QoZwIIqSrH6movvRk1lLglsL0CNffkTOBYdE3aCt0rbp89y M20aPhs2Qkp4Yj/uJJtY8hd69XMQ6ou2PFa4QVZW8GOMdxpGT4cpAwGwnLgm1eTZ7JJl I3Vg== 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:dkim-signature; bh=wZdWroxtdEJhdLlLlpjDSjk02E+Tkfd3qYC/sYk08uw=; fh=ZBGXGsBLpJh5ScVbXUfrQqBXPCosxA39YywO1L2sf8c=; b=xaacVZ6vLPSzf4w7aboGyyc3JdkdcKkThTFY1q7UD77ZbOqoRdWhanPdk37cqxy81x jhLW8k3Q1l9+vHToxVhllrd2y79G1vnX92pHiC5y+cWKv/3LcPmOcj6ti98K7I8VWm3s n/dTnGrsXUv/hgWru30/vz/KD1xuH/6/hyoOog52g8v9XoMhAqlakSkb+UryN9b3FaLv mliQ9Q32tvkq9kMr3yUTJL5DRgHzjZEdX+Z2cPsQ9+yJ7GdW3vyf17wOt4XFFZbD/ekh JJNaRbH4O42ESNZeRC/kBwh/34AEUiH/A5L7nfOU4E0BsCqLzfNpj/1zpFdkeDsiJBpJ b/aA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@atmark-techno.com header.s=gw2_bookworm header.b=EwF9Oa72; dkim=pass header.i=@atmark-techno.com header.s=google header.b=RvaqKZgE; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=atmark-techno.com Received: from gw2.atmark-techno.com (gw2.atmark-techno.com. [35.74.137.57]) by gmr-mx.google.com with ESMTPS id 6a1803df08f44-6b5ddfe5436si2823576d6.4.2024.07.04.23.54.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jul 2024 23:54:48 -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 1C7A49B5 for ; Fri, 5 Jul 2024 15:54:46 +0900 (JST) Received: from mail-oi1-f199.google.com (mail-oi1-f199.google.com [209.85.167.199]) by gw2.atmark-techno.com (Postfix) with ESMTPS id D14B4A22 for ; Fri, 5 Jul 2024 15:54:44 +0900 (JST) Received: by mail-oi1-f199.google.com with SMTP id 5614622812f47-3d9196425fdso612135b6e.2 for ; Thu, 04 Jul 2024 23:54:44 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCVLLSvEqnBxMXxXOHrSPuhld0xA9f6F0CEUMTmls15SnLkmwAnrK0Ln1VvRz+kW1r6rnw1QGmFsRn4pzG1+MyMkIRuJcC2F/Pqx X-Received: by 2002:a05:6808:1391:b0:3d5:5fbe:b2fa with SMTP id 5614622812f47-3d914c9820cmr3770994b6e.35.1720162483467; Thu, 04 Jul 2024 23:54:43 -0700 (PDT) X-Received: by 2002:a05:6808:1391:b0:3d5:5fbe:b2fa with SMTP id 5614622812f47-3d914c9820cmr3770980b6e.35.1720162483034; Thu, 04 Jul 2024 23:54:43 -0700 (PDT) Received: from pc-0182.atmarktech (103.131.189.35.bc.googleusercontent.com. [35.189.131.103]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7080498a3besm13295907b3a.196.2024.07.04.23.54.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jul 2024 23:54:42 -0700 (PDT) Received: from [::1] (helo=pc-0182.atmark.tech) by pc-0182.atmarktech with esmtp (Exim 4.96) (envelope-from ) id 1sPcq9-00F8cO-0x; Fri, 05 Jul 2024 15:54:41 +0900 From: Dominique Martinet To: stefano.babic@swupdate.org, swupdate@googlegroups.com Cc: Dominique Martinet Subject: [swupdate] [PATCH 2/5] swupdate_vars: check namespace init worked Date: Fri, 5 Jul 2024 15:54:31 +0900 Message-Id: <20240705065434.3608030-3-dominique.martinet@atmark-techno.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240705065434.3608030-1-dominique.martinet@atmark-techno.com> References: <20240705065434.3608030-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; dkim=pass header.i=@atmark-techno.com header.s=gw2_bookworm header.b=EwF9Oa72; dkim=pass header.i=@atmark-techno.com header.s=google header.b=RvaqKZgE; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=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: , if the fw_env config didn't contain the requested namespace (or config was invalid) then libuboot_get_namespace() will fail and that will segfault swupdate This is an admin error so not a critical bug, but might as well check and print an error. Signed-off-by: Dominique Martinet Acked-by: Stefano Babic --- core/swupdate_vars.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/swupdate_vars.c b/core/swupdate_vars.c index f1e536a845be..081e6097e1e2 100644 --- a/core/swupdate_vars.c +++ b/core/swupdate_vars.c @@ -47,6 +47,10 @@ int swupdate_vars_initialize(struct uboot_ctx **ctx, const char *namespace) } *ctx = libuboot_get_namespace(*ctx, namespace); + if (!*ctx) { + ERROR("Cannot get namespace %s from %s", namespace, get_fwenv_config()); + return -EINVAL; + } if (libuboot_open(*ctx) < 0) { WARN("Cannot read environment, maybe still empty ?"); From patchwork Fri Jul 5 06:54:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dominique Martinet X-Patchwork-Id: 1957132 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=qKOGueYN; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::238; helo=mail-lj1-x238.google.com; envelope-from=swupdate+bncbcwivbv7sugrbonrt22amgqeiabk2dy@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-lj1-x238.google.com (mail-lj1-x238.google.com [IPv6:2a00:1450:4864:20::238]) (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 4WFklx6zK7z1xql for ; Fri, 5 Jul 2024 16:54:53 +1000 (AEST) Received: by mail-lj1-x238.google.com with SMTP id 38308e7fff4ca-2ee9260658csf7900991fa.0 for ; Thu, 04 Jul 2024 23:54:53 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720162490; cv=pass; d=google.com; s=arc-20160816; b=saqMDDUO2Tq0D30DCykOXA5cRZEye/EE+ApwDZ8d5HnqIfajlyRMRxvQ9+AJ/uAZd1 5+C4GJzMAVrEywb1eZhek3M2XuEhTbi6Ds8B7d1ARmZ8NeEU8GdmhgZjs/odUBoZRDOW QyyEEgLVeeINP9k4AJoTFvLQxE8aawQKHmpolCIuaOR5uLZIdx3M2MCJtdqfbsBBV1UF LxtbeQJ6fUgmmyUqhkYj+BLtjUTOX9waE+v7pO5F/N9YpWn335leP+KqB8bFoirL6+sn YzDMIQsZ60rHfb9pabtbaEGiJH+bis/BpWIgXRq23XvbLNYirIiZYB/zImXkDxx9Q2Cb y1hw== 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=gHtikeUkz04qaGyspLWiDrg9X41RxsedlNlgib7lAV8=; fh=xsQ7DDTrFODeOa6cWwE5ZT+tU1PfGlV73Fv+SOu/RSE=; b=NOzbIHrEBisyPL0cH64uEbZFjHI5rcORplGM/SAsk6Lj0kkOKpAjsuI5Gf7OFv5r5C 9FQG4ruom2BJ8Y5Daz9kryuToWv8/zD7yO5IT2cOskpO3iTLgg19Q4U+wP3P3V8lqlq8 Ki9B8vS7xS4osJC8FlGf2ck6ineGDdic7+prXfSc3G/Vdi/RfEYZfhAETqsxDQsX1FCP +9hgC5bD9D08dQIB19CdULW8rO5H4CNOQZ0YhpwMoOXjdMtu+IzZekVgTPvTvZBBUNXS RgyxIqzWlhB+4U/WAkYGWSgds5z9qGPrFQdlr04TfcYUT4PdkhhRem7ah5nSac4DWQZm m1QQ==; darn=patchwork.ozlabs.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@atmark-techno.com header.s=gw2_bookworm header.b=SYWW4zJ0; dkim=pass header.i=@atmark-techno.com header.s=google header.b=Qc+92ykO; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=atmark-techno.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1720162490; x=1720767290; 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=gHtikeUkz04qaGyspLWiDrg9X41RxsedlNlgib7lAV8=; b=qKOGueYNjWSwyF5ODAM1Vtq87T+EaDXkDOBez17qmeL6q6oq7xfLIYOuAf3Z8lmDvg nqP12hL+g+NaYTRaGX8Q7yAnUibiUOdZQFTLJJc1aST28zrbNvn+tDCBPvWomaxmtyw8 HLm01mG5F4Rq1mr3DgywUFU1FpGT0x8rXj9GxOCh5iwLUbDrCJO7ULWgM1pfUM5AwDXN /jfXWWZsNrMWSTL2KomOyJ9VtZpkF1zsdlNWgXa85+hf3FBNYgo8fH7D0L7gvJMqX0Hq JZtb4uawmB9nrANcWQFcB+ugXQFncjopuKM5oP67X/4Zr0bZcA/TvLcV/WUnBc7gPYLf c6ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720162490; x=1720767290; 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=gHtikeUkz04qaGyspLWiDrg9X41RxsedlNlgib7lAV8=; b=CAUUqunjAkLPgloBsd3onscxebIOkdy4GakPScu+RrmueBKs35LVO46Uew4EwjGzdX A2eXXh1nZi8OXceCbxODcmZowpL+rmzKx/I2lZynseGepR+aVinsBMso/UUxjcIcUhPC nj0nlOUdQUVXgGJyiMohLPhflJVuJRk1RrI/MkBN6rk64SYYg9JHp9K4RVzl+Lnss5Io hJqKaHbZtBXbx75cwHzfRr4+Zc7LKSBSD5FoU6lJ9CwZUy4WmvIjjuJGrnOO55aR4frt qPNljZYfgkLSjRgWFJJfMSUez0bd5PRhvElBLl/ROz4zgZ+NNR9xm/uh32SUglC7lbEJ bbLw== Sender: swupdate@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCW1jU9JN03Y3rMt9nlb9LIrOzUTDQh6IB4huvEg3FjAMD4Gp928AuigXaEpD2zI4u84ldJ4JWywtS6jNZW8M8z44yTFpv6EePBLxs1mww== X-Gm-Message-State: AOJu0YxYIwVi/zhxKkYcU4W3E3u3ZvLBS2TmX8Y8bmcleMquKy+NTvWI +bImo5iaeElVKhc9rSBRKCAtEXjOCZBQrz2GDrCrTBeGvEMiGKEj X-Google-Smtp-Source: AGHT+IH04Fgc9FbsozUHussN8hfbY3yrt0exWXQB7nzadNqyzs+k9jZewLDL2XgqWgwT7XLr8LfW7A== X-Received: by 2002:a2e:9f14:0:b0:2ec:53fb:39cb with SMTP id 38308e7fff4ca-2ee8ed6304cmr26366101fa.6.1720162489767; Thu, 04 Jul 2024 23:54:49 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a17:90a:6d66:b0:2c9:618a:5192 with SMTP id 98e67ed59e1d1-2c998e733e0ls677244a91.0.-pod-prod-04-us; Thu, 04 Jul 2024 23:54:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXhIlV3sRVRfjiC+4TgdL7qcc+khMgjoQ4wd9uKPuK0OEm/OSXs5ecYJZc338VPGrTk+jlaBbDThnuy2VMaOmNAqy8X2Zq+elmS X-Received: by 2002:a17:90a:bd87:b0:2c9:76e7:a408 with SMTP id 98e67ed59e1d1-2c99c6b0230mr2535908a91.19.1720162487520; Thu, 04 Jul 2024 23:54:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720162487; cv=none; d=google.com; s=arc-20160816; b=dtO5DFgBAihHwcE59pOdu+mR+peEcXJWfac1dG5FcNAENZEpbkwUX78kja8Q5pemkr mn288il7dU/ak6eh+6pja4mmT/gDRgCPkMTWoUsLJeWgPiZx5viu/VmEAfnCKm+lgc49 t1v/IHClFdHGVVkQ0EPBTiVNPW+x6/SnyucotFDib7/+NjIvyVpO0lJ9PzkZHNts274o gh7Ls5mZ8tfIodMrl/Wg9uFgS6Fm4kmBgulNf+cxnYM7BeZLVqv8O0rgRdeWpDcLU6fu Ar8XoW9ZkKDFeaFTbgT2y6pEbtx4ce0m9i328/VkfvYUvSmorcG6K5skHiKFO1vvGiqL xgsQ== 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:dkim-signature; bh=N8EXrO2lSu/WkTmNw6CYR78LdfVg+tRZ3YQjhDqtpeM=; fh=oBVPZZ/VDzFqGBAidPiATFNfP+Sf3SBUcBXUJakpAkE=; b=FU0jr9+nVAic5kxJOooRbov1tXK6zqrvrFK2fU0ie8cmQrdiJ9YBKUuSHZCg0g0euY W8YbIcb9044s3Nzw94LcOvM4XyP4yzJONgepKsn4lDvhq3u0/K/YHf6p/qvEYhFuOtcT mXgHvHuawk1uFiPrKEvZ/LwJECOhn102eOxzA8Oc5xYMuyBHjrRoriYOcMI7Q4Yn4HuG eQBvj7ZBA/BnurZTUGn4iCd0GPRpzpq8k5Ehn8rHAwmjCbZ7jgtJtsRsQT6vH2Wf5Pz8 GgdW5E0e7CtgDRdzT3KOjk91zC1Mvf7xG+AA/9LVkz+lGRopDg1SdO/jE1nW9YolBeoU jE4g==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@atmark-techno.com header.s=gw2_bookworm header.b=SYWW4zJ0; dkim=pass header.i=@atmark-techno.com header.s=google header.b=Qc+92ykO; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=atmark-techno.com Received: from gw2.atmark-techno.com (gw2.atmark-techno.com. [35.74.137.57]) by gmr-mx.google.com with ESMTPS id 98e67ed59e1d1-2c999e16393si180030a91.1.2024.07.04.23.54.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jul 2024 23:54:47 -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 D11A4975 for ; Fri, 5 Jul 2024 15:54:45 +0900 (JST) Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by gw2.atmark-techno.com (Postfix) with ESMTPS id BD551977 for ; Fri, 5 Jul 2024 15:54:44 +0900 (JST) Received: by mail-pg1-f200.google.com with SMTP id 41be03b00d2f7-75fa4278316so932942a12.3 for ; Thu, 04 Jul 2024 23:54:44 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCXWIOCcjLPVUDFmc61+OMv9Ad+/k3jfxfM1uYaZGBVJ8vYjstDYGrIymK5sDMoJ89nmwb0PLhUI+Uxwvg+NNncxdlwiWgKEQzy5 X-Received: by 2002:a05:6a20:3947:b0:1be:d5e9:b444 with SMTP id adf61e73a8af0-1c0cc66a252mr3931540637.0.1720162483769; Thu, 04 Jul 2024 23:54:43 -0700 (PDT) X-Received: by 2002:a05:6a20:3947:b0:1be:d5e9:b444 with SMTP id adf61e73a8af0-1c0cc66a252mr3931527637.0.1720162483366; Thu, 04 Jul 2024 23:54:43 -0700 (PDT) Received: from pc-0182.atmarktech (117.209.187.35.bc.googleusercontent.com. [35.187.209.117]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fb32d5721asm25268435ad.78.2024.07.04.23.54.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jul 2024 23:54:42 -0700 (PDT) Received: from [::1] (helo=pc-0182.atmark.tech) by pc-0182.atmarktech with esmtp (Exim 4.96) (envelope-from ) id 1sPcq9-00F8cO-2r; Fri, 05 Jul 2024 15:54:41 +0900 From: Dominique Martinet To: stefano.babic@swupdate.org, swupdate@googlegroups.com Cc: Dominique Martinet Subject: [swupdate] [PATCH 3/5] hawkbit: do not reset action_id when getting from env Date: Fri, 5 Jul 2024 15:54:32 +0900 Message-Id: <20240705065434.3608030-4-dominique.martinet@atmark-techno.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240705065434.3608030-1-dominique.martinet@atmark-techno.com> References: <20240705065434.3608030-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; dkim=pass header.i=@atmark-techno.com header.s=gw2_bookworm header.b=SYWW4zJ0; dkim=pass header.i=@atmark-techno.com header.s=google header.b=Qc+92ykO; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=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: , server_handle_initial_state() firsts get an action id from the server and then overrides it with the env value, but there is no check if there had been no env value, sending a request to id -1 to server. The commit that added this reset also added code to only call get_action_id_from_env() if action_id <= 0, so it did not need to reset it: just leave the status quo of using the last value if it wasn't set. Fixes: f3b1e1e26dfb ("hawkbit: check for validity of action_id") Signed-off-by: Dominique Martinet Acked-by: Stefano Babic --- suricatta/server_hawkbit.c | 1 - 1 file changed, 1 deletion(-) diff --git a/suricatta/server_hawkbit.c b/suricatta/server_hawkbit.c index 26260b6bd5e0..2f7562c543db 100644 --- a/suricatta/server_hawkbit.c +++ b/suricatta/server_hawkbit.c @@ -867,7 +867,6 @@ static void get_action_id_from_env(int *action_id) * Get the acction_id that corresponds to the done update if it was * stored. */ - *action_id = -1; char *action_str = swupdate_vars_get("action_id", NULL); if (action_str) { int tmp = ustrtoull(action_str, NULL, 10); From patchwork Fri Jul 5 06:54:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dominique Martinet X-Patchwork-Id: 1957129 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=JwkCLLm/; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::438; helo=mail-pf1-x438.google.com; envelope-from=swupdate+bncbcwivbv7sugrbofrt22amgqeppfq3zq@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-pf1-x438.google.com (mail-pf1-x438.google.com [IPv6:2607:f8b0:4864:20::438]) (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 4WFklw1JTrz1xql for ; Fri, 5 Jul 2024 16:54:52 +1000 (AEST) Received: by mail-pf1-x438.google.com with SMTP id d2e1a72fcca58-70b0a02f2d1sf679294b3a.0 for ; Thu, 04 Jul 2024 23:54:52 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720162490; cv=pass; d=google.com; s=arc-20160816; b=bZbt/otJbK8nbGRHqV7krsevBSSAtNUxFttFcdT+x9FUSQOz+i1ocjb74cRXSBSYNj rOdva7pK98sX/n5+1bnh4yGi3iuYUfjcU/XJOHHyYuXKsu3kAf1uxcDfZZYyj3WXCo6b Pq3BjsPYS5utqNxWllN6R8dmkk5S0vfrIvO7NQJpu4eFLA2S8bNSErrC9tnOUCc92ZY4 phIa1Il4n6Wg0MK9mfvHy8YuQy++9sPwg1NkPxbzK3dsBEEP3N9P1expW+iuilvCvBiY KK048DVwrlUvmxI+qOEgzIpf4+UXorWsdnfjBqgNi1ZHlGJw59WYV2rJItJppthxKsyk SvWw== 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=IWYNM/NKv2tmRmFmjNEdxlqUhrkNqq7Kolpqdg/6Kds=; fh=h+TwLkd+nPlD+onNSC5j2bQqxQHZoZHjY6KsNmD1kkU=; b=i6sCuNKzS7C9Oaq50/xApgXoBCIzLBadYLOvRbWQXHttfWW6Zjr5+86WHfUbNWjEgJ DWeXsWV8efN3nNOi4wvvfCFNinzLJRUabrZucrrAUOBwKGEGCyZ0n0lXQYzMvTMIAqaJ tfP/TbOucV9z5Aj04JSwrBPW5l1VKmMHcNNC73e0hhdEj+iLLsIST/hw5U+3lT9a+A6x zhS9um2TqLH3rMsndATyOhdgYkEX8P4UxtCD/aQYTEN4to+xDfZDbuBlovtLlUP/frTX yWQF8CVYH33kaANZ/mTEdW8xe+T0Sbt6OZmU3waHEzqQQnYiauhIfwnZouHMN2qtMW6K 9RbA==; darn=patchwork.ozlabs.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@atmark-techno.com header.s=gw2_bookworm header.b=hZZ2KBdw; dkim=pass header.i=@atmark-techno.com header.s=google header.b=hmeuWLhC; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=atmark-techno.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1720162490; x=1720767290; 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=IWYNM/NKv2tmRmFmjNEdxlqUhrkNqq7Kolpqdg/6Kds=; b=JwkCLLm/rAHKNgJUzMzyUP4/vjeUUbcMblAJbliUnVu4KWuGspXMTGbb1uakf6yLZf /TQaQe+A1EfEqQeQYrN/xH18Z5ritl1HwHO+1L2+55DGJNvDlwott8+VG7xWboc/5eOO otkk6+MsNwATNf1WFnCl4/Ll9IYpSdq1JI9bjRVw1hERBuWp+sEvBCn9xwX2bvuGEM8W ySPGxwbISa94W9tHnvb1PmK64+Qk1GxYObBjp39Lv6/oyUK6I5C6moBkgW/wIhy7FDyh 2PCHKB0+bxD89WHzED8dQOp/nvABwBPSfoBxDrYXYrXbmjFPk6m2E2MPOklycZd5Pliz Ldbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720162490; x=1720767290; 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=IWYNM/NKv2tmRmFmjNEdxlqUhrkNqq7Kolpqdg/6Kds=; b=hl1fECO40QCSckATrU7esvPWDSVp4WeRgQpfH5iEHZz/Jz/FShDInihxL2ChZcTrSh SENqHz7nQgy4zOwoce1mK38XMnptvuuKu6g6h2MWKVuvukhA9gQrelMkKUauvBb+O38/ Z+8t0aWOIsiAGX9siTv447D86rlyZp9MIpgCAb+fPdjuWHwhVLHW7mdFM8MEl1UIMOGk R2ooGbdvF3BfjJmP4Bus9HGhjpsWQMv/3E012lzl6+dQgzBpBb6ysl1rLdTvzy/WFjxT X48e0UBSCWAKGeofLxhR5C9chzsXi5SyEnRlcTqjXG7+gNFfcRzxMgRR8MMLuOzvVkSX tOOQ== Sender: swupdate@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWojjQvIWy9Q/k/ENjXTxJnzCPJMCJznZ6HaPXjpPUjMc2fqZaaoq9eU7ebGjAZblutu86I46eGqAkwsMBDcEtbOyO7CfJSVInni96kHQ== X-Gm-Message-State: AOJu0YzHphg6e88g/WWcpehWQOn8+H6YVcIx5sIUiFlg+mGZaMuyPkZR aG4afSC4/XIRCXS6br42dBADjVTpQSK0GxEaaViyhNokMorF5Xu3 X-Google-Smtp-Source: AGHT+IF983JnyHPLPgCPRaDS4zX7CkenDyGqpG+egbppC7859YgyfPi3ocvfECoA0xk6MhSWOIkFCw== X-Received: by 2002:a05:6a00:3e15:b0:706:671f:d252 with SMTP id d2e1a72fcca58-70b00ac7834mr3827744b3a.26.1720162489598; Thu, 04 Jul 2024 23:54:49 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6a00:138a:b0:70a:fd97:f05b with SMTP id d2e1a72fcca58-70afef9db5als940574b3a.1.-pod-prod-03-us; Thu, 04 Jul 2024 23:54:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWuv1DeBw66uG0lWpt89JO43HhmYi2TsfG5R65X7FF5AC5A2VwgJ3YFtg1im8cAeyKn2FlUpKaaV6r3lISEhgPOrDL/4qQ0mkMS X-Received: by 2002:a05:6a21:19e:b0:1c0:dd3d:ef3a with SMTP id adf61e73a8af0-1c0dd3defacmr566329637.29.1720162488063; Thu, 04 Jul 2024 23:54:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720162488; cv=none; d=google.com; s=arc-20160816; b=0GtjciJUqCrK9WxZ1gXzaYtfZfBUpsPpvM0PWsSbWGMertWs9ZxLdzG9QY9VNDUyNc lMCTNNZDFtMebsz1R9GQw5pBxT/UxNw9luefvTaX7lIDpJKF3MzpKBBBziKwtlgxBb/q k1tisWUFO4c2b8k5Js3Husop4qAE0GGcquv/1tGL0X/f12VvaBTaVEa97lHYc6Lc1+rn NAMnkz0Jri7rhMcsNyK1uYO5fwEGXMt7gn9mzEAZr1+rCyMw6EbpiYp1rZdlCa32Rmbj lDoIP3z3yiqYE27cHkmpxSX+9xSlWZhzBiuOq8J5Y/z6Qezf6TdZGW29tossMCRLKDL5 cdog== 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:dkim-signature; bh=VZfVL1UDNEkzLojuRJClIjsSBbeOBnaqY7XANOKxAg8=; fh=+B2/d1InL56w78EmNOMGDlM1jn/ImadzaOAwqPUQj+o=; b=ZeUztcb/z3AUyUX4s4dWiifObwDGe6K6VYZ48MNsi8GaL8MzryjJ72xZNspQaLT5LP vd7TFaQoa1B3vxEzC43DRu9t35ub40K2WtEBt3R0QDyQQyhPcv+N99E7cSQJ2V81LuAm 2YaHI90T0FROKN8AGDkd8RTjibmlIBXwMTp+FOyg68bCn9+Sxz+uPTsRpmMWsVZyDhxc x8znWJ08vE0qcyMqSgilZf/igWV8fmDLejM0+w1uM7/IZBdrFIBlqeZN9PPBhEvm26Sl cfvNBXCVQ7xGl+CwDh0XGKQXa+SHaGzCrX6eVw1lOxKfsxzpYZ2cJGiiGI7IcFYORssc C4Dw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@atmark-techno.com header.s=gw2_bookworm header.b=hZZ2KBdw; dkim=pass header.i=@atmark-techno.com header.s=google header.b=hmeuWLhC; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=atmark-techno.com Received: from gw2.atmark-techno.com (gw2.atmark-techno.com. [35.74.137.57]) by gmr-mx.google.com with ESMTPS id d9443c01a7336-1fac131db03si5659945ad.5.2024.07.04.23.54.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jul 2024 23:54:48 -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 48F0747E for ; Fri, 5 Jul 2024 15:54:46 +0900 (JST) Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by gw2.atmark-techno.com (Postfix) with ESMTPS id F215DA6E for ; Fri, 5 Jul 2024 15:54:44 +0900 (JST) Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-70b0294b751so1025723b3a.2 for ; Thu, 04 Jul 2024 23:54:44 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCWH8Nbmyx9kTJydYArPaWHGcMxOy3ydKhk+LhhH4BZtoDRtHKCzp9mRuqg5kEJtMe1JeETU+xuieRQa/gFr5EMRwqzb7aqItVU7 X-Received: by 2002:a05:6a21:3981:b0:1be:c418:7308 with SMTP id adf61e73a8af0-1c0cc8d6f26mr3967213637.58.1720162483939; Thu, 04 Jul 2024 23:54:43 -0700 (PDT) X-Received: by 2002:a05:6a21:3981:b0:1be:c418:7308 with SMTP id adf61e73a8af0-1c0cc8d6f26mr3967197637.58.1720162483608; Thu, 04 Jul 2024 23:54:43 -0700 (PDT) Received: from pc-0182.atmarktech (117.209.187.35.bc.googleusercontent.com. [35.187.209.117]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fb3dbd7dcdsm18715895ad.157.2024.07.04.23.54.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jul 2024 23:54:43 -0700 (PDT) Received: from [::1] (helo=pc-0182.atmark.tech) by pc-0182.atmarktech with esmtp (Exim 4.96) (envelope-from ) id 1sPcqA-00F8cO-0u; Fri, 05 Jul 2024 15:54:42 +0900 From: Dominique Martinet To: stefano.babic@swupdate.org, swupdate@googlegroups.com Cc: Dominique Martinet Subject: [swupdate] [PATCH 4/5] main: free cfgname before exiting Date: Fri, 5 Jul 2024 15:54:33 +0900 Message-Id: <20240705065434.3608030-5-dominique.martinet@atmark-techno.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240705065434.3608030-1-dominique.martinet@atmark-techno.com> References: <20240705065434.3608030-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; dkim=pass header.i=@atmark-techno.com header.s=gw2_bookworm header.b=hZZ2KBdw; dkim=pass header.i=@atmark-techno.com header.s=google header.b=hmeuWLhC; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=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 is not a problem but building with ASAN (CONFIG_EXTRA_CFLAGS and LDFLAGS with -fsanitize=address) prints a warning that this value is not freed every time; there is no harm in freeing it before exiting. Signed-off-by: Dominique Martinet Acked-by: Stefano Babic --- core/swupdate.c | 1 + 1 file changed, 1 insertion(+) diff --git a/core/swupdate.c b/core/swupdate.c index 8d6467b7b688..4f0ad963346e 100644 --- a/core/swupdate.c +++ b/core/swupdate.c @@ -997,5 +997,6 @@ int main(int argc, char **argv) if (!opt_c && !opt_i) pthread_join(network_daemon, NULL); + free(cfgfname); return exit_code; } From patchwork Fri Jul 5 06:54:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dominique Martinet X-Patchwork-Id: 1957131 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=a9b8Bw7J; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::f3e; helo=mail-qv1-xf3e.google.com; envelope-from=swupdate+bncbcwivbv7sugrbonrt22amgqeiabk2dy@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-qv1-xf3e.google.com (mail-qv1-xf3e.google.com [IPv6:2607:f8b0:4864:20::f3e]) (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 4WFklw6tmKz1xql for ; Fri, 5 Jul 2024 16:54:52 +1000 (AEST) Received: by mail-qv1-xf3e.google.com with SMTP id 6a1803df08f44-6b5a5e78dd8sf44562256d6.1 for ; Thu, 04 Jul 2024 23:54:52 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720162490; cv=pass; d=google.com; s=arc-20160816; b=w1rDRsH2z1jeyNoVh7jjSWCUBaQNt5eFYpfl++aTYfdZEg4vmND3o0UoJXZvx8w6Tr HJfpJX4oqXsmTIhDeuqJYBjwHv3v3rpcG00w1Mqf4Ud6c8sMRZZE/leIQMo93PcrWm74 nQPD07Fity0aefkaopygpEHJg4p0jqeSqUQMZpfGJ8cCJIY0VNZGDSpUil0+N1STczBB w5yrKYSY/cq5QnL6bXHKNYiYPD8ucQxfNN22ahasdDSOxBXm5yubZADEkvEgEW3N9rBr 6wqqLB30pUjnFsUWluJfjvSxvAL9szE8GxQ+lVFVVRTFmaSu2qUItcANNUf2PMq25Qvl 9tsw== 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=mDJ7PKWTBpijkOvAsCwpBg96noy4IOv+kdETCShozGw=; fh=SjmYllQYf+8koPNUzQUwBMWhcZRUotapkeCT2NWsbKM=; b=cazHozFKl39pJ5eA3wx1t2K8gRO0JiLADhDWQr5etrxKmXrjfOqppglO1U+zm7+Kv8 PiVb4eJG6nJCwdkI3zrlLh+8eKrM/S5D6mLHNHIXu8kAKD/zTM0+PPixRjd4f6b48HZR ZZIFdb5TcSJN9/lm2p60hgMo/CMUZTMtDIHZ4iE5BTsp3a+MEoj1zzwpTJdHoISnmCP8 pPuMGx31clS1HwBWGetsnRyrNwbLn8WHIlavM11Ic3GJAMXzFPzarGkOG/6Sk6DC+tO3 1nnY5JWpYHZ8lx3JUMlFQbhrt/wXDqbdjZWEGAYv/PJR9JjsgzG0ft/SWR+dH+fAXO2n 9XRQ==; darn=patchwork.ozlabs.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@atmark-techno.com header.s=gw2_bookworm header.b=qJWET4sw; dkim=pass header.i=@atmark-techno.com header.s=google header.b=CrU2U3ck; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=atmark-techno.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1720162490; x=1720767290; 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=mDJ7PKWTBpijkOvAsCwpBg96noy4IOv+kdETCShozGw=; b=a9b8Bw7JHLdcuGOJdKzmMCE3T/iz0rr2PBgupHGAxY5houMpTHhiyF+YU2NN/PipRx Ft6XIOaB+J2a1RcbEB2pQtI9f5NKaIWrm208qolUzpxfFj07yMZ7vzGa6pdDYJcwSJcJ 4mg+yDGXy+BE1MeyD01Rny0XjTTdJ7kHNb+Q9O80ufE5zB6anj9SAVe1f6VG9ctZ5N/F FL/p1LlOBN0r0lUdzZ4OjdATvDG9XUGcfIkP6v+0O2q/mMGkvUqqrml5XixjQXvnVnmy boF72e6GYmKNSVofJqEEHpcEkRgZWwK3tMm4mP2JLhtm95CEqjWPIoVwBtBJtY+Ralk+ qv8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720162490; x=1720767290; 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=mDJ7PKWTBpijkOvAsCwpBg96noy4IOv+kdETCShozGw=; b=ETdBTje/wmsBWD984Si/nZYtBeaCrMsmduLJpxauON19MkQMeje9m39rm/rc3KzKJu 7Yqt20ahNPB7Fv4ZquIbQ6ZT5uad/ERqu58733r3Ify2JJgczimxQcUNTnVV7SO9jzQO qo2JQqm+ETctKsGqAJwOlLG31L3K9SzCqEuQOUkeQnuDZoTFa7bfxdCSSk7+pZ1OYw4Z A9wAo5bMf/eOYp303TN0exdZjapvTMWPLCOV5pNVHwUshDJHrH/FGO3YmiLEVnxmCBJP nVKqOH+F2I8ar962aDEVzHfIEgXmFAwGv3wZd+Lmq44x8QUCNeuV03jDUuvo7XCRapcy soNQ== Sender: swupdate@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCUS0aJs0ipZyk0yLbK8mwHcJxMnYkqqWfK28BRWuNb735NxFDk68ZUwPNcRp0lMwKEyDeIryyQNTQ5ra+nXW/33n1zY2MU6BXF5OZtCvw== X-Gm-Message-State: AOJu0Yx6qZpWsicfhGkQzNCrUNqVJv1ODkhR7VCrx8BakGuG4Emraq71 mqqyy6iBAYKwEeEyvUfJdl+xXXVnToPnkWmRKafjwc34hrUWXAOD X-Google-Smtp-Source: AGHT+IGqz3q7zzx8qUFUR8xFevfLFg8v2cVVG6c5KIzFikhovgq9ItmgmAbglGczTo2/6LiHC8L5Yg== X-Received: by 2002:ad4:5ae6:0:b0:6b5:dfc2:669a with SMTP id 6a1803df08f44-6b5ee53051bmr69294716d6.2.1720162490106; Thu, 04 Jul 2024 23:54:50 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6214:5289:b0:6b2:a43b:dc38 with SMTP id 6a1803df08f44-6b5e9f9f793ls31450826d6.0.-pod-prod-00-us; Thu, 04 Jul 2024 23:54:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWJfYVmbMU63vkOMewnQYhR0dRYfbyRLtuicpfe+mlmE+XyvmIQzUlzeGOSSE+QthKuvijYxnRORcc+RzpWt+j2QSWt4ZEPdwrM X-Received: by 2002:a05:620a:55b4:b0:795:462b:6e70 with SMTP id af79cd13be357-79eef297ebbmr552047785a.2.1720162489011; Thu, 04 Jul 2024 23:54:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720162488; cv=none; d=google.com; s=arc-20160816; b=yHu6JejSv66l3lSIMbeLf7fQDoru8eIxeQvUS0qdXH0u9grGmgZe6/EDPfmjwhdUIm Zj/DEWUzpRr5EleV+ftidqdL1t1wtpVS4KRZX+SYdUkWFPUTZLw6wFS9V9v/pBVRHSvN onxTf6NkmBRqr1w0mhp2Jhzv8iv9EiC8lWgNY3sFOgwbP+TQy+z+fC8cIXsRabzLAbNv FY1P61KgFEcsNZqAZo/rH0Xi2Z338gaypk8moeCD5lQiyITU5CGc2aims2J2v62+IVkg WHec3A91NXbs5DhRjS3f7icqMSm0pZil6jIsyjXMdifHhOvLTpGPiXe8qEd7yV/ev0DY wAUQ== 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:dkim-signature; bh=FV4tS4MmNmTKMMGRabTC9cxE8KsvtWk6vDFFkOYQ4L8=; fh=s4Cqsn5tyRey1KQLISQb07AMkCffPIICYls4SO+XWVo=; b=ogsyhQdrTt6O4Y0E6E4nR8brxEsDvtvipRa6BJtO59KbyPOmUFEs/qYsjRf6Cr4M7j 0UzznD2NxTXpcRTYz6DbxwWQR4iJVatx4OyIRRihlxrP0Xfq+sV8K3zb0L9+/52KAFt3 fsTuWfgQw0nDG4KLep+BF2OFzM9277TOFEyaOhADXjm6+bXOY2gh6vrXA6Z/MOO4qsao NNTzz4LnPReXccFpAZ/z42SnPNZ5PZYsvhNVBgAhhF29RKwiBE2fMqDxF3cEGDzljG4h dZEOT7hjDDTrDJ7bHF1ECUKJ0pnKOZUlMg72J7gl1FRfyhGVRtBsGGuUewYW1UQnMSmk 8qJw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@atmark-techno.com header.s=gw2_bookworm header.b=qJWET4sw; dkim=pass header.i=@atmark-techno.com header.s=google header.b=CrU2U3ck; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=atmark-techno.com Received: from gw2.atmark-techno.com (gw2.atmark-techno.com. [35.74.137.57]) by gmr-mx.google.com with ESMTPS id af79cd13be357-79d6932c62esi68646985a.6.2024.07.04.23.54.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jul 2024 23:54:48 -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 82BDDA6E for ; Fri, 5 Jul 2024 15:54:46 +0900 (JST) Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by gw2.atmark-techno.com (Postfix) with ESMTPS id 7B72C5D8 for ; Fri, 5 Jul 2024 15:54:45 +0900 (JST) Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-2c30144b103so1149609a91.0 for ; Thu, 04 Jul 2024 23:54:45 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCU5LAm0J4sPbyy+P15Mwk3HHn0jmO2VUrQxKz0qJ1TVsdm1ffMDzyeE2FmilIZL6YnYbN58u/qqzZH5S1zcKpWam4FgwOfzDDGH X-Received: by 2002:a17:90a:ca11:b0:2c9:a831:3b7d with SMTP id 98e67ed59e1d1-2c9a8313ca6mr3634120a91.18.1720162484447; Thu, 04 Jul 2024 23:54:44 -0700 (PDT) X-Received: by 2002:a17:90a:ca11:b0:2c9:a831:3b7d with SMTP id 98e67ed59e1d1-2c9a8313ca6mr3634106a91.18.1720162483956; Thu, 04 Jul 2024 23:54:43 -0700 (PDT) Received: from pc-0182.atmarktech (103.131.189.35.bc.googleusercontent.com. [35.189.131.103]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b10293cc9sm450522b3a.21.2024.07.04.23.54.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jul 2024 23:54:43 -0700 (PDT) Received: from [::1] (helo=pc-0182.atmark.tech) by pc-0182.atmarktech with esmtp (Exim 4.96) (envelope-from ) id 1sPcqA-00F8cO-2D; Fri, 05 Jul 2024 15:54:42 +0900 From: Dominique Martinet To: stefano.babic@swupdate.org, swupdate@googlegroups.com Cc: Dominique Martinet Subject: [swupdate] [PATCH 5/5] network_thread DEBUG_IPC: move off the msglock section Date: Fri, 5 Jul 2024 15:54:34 +0900 Message-Id: <20240705065434.3608030-6-dominique.martinet@atmark-techno.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240705065434.3608030-1-dominique.martinet@atmark-techno.com> References: <20240705065434.3608030-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; dkim=pass header.i=@atmark-techno.com header.s=gw2_bookworm header.b=qJWET4sw; dkim=pass header.i=@atmark-techno.com header.s=google header.b=CrU2U3ck; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=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: , logging something can call into network_notifier() through notify(), which will dead lock on msglock if logging while that lock is held That probably isn't used by anyone so we could just remove it, but if we're keeping it it should at least work... Signed-off-by: Dominique Martinet --- That log wasn't even very useful to me -- I'd suggest removing the two small ifdef DEBUG_IPC sections instead if you prefer. core/network_thread.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/network_thread.c b/core/network_thread.c index d7b713fb2154..f664b267d4c5 100644 --- a/core/network_thread.c +++ b/core/network_thread.c @@ -513,13 +513,14 @@ void *network_thread (void *data) nrmsgs--; strncpy(msg.data.status.desc, notification->msg, sizeof(msg.data.status.desc) - 1); -#ifdef DEBUG_IPC - DEBUG("GET STATUS: %s\n", msg.data.status.desc); -#endif msg.data.status.current = notification->status; msg.data.status.error = notification->error; } pthread_mutex_unlock(&msglock); +#ifdef DEBUG_IPC + if (notification) + DEBUG("GET STATUS: %s\n", msg.data.status.desc); +#endif break; case NOTIFY_STREAM: