]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: wfx: prevent underflow in wfx_send_pds()
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 19 Aug 2022 05:23:43 +0000 (08:23 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Oct 2022 07:57:08 +0000 (09:57 +0200)
[ Upstream commit f97c81f5b7f8047810b0d79a8f759a83951210a0 ]

This does a "chunk_len - 4" subtraction later when it calls:

ret = wfx_hif_configuration(wdev, buf + 4, chunk_len - 4);

so check for "chunk_len" is less than 4.

Fixes: dcbecb497908 ("staging: wfx: allow new PDS format")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/Yv8eX7Xv2ubUOvW7@kili
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/silabs/wfx/main.c

index e015bfb8d221f33ef91b9c2decc5ad55cb5c778c..84d82ddded567ebbd70953ea0d0857c88d1f64f6 100644 (file)
@@ -181,7 +181,7 @@ int wfx_send_pds(struct wfx_dev *wdev, u8 *buf, size_t len)
        while (len > 0) {
                chunk_type = get_unaligned_le16(buf + 0);
                chunk_len = get_unaligned_le16(buf + 2);
-               if (chunk_len > len) {
+               if (chunk_len < 4 || chunk_len > len) {
                        dev_err(wdev->dev, "PDS:%d: corrupted file\n", chunk_num);
                        return -EINVAL;
                }