ath9k: snprintf() returns largish values

PATCH New Dan Carpenter 1 participant 1 message Jul 22, 2010

Subsystems (2)

Kernel janitors Qualcomm Atheros ATH9K wireless driver

lore

Share & tools

lore

Dan Carpenter

author

2010-07-22 08:50 UTC #0 lore raw

PATCH 1/1 ath9k: snprintf() returns largish values

The snprintf() function returns the number of characters that would have been written (not counting the NUL character on the end). It could potentially be larger than the size of the buffer.

Signed-off-by Dan Carpenter <[email protected]>

drivers/net/wireless/ath/ath9k/htc_drv_main.c +9 -0

index 3243877..cf9bcc6 100644
@@ -524,6 +524,9 @@ static ssize_t read_file_tgt_stats(struct file *file, char __user *user_buf,
 	len += snprintf(buf + len, sizeof(buf) - len,
 			"%19s : %10u\n", "TX Rate", priv->debug.txrate);
 
+	if (len > sizeof(buf))
+		len = sizeof(buf);
+
 	return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }

@@ -569,6 +572,9 @@ static ssize_t read_file_xmit(struct file *file, char __user *user_buf,
 			"%20s : %10u\n", "VO queued",
 			priv->debug.tx_stats.queue_stats[WME_AC_VO]);
 
+	if (len > sizeof(buf))
+		len = sizeof(buf);
+
 	return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }

@@ -595,6 +601,9 @@ static ssize_t read_file_recv(struct file *file, char __user *user_buf,
 			"%20s : %10u\n", "SKBs Dropped",
 			priv->debug.rx_stats.skb_dropped);
 
+	if (len > sizeof(buf))
+		len = sizeof(buf);
+
 	return simple_read_from_buffer(user_buf, count, ppos, buf, len);
 }