2021-04-21 13:27:23

by Dan Carpenter

[permalink] [raw]
Subject: [PATCH 2/3] mt76: mt7915: fix a precision vs width bug in printk

Precision %.*s was intended instead of width %.*s. The original code
will still print unintended data from beyond the end of skb->data.

Fixes: 665b2c780d63 ("mt76: mt7915: limit firmware log message printk to buffer length")
Signed-off-by: Dan Carpenter <[email protected]>
---
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index 908e74a6b8e6..94195a1ad3b8 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -521,7 +521,7 @@ mt7915_mcu_rx_log_message(struct mt7915_dev *dev, struct sk_buff *skb)
break;
}

- wiphy_info(mt76_hw(dev)->wiphy, "%s: %*s", type,
+ wiphy_info(mt76_hw(dev)->wiphy, "%s: %.*s", type,
(int)(skb->len - sizeof(*rxd)), data);
}

--
2.30.2


2021-04-21 13:32:58

by Johannes Berg

[permalink] [raw]
Subject: Re: [PATCH 2/3] mt76: mt7915: fix a precision vs width bug in printk

On Wed, 2021-04-21 at 16:15 +0300, Dan Carpenter wrote:
> Precision %.*s was intended instead of width %.*s.
>

typo there, the second instance should say "width %*s" :-)

johannes

2021-04-21 17:22:48

by Dan Carpenter

[permalink] [raw]
Subject: Re: [PATCH 2/3] mt76: mt7915: fix a precision vs width bug in printk

On Wed, Apr 21, 2021 at 03:29:31PM +0200, Johannes Berg wrote:
> On Wed, 2021-04-21 at 16:15 +0300, Dan Carpenter wrote:
> > Precision %.*s was intended instead of width %.*s.
> >
>
> typo there, the second instance should say "width %*s" :-)

The hunter has become the hunted. *dramatic music. dah dah dah.*

:P

Thanks.

regards,
dan carpenter

2021-04-21 17:26:52

by Dan Carpenter

[permalink] [raw]
Subject: [PATCH 2/3 v2] mt76: mt7915: fix a precision vs width bug in printk

Precision %.*s was intended instead of width %*s. The original code
will still print unintended data from beyond the end of skb->data.

Fixes: 665b2c780d63 ("mt76: mt7915: limit firmware log message printk to buffer length")
Signed-off-by: Dan Carpenter <[email protected]>
---
v2: fix a typo in the commit message

drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index 908e74a6b8e6..94195a1ad3b8 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -521,7 +521,7 @@ mt7915_mcu_rx_log_message(struct mt7915_dev *dev, struct sk_buff *skb)
break;
}

- wiphy_info(mt76_hw(dev)->wiphy, "%s: %*s", type,
+ wiphy_info(mt76_hw(dev)->wiphy, "%s: %.*s", type,
(int)(skb->len - sizeof(*rxd)), data);
}

--
2.30.2