From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1lNPHO-00042f-DP for mharc-grub-devel@gnu.org; Fri, 19 Mar 2021 20:15:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNPHD-00041B-JX for grub-devel@gnu.org; Fri, 19 Mar 2021 20:15:37 -0400 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]:50896) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lNPH5-0002jg-PY for grub-devel@gnu.org; Fri, 19 Mar 2021 20:15:35 -0400 Received: by mail-pj1-x102d.google.com with SMTP id gb6so5443716pjb.0 for ; Fri, 19 Mar 2021 17:15:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficientek-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AB/vSwnpv3J+2CFqCsZ6X7qqdS7DSIUvrFo++FKbpck=; b=Jl2nV9hLkSG32p+mnoaNzx+/7QcUCCtZBBFk96zubCk5Jnpo7Xs8G14c6uVmh/+Y2+ EYlXXqfEq7eW12vWjO1tobJPWIymPz7z4KgPh6dAKb5IhCzMOcHirDHv4CBwdsZUC+c5 yjAGbbXyMdnjJB8jLTcOLZKi+WUOV0sWrcV0hHkZw7re0GUo9/d9aiE2EO3PUip8jLG/ hiaHZiYSVC1+OtOyn6yHawUVBdRGBUY3xuMKwUom4VHr1y0xuBTjw4D+WIeEJoyN/ENJ K7OUOvwyuQR6HOXOy3YzFYzIVlHYhGh5eMj2uief8QYQVWmF3Il17XX7wlfKstA5HmVH ZYUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AB/vSwnpv3J+2CFqCsZ6X7qqdS7DSIUvrFo++FKbpck=; b=q0MEhg5KYEPv8IlbcBxVfeZfEYRymaPFEzNeQ+skITKh2kfGWZK3INYjity7d/38sO 6+5BoX4d6/9fEEEVYH+BhE2GYSkJNVqVsEqrWqhek+E3x+8sNXY/owqb3t3kO1zw7E1d gswGumekOVQPZ2e0mlcOCA21EJM52c+iPmkeexQJpOZynOT3IE6J8+lsI9couhKLHsxB n0b/lRYTR4Hnfr68rj2nMpnEbXU8IL2IeUuBkL4YZZnjW9mqYHWqfvnRnLDPlsFqrrjF 93nByLGI4Z1uzzFuAEbqyAvN+0c9QzZk08CUgnvWu4fCiadkw6jrgGUD9nbHx5mcsFZw zFNw== X-Gm-Message-State: AOAM531kK/qVdksCGJOTZefHUCBYiLlBAzFn/685iVdnozgF5raWHv4t 9wuzo3p3fgU6CxvK4/awkZdArG3fIrE5NA== X-Google-Smtp-Source: ABdhPJyGrQWP3Oua1ylN99E6MaKI6egb/hMS2wqPPjoO0+1nUpGFXy8DNWz49hfcgSBzFMgdT7mAMA== X-Received: by 2002:a17:90a:fd0a:: with SMTP id cv10mr974699pjb.167.1616199326213; Fri, 19 Mar 2021 17:15:26 -0700 (PDT) Received: from localhost.localdomain ([2605:a601:ab16:db00:2328:d973:f35b:5c6b]) by smtp.gmail.com with ESMTPSA id 2sm6400218pfi.116.2021.03.19.17.15.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Mar 2021 17:15:25 -0700 (PDT) From: Glenn Washburn To: grub-devel@gnu.org, Daniel Kiper Cc: Glenn Washburn Subject: [PATCH 4/4] luks2: Fix potential grub_free with NULL pointer Date: Fri, 19 Mar 2021 19:14:51 -0500 Message-Id: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::102d; envelope-from=development@efficientek.com; helo=mail-pj1-x102d.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2021 00:15:37 -0000 This is not strictly necessary because grub_free does nothing if it is passed a NULL pointer. However, it simplifies the code and makes it a tad bit easier to read. Signed-off-by: Glenn Washburn --- grub-core/disk/luks2.c | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c index 2ed9e5a80..0e86325c7 100644 --- a/grub-core/disk/luks2.c +++ b/grub-core/disk/luks2.c @@ -437,25 +437,18 @@ luks2_decrypt_key (grub_uint8_t *out_key, if (!base64_decode (k->kdf.salt, grub_strlen (k->kdf.salt), (char *)salt, &saltlen)) - { - ret = grub_error (GRUB_ERR_BAD_ARGUMENT, "Invalid keyslot salt"); - goto err; - } + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Invalid keyslot salt"); /* Calculate the binary area key of the user supplied passphrase. */ switch (k->kdf.type) { case LUKS2_KDF_TYPE_ARGON2I: - ret = grub_error (GRUB_ERR_BAD_ARGUMENT, "Argon2 not supported"); - goto err; + return grub_error (GRUB_ERR_BAD_ARGUMENT, "Argon2 not supported"); case LUKS2_KDF_TYPE_PBKDF2: hash = grub_crypto_lookup_md_by_name (k->kdf.u.pbkdf2.hash); if (!hash) - { - ret = grub_error (GRUB_ERR_FILE_NOT_FOUND, "Couldn't load %s hash", - k->kdf.u.pbkdf2.hash); - goto err; - } + return grub_error (GRUB_ERR_FILE_NOT_FOUND, "Couldn't load %s hash", + k->kdf.u.pbkdf2.hash); gcry_ret = grub_crypto_pbkdf2 (hash, (grub_uint8_t *) passphrase, passphraselen, @@ -463,11 +456,8 @@ luks2_decrypt_key (grub_uint8_t *out_key, k->kdf.u.pbkdf2.iterations, area_key, k->area.key_size); if (gcry_ret) - { - ret = grub_error (grub_crypto_gcry_error (gcry_ret), - "grub_crypto_pbkdf2 failed with code %d", gcry_ret); - goto err; - } + return grub_error (grub_crypto_gcry_error (gcry_ret), + "grub_crypto_pbkdf2 failed with code %d", gcry_ret); break; } @@ -485,19 +475,13 @@ luks2_decrypt_key (grub_uint8_t *out_key, gcry_ret = grub_cryptodisk_setkey (crypt, area_key, k->area.key_size); if (gcry_ret) - { - ret = grub_error (grub_crypto_gcry_error (gcry_ret), - "grub_cryptodisk_setkey failed with code %d", gcry_ret); - goto err; - } + return grub_error (grub_crypto_gcry_error (gcry_ret), + "grub_cryptodisk_setkey failed with code %d", gcry_ret); /* Read and decrypt the binary key area with the area key. */ split_key = grub_malloc (k->area.size); if (!split_key) - { - ret = grub_errno; - goto err; - } + return grub_errno; grub_errno = GRUB_ERR_NONE; ret = grub_disk_read (source, 0, k->area.offset, k->area.size, split_key); -- 2.27.0