From patchwork Thu May 13 07:18:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1477935 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::23b; helo=mail-oi1-x23b.google.com; envelope-from=swupdate+bncbcl4hcw73qcbbsnf6ocamgqedfayuda@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=RL1x8JUy; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=JpssntZe; dkim-atps=neutral Received: from mail-oi1-x23b.google.com (mail-oi1-x23b.google.com [IPv6:2607:f8b0:4864:20::23b]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fgjgf4Vwxz9sWH for ; Thu, 13 May 2021 17:18:36 +1000 (AEST) Received: by mail-oi1-x23b.google.com with SMTP id s9-20020acadb090000b0290101bacefaa4sf14135832oig.2 for ; Thu, 13 May 2021 00:18:36 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1620890313; cv=pass; d=google.com; s=arc-20160816; b=vqbN3XpX8ISFp8NS+wOwvAlANDmPjZdMjvmy9a10booEp7mQARR0uOR//D+qVoDzpn WGJ50U1l5WsGIHnaQhXoaYo55pcSr+Ek6mWkG0YUG81KoZiU/O3gkPk60hW6+7AY2ZN/ 5Vvlw5ztUtboyu+sunOMFKPLGe8IsoFjKIBmRspJf9e0KiyrdC4HA4qENQ70bw59g3a3 AAKOrcWVdqk/wvxbj0WTY2Eum1JTruWSzXDAvylazlH0/d+6j8nkRcwFD/VLFTTDbU0V vbSYm10jdB7jVYe4TgE3d6zw+nD1HEfqHuqU3nfoPMhIL/SWlZsjK/qgezDgL2R6gGue RNBw== 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:message-id:date :subject:cc:to:from:sender:dkim-signature:dkim-signature; bh=rk1ycVUJRanAuxRKm5tgBaRn7mBr58l1rwryQdtJfl8=; b=Yj4+iRJlirZFIgMsKCXR/QwMwx/MKvkDrQG99799HbpOenYX/n/taYG9dFxmw6bUrs lpkeamk78lCsEHiXaJidrSVNjdiUEWocABxBOrG8jU7LYO0y05pPEWuc/YPAtgzvcqp+ OBSUFAZXuUVvd27F4pDg+vHAm85iO0iA6f8iUrlCLLiFWGrthr0vd6zzaDEZN5vM0ALb YbINMzJ544G1XoDxM9uV2FLoRHcRdc9Rf2aVOUJS/xfv5i6WEYsvRXsI2lBu4C0VVKHz wNQ16c7H4RE+M1I3G6CoD5s+pVfInLex2xzacDTIu7yb7rPclNL716xz5Z2S0fgE69JN EEWA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=utsi17XG; spf=pass (google.com: domain of james.hilliard1@gmail.com designates 2607:f8b0:4864:20::d32 as permitted sender) smtp.mailfrom=james.hilliard1@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=20161025; h=sender:from:to:cc:subject:date:message-id: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=rk1ycVUJRanAuxRKm5tgBaRn7mBr58l1rwryQdtJfl8=; b=RL1x8JUy8dUqszBf4VJO2IY6wh8uygwlQaPxOCEpFVQeatZttaarfx5w3kzcd549mV dYW5QrNC7txrhLrAun8rWs8CK17m/MB2H+nuKJaiJrFRKzIYEaBKftVMTD09xZjzeyoD tU+110aySwv8wqeFWeSwI+wIoLrLuDWbtoUY1oR0aFfAUZTWQR8yjdD8Sc6ym4wiSb1R 7+OCqoNbUXj4hBNGcsrSl2DxLbCj3RflsjYyjRG/XWcfB+nlBGWxdouSLTXuNR38bt6k NT2GXa3CPNr+OGbG+5KQcXe11NZKYd9pP0j00+lIPXczvvguSsYBdYz5aF8TaapeMdYM tIBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id: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=rk1ycVUJRanAuxRKm5tgBaRn7mBr58l1rwryQdtJfl8=; b=JpssntZeET43S7El4rmnymgES7zRvrW2F0l3+aqYsSOJ2QkYKPIN5sYtbCt5J1vHZJ UFDd8LhRlaXAOvD92eWcCSrDxj8iyn87DV7zUkqya+3+OJWTKNF58HUet4fd1Pk5sKic iu0EGujuVzKTMHAblS84JNldWU7R+gLFF4ru6ZaK1r3kEx475Gg5iN9MTWzS+AmuuZ6V qPORqmW/+dFnsynABTUsNLBPohh9jEk9OZa09E+PkuzTpKD9pQyRZz7v2ogHFQeWbVvH SBL7RMODRgs6TpsfeB4RLweyyL189ON59KRo8sxmlw0REKa1hFPpnUhkcLpgPFRIhBYh jLyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :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=rk1ycVUJRanAuxRKm5tgBaRn7mBr58l1rwryQdtJfl8=; b=XTCqu8/y0S8wT8SmSFcuwTtfifUcogXl9shH5dhiJ35GzUYpXW4diDzEdlR+rLY56k rjDy7HUQ89DKKC799ODNjp3xp7sLdZ/OaRgaj8rVJHBhjIti9kPvsWid4cg6+X/KnX4V ChpO+vfvk1oIkTv64xl+ytPS57zINsXRt0+Ayv7wDc1R626U85ZN7mTL/WjdQyLjTYh9 7mE5rbvcdldGjcGM2iFRZ0ov0WKnkoq2nSSWKikmTmnLIVbUErBS4CbzBSddYdEWjptG rmt5Q/DWIA6xgYnybCZ4dMUIAeoVxmxovRwfkz19XIjOmqLKwstGDlAvAHXgPzx1AbEb YWDQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM533FsjO0XgzC+AtlMpLkWoChvoCo2zW4TmmZuiPzYMyr5udNz3rh pHjmOAlaD9v0nrfJhJGycKQ= X-Google-Smtp-Source: ABdhPJzRGGrsZFV/aBVNgUiskl2jOOcH7RTN39VUQeuwcmTa/BSgGszl1EGLI2n+/mOcEhKnvGRv0w== X-Received: by 2002:a4a:9f45:: with SMTP id d5mr30961884ool.91.1620890313699; Thu, 13 May 2021 00:18:33 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:aca:5c5:: with SMTP id 188ls1339980oif.6.gmail; Thu, 13 May 2021 00:18:33 -0700 (PDT) X-Received: by 2002:aca:f5c7:: with SMTP id t190mr1920105oih.67.1620890313212; Thu, 13 May 2021 00:18:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620890313; cv=none; d=google.com; s=arc-20160816; b=1LGenm3hT8wuQUAgZmFOhkDB/OHfwlxKtFb+qhhbPavEDGois/fn6YRwyMRo+YhplT 110d7EZCdhYkmk7t1KscSKK53xtgfQzNQM/ZUaEOEVFVGw2WmlwNlAInikZ5qF8fy0Lo QUEEzw9cfBsjkryYqLgCRBw1JlWNEznvXeK8iHWSeEHV6bytNxRKyWUfYYSa2gI8y5b5 L8fqe+/MyxiuQ0vL0BoaeyEzirpyDWaWXEHgFYzd+ENGoV7eyYtpc6JFOhpwyTJzmRbc AB3o5rnj+xaM+BbimXvQxh99wVBvWCza4QKa9Jidy2oQLY8WqsJoBePUH0qy2K5CjKBo HMbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=ae/4pkLowuL0P0zXxKHR67uCgpwRqE1qx5qtMkEKR+E=; b=MrqNxE1C+vwf0fEqMFeTGwiZYdttQ1UrKbWkmfAurzQr5WXml5/bAyB/cBLD6CqmM5 +IY9UfPOHg/MIvkOEdIeA5Nb9MxeA9IurF4NGp7qOb2Ssz/PC1isR8d6K53EEQ9/vzbF 7g9+0PsGvhPtroA/4UpPjZvB2hJl4kybXO3XRN/V/r34QR8RkIHvijUF+dNzF7YV67m6 M5GKpu6tBluTQo2gEUQR0n/UTDgaJdeIpdcWyLHn4Lts/F0co1jmb8HLDeWpSdkULdEh PX4upZdkKOJj7+MYewj1bmoKBv3RaBKWXoggAspUWGCR7ILgc4IbPyrhsfczDplDddvn b7yw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=utsi17XG; spf=pass (google.com: domain of james.hilliard1@gmail.com designates 2607:f8b0:4864:20::d32 as permitted sender) smtp.mailfrom=james.hilliard1@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-io1-xd32.google.com (mail-io1-xd32.google.com. [2607:f8b0:4864:20::d32]) by gmr-mx.google.com with ESMTPS id 12si159117oin.2.2021.05.13.00.18.33 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 13 May 2021 00:18:33 -0700 (PDT) Received-SPF: pass (google.com: domain of james.hilliard1@gmail.com designates 2607:f8b0:4864:20::d32 as permitted sender) client-ip=2607:f8b0:4864:20::d32; Received: by mail-io1-xd32.google.com with SMTP id n10so24088833ion.8 for ; Thu, 13 May 2021 00:18:33 -0700 (PDT) X-Received: by 2002:a5d:8c82:: with SMTP id g2mr29375427ion.34.1620890312759; Thu, 13 May 2021 00:18:32 -0700 (PDT) Received: from MacBook-Pro.localdomain ([143.131.13.66]) by smtp.gmail.com with ESMTPSA id c1sm1038182ilm.28.2021.05.13.00.18.32 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 May 2021 00:18:32 -0700 (PDT) From: James Hilliard To: swupdate@googlegroups.com Cc: James Hilliard Subject: [swupdate] [PATCH 1/1] diskpart: check fdisk_create_disklabel return Date: Thu, 13 May 2021 01:18:25 -0600 Message-Id: <20210513071825.84780-1-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Original-Sender: james.hilliard1@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=utsi17XG; spf=pass (google.com: domain of james.hilliard1@gmail.com designates 2607:f8b0:4864:20::d32 as permitted sender) smtp.mailfrom=james.hilliard1@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: , Since fdisk_create_disklabel can fail we should check the return value and exit on failure. Signed-off-by: James Hilliard Reviewed-by: Stefano Babic --- handlers/diskpart_handler.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/handlers/diskpart_handler.c b/handlers/diskpart_handler.c index 65010c1..63a46c6 100644 --- a/handlers/diskpart_handler.c +++ b/handlers/diskpart_handler.c @@ -287,7 +287,11 @@ static int diskpart(struct img_type *img, if (!fdisk_has_label(cxt)) { WARN("%s does not contain a recognized partition table", img->device); - fdisk_create_disklabel(cxt, lbtype); + ret = fdisk_create_disklabel(cxt, lbtype); + if (ret) { + ERROR("Failed to create disk label"); + goto handler_release; + } createtable = true; } else if (lbtype) { if (!strcmp(lbtype, "gpt")) @@ -298,7 +302,11 @@ static int diskpart(struct img_type *img, if (!fdisk_is_labeltype(cxt, priv.labeltype)) { WARN("Partition table of different type, setting to %s, all data lost !", lbtype); - fdisk_create_disklabel(cxt, lbtype); + ret = fdisk_create_disklabel(cxt, lbtype); + if (ret) { + ERROR("Failed to create disk label"); + goto handler_release; + } createtable = true; } }