public inbox for iwd@lists.linux.dev
 help / color / mirror / Atom feed
From: James Prestwood <prestwoj@gmail.com>
To: iwd@lists.linux.dev
Cc: James Prestwood <prestwoj@gmail.com>
Subject: [PATCH v2 6/9] storage: add length check in __storage_decrypt
Date: Wed, 16 Apr 2025 10:33:42 -0700	[thread overview]
Message-ID: <20250416173345.136025-6-prestwoj@gmail.com> (raw)
In-Reply-To: <20250416173345.136025-1-prestwoj@gmail.com>

The length of EncryptedSecurity was assumed to be at least 16 bytes
and anything less would underflow the length to l_malloc.

Fixes: 01cd8587 ("storage: implement network profile encryption")
---
 src/storage.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/storage.c b/src/storage.c
index 843581fd..2115a879 100644
--- a/src/storage.c
+++ b/src/storage.c
@@ -500,6 +500,13 @@ int __storage_decrypt(struct l_settings *settings, const char *ssid,
 		return 0;
 	}
 
+	/*
+	 * It should likely be far larger than this, but that will get caught
+	 * later when reloading the decrypted data.
+	 */
+	if (elen < 16)
+		return -EBADMSG;
+
 	/*
 	 * AES-SIV automatically verifies the IV (16 bytes) and returns only
 	 * the decrypted data portion. We add one here for the NULL terminator
-- 
2.34.1


  parent reply	other threads:[~2025-04-16 17:34 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-16 17:33 [PATCH v2 1/9] monitor: fix spelling Exausted -> Exhausted James Prestwood
2025-04-16 17:33 ` [PATCH v2 2/9] scan: fix out of bound array access for survey results James Prestwood
2025-04-16 17:33 ` [PATCH v2 3/9] dpp-util: fail on duplicate values in URI James Prestwood
2025-04-16 17:33 ` [PATCH v2 4/9] unit: add test for duplicate URI elements James Prestwood
2025-04-16 17:33 ` [PATCH v2 5/9] monitor: add size check for interworking IE parsing James Prestwood
2025-04-16 17:33 ` James Prestwood [this message]
2025-04-16 17:33 ` [PATCH v2 7/9] unit: add test-storage James Prestwood
2025-04-16 17:33 ` [PATCH v2 8/9] station: check return when advancing iterator James Prestwood
2025-04-16 17:33 ` [PATCH v2 9/9] eap-mschapv2: Fix leak of state->user on error path James Prestwood
2025-04-16 19:58 ` [PATCH v2 1/9] monitor: fix spelling Exausted -> Exhausted Denis Kenzior

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250416173345.136025-6-prestwoj@gmail.com \
    --to=prestwoj@gmail.com \
    --cc=iwd@lists.linux.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox