2020-02-05 03:50:46

by Ryder Lee

Subject: [PATCH] mt76: mt7615: fix wrong length in strncmp

Fix it to proper length.

Signed-off-by: Ryder Lee <[email protected]>
---
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
index 6639f9291721..fbda56342d11 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
@@ -491,7 +491,7 @@ static int mt7615_load_ram(struct mt7615_dev *dev)
goto out;
}

- if (!strncmp(hdr->fw_ver, "2.0", 6))
+ if (!strncmp(hdr->fw_ver, "2.0", 3))
dev->fw_ver = MT7615_FIRMWARE_V2;
else
dev->fw_ver = MT7615_FIRMWARE_V1;
--
2.18.0

2020-02-05 08:21:18

by Felix Fietkau

Subject: Re: [PATCH] mt76: mt7615: fix wrong length in strncmp

On 2020-02-05 04:46, Ryder Lee wrote:
> Fix it to proper length.
>
> Signed-off-by: Ryder Lee <[email protected]>
> ---
> drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
> index 6639f9291721..fbda56342d11 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
> @@ -491,7 +491,7 @@ static int mt7615_load_ram(struct mt7615_dev *dev)
> goto out;
> }
>
> - if (!strncmp(hdr->fw_ver, "2.0", 6))
> + if (!strncmp(hdr->fw_ver, "2.0", 3))
Do you plan on allowing more characters after the 2.0 and still match?
If not, maybe we should just use sizeof(hdr->fw_ver) as max len.

- Felix