Skip to contentSkip to conversation

printk: fix integer overflow in setup_log_buf()

PATCH In review Sergey Senozhatsky 3 participants 6 messages Oct 10, 2018 – Oct 12, 2018 Printk

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 printk: fix integer overflow in setup_log_buf()

The way we calculate free logbuf free space percentage overflows signed integer:

	int free;

	free = __LOG_BUF_LEN - log_next_idx;
	pr_info("early log buf free: %u(%u%%)\n",
		free, (free * 100) / __LOG_BUF_LEN);

We support LOG_BUF_LEN of up to 2G, since setup_log_buf() is called during early init logbuf is mostly empty, so

__LOG_BUF_LEN - log_next_idx

is close to 2G. When we multiply it by 100, we overflow signed integer value range.

Example, booting with log_buf_len=2G boot param:

[    0.075317] log_buf_len: -2147483648 bytes
[    0.075319] early log buf free: 33549896(-28%)

Make "free" unsigned integer.

---
 kernel/printk/printk.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/printk/printk.c +3 -3
index c3f0e3927e77..c9e1d3bf695e 100644
@@ -1083,7 +1083,7 @@ void __init setup_log_buf(int early)
 {
 	unsigned long flags;
 	char *new_log_buf;
-	int free;
+	unsigned int free;
 
 	if (log_buf != __log_buf)
 		return;
@@ -1116,8 +1116,8 @@ void __init setup_log_buf(int early)
 	memcpy(log_buf, __log_buf, __LOG_BUF_LEN);
 	logbuf_unlock_irqrestore(flags);
 
-	pr_info("log_buf_len: %d bytes\n", log_buf_len);
-	pr_info("early log buf free: %d(%d%%)\n",
+	pr_info("log_buf_len: %u bytes\n", log_buf_len);
+	pr_info("early log buf free: %u(%u%%)\n",
 		free, (free * 100) / __LOG_BUF_LEN);
 }
 
Signature · 1 line
2.19.1
#1 lore raw
Quoted 9 lines · Sergey Senozhatsky

The way we calculate free logbuf free space percentage overflows signed integer:

	int free;

	free = __LOG_BUF_LEN - log_next_idx;
	pr_info("early log buf free: %u(%u%%)\n",
		free, (free * 100) / __LOG_BUF_LEN);
Quoted 7 lines

We support LOG_BUF_LEN of up to 2G, since setup_log_buf() is called during early init logbuf is mostly empty, so

__LOG_BUF_LEN - log_next_idx

is close to 2G. When we multiply it by 100, we overflow signed integer value range.

I'm really sorry. The commit message got totally messed up here. What I meant was 1<<25. I used 2G as a boot param for testing to set up a proper new_log_buf_len value. And somehow got confused, I was in a hurry. I'll send a follow up with fixed commit message.

	-ss
#2 lore raw

PATCH 1/1 printk: fix integer overflow in setup_log_buf()

In reply to Sergey Senozhatsky

The way we calculate logbuf free space percentage overflows signed integer:

	int free;

	free = __LOG_BUF_LEN - log_next_idx;
	pr_info("early log buf free: %u(%u%%)\n",
		free, (free * 100) / __LOG_BUF_LEN);

We support LOG_BUF_LEN of up to 1<<25 bytes. Since setup_log_buf() is called during early init, logbuf is mostly empty, so

__LOG_BUF_LEN - log_next_idx

is close to 1<<25. Thus when we multiply it by 100, we overflow signed integer value range: 100 is 2^6 + 2^5 + 2^2.

Example, booting with LOG_BUF_LEN 1<<25 and log_buf_len=2G boot param:

[    0.075317] log_buf_len: -2147483648 bytes
[    0.075319] early log buf free: 33549896(-28%)

Make "free" unsigned integer and use appropriate printk() specifier.

---
 kernel/printk/printk.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/printk/printk.c +3 -3
index c3f0e3927e77..c9e1d3bf695e 100644
@@ -1083,7 +1083,7 @@ void __init setup_log_buf(int early)
 {
 	unsigned long flags;
 	char *new_log_buf;
-	int free;
+	unsigned int free;
 
 	if (log_buf != __log_buf)
 		return;
@@ -1116,8 +1116,8 @@ void __init setup_log_buf(int early)
 	memcpy(log_buf, __log_buf, __LOG_BUF_LEN);
 	logbuf_unlock_irqrestore(flags);
 
-	pr_info("log_buf_len: %d bytes\n", log_buf_len);
-	pr_info("early log buf free: %d(%d%%)\n",
+	pr_info("log_buf_len: %u bytes\n", log_buf_len);
+	pr_info("early log buf free: %u(%u%%)\n",
 		free, (free * 100) / __LOG_BUF_LEN);
 }
 
Signature · 1 line
2.19.1
maintainer
#3 lore raw
Quoted 20 lines · Sergey Senozhatsky

The way we calculate logbuf free space percentage overflows signed integer:

	int free;

	free = __LOG_BUF_LEN - log_next_idx;
	pr_info("early log buf free: %u(%u%%)\n",
		free, (free * 100) / __LOG_BUF_LEN);

We support LOG_BUF_LEN of up to 1<<25 bytes. Since setup_log_buf() is called during early init, logbuf is mostly empty, so

__LOG_BUF_LEN - log_next_idx

is close to 1<<25. Thus when we multiply it by 100, we overflow signed integer value range: 100 is 2^6 + 2^5 + 2^2.

Example, booting with LOG_BUF_LEN 1<<25 and log_buf_len=2G boot param:

Quoted 6 lines
[    0.075317] log_buf_len: -2147483648 bytes
[    0.075319] early log buf free: 33549896(-28%)

Make "free" unsigned integer and use appropriate printk() specifier.

I have pushed this fix into printk.git, for-4.20 branch.

kernel/printk/printk.c void __init setup_log_buf(int early) · line 1122

Quoted 12 lines
kernel/printk/printk.c +2 -2
@@ -1116,8 +1116,8 @@ void __init setup_log_buf(int early)
 	memcpy(log_buf, __log_buf, __LOG_BUF_LEN);
 	logbuf_unlock_irqrestore(flags);
 
-	pr_info("log_buf_len: %d bytes\n", log_buf_len);
-	pr_info("early log buf free: %d(%d%%)\n",
+	pr_info("log_buf_len: %u bytes\n", log_buf_len);
+	pr_info("early log buf free: %u(%u%%)\n",
 		free, (free * 100) / __LOG_BUF_LEN);
 }

Please note that this 2nd hunk was already part of the commit e6fe3e5b7d16e8f14 ("printk: Give error on attempt to set log buffer length to over 2G"), see
https://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk.git/commit/?h=for-4.20&id=e6fe3e5b7d16e8f146a4ae7fe481bc6e97acde1e

Best Regards,
Petr

#4 lore raw
Quoted 5 lines · Petr Mladek
Quoted 3 lines

Make "free" unsigned integer and use appropriate printk() specifier.

I have pushed this fix into printk.git, for-4.20 branch.

Thanks.

Quoted 4 lines

Please note that this 2nd hunk was already part of the commit e6fe3e5b7d16e8f14 ("printk: Give error on attempt to set log buffer length to over 2G"), see
https://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk.git/commit/?h=for-4.20&id=e6fe3e5b7d16e8f146a4ae7fe481bc6e97acde1e

Oh, indeed. I guess I used linux-next which didn't have your commit.

	-ss
maintainer
#5 lore raw
Quoted 7 lines · Sergey Senozhatsky
Quoted 5 lines · Petr Mladek
Quoted 3 lines

Make "free" unsigned integer and use appropriate printk() specifier.

I have pushed this fix into printk.git, for-4.20 branch.

Quoted 8 lines

Thanks.

Quoted 4 lines

Please note that this 2nd hunk was already part of the commit e6fe3e5b7d16e8f14 ("printk: Give error on attempt to set log buffer length to over 2G"), see
https://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk.git/commit/?h=for-4.20&id=e6fe3e5b7d16e8f146a4ae7fe481bc6e97acde1e

Oh, indeed. I guess I used linux-next which didn't have your commit.

Yeah, I forgot to push some recent changes for linux-next.

Best Regards,
Petr