33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From: Oliver Hartkopp <socketcan@hartkopp.net>
|
|
Date: Wed, 10 Nov 2010 12:10:30 +0000 (+0000)
|
|
Subject: can-bcm: fix minor heap overflow
|
|
X-Git-Tag: v2.6.37-rc2~20^2
|
|
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=0597d1b99fcfc2c0eada09a698f85ed413d4ba84
|
|
|
|
can-bcm: fix minor heap overflow
|
|
|
|
On 64-bit platforms the ASCII representation of a pointer may be up to 17
|
|
bytes long. This patch increases the length of the buffer accordingly.
|
|
|
|
http://marc.info/?l=linux-netdev&m=128872251418192&w=2
|
|
|
|
Reported-by: Dan Rosenberg <drosenberg@vsecurity.com>
|
|
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
|
|
CC: Linus Torvalds <torvalds@linux-foundation.org>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
|
|
diff --git a/net/can/bcm.c b/net/can/bcm.c
|
|
index 08ffe9e..6faa825 100644
|
|
--- a/net/can/bcm.c
|
|
+++ b/net/can/bcm.c
|
|
@@ -125,7 +125,7 @@ struct bcm_sock {
|
|
struct list_head tx_ops;
|
|
unsigned long dropped_usr_msgs;
|
|
struct proc_dir_entry *bcm_proc_read;
|
|
- char procname [9]; /* pointer printed in ASCII with \0 */
|
|
+ char procname [20]; /* pointer printed in ASCII with \0 */
|
|
};
|
|
|
|
static inline struct bcm_sock *bcm_sk(const struct sock *sk)
|