diff options
author | Dan Rosenberg <drosenberg@vsecurity.com> | 2010-12-26 01:54:53 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-31 14:13:27 -0500 |
commit | 9f260e0efa4766e56d0ac14f1aeea6ee5eb8fe83 (patch) | |
tree | a30573e33db58c6b084e02a50fd6f2bfd1cb90d7 /net/can | |
parent | 4a5fc4e179d79c79ad87bfc12a2d7e9b2371e40c (diff) |
CAN: Use inode instead of kernel address for /proc file
Since the socket address is just being used as a unique identifier, its
inode number is an alternative that does not leak potentially sensitive
information.
CC-ing stable because MITRE has assigned CVE-2010-4565 to the issue.
Signed-off-by: Dan Rosenberg <drosenberg@vsecurity.com>
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/can')
-rw-r--r-- | net/can/bcm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/can/bcm.c b/net/can/bcm.c index 6faa8256e10c..9d5e8accfab1 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c | |||
@@ -125,7 +125,7 @@ struct bcm_sock { | |||
125 | struct list_head tx_ops; | 125 | struct list_head tx_ops; |
126 | unsigned long dropped_usr_msgs; | 126 | unsigned long dropped_usr_msgs; |
127 | struct proc_dir_entry *bcm_proc_read; | 127 | struct proc_dir_entry *bcm_proc_read; |
128 | char procname [20]; /* pointer printed in ASCII with \0 */ | 128 | char procname [32]; /* inode number in decimal with \0 */ |
129 | }; | 129 | }; |
130 | 130 | ||
131 | static inline struct bcm_sock *bcm_sk(const struct sock *sk) | 131 | static inline struct bcm_sock *bcm_sk(const struct sock *sk) |
@@ -1521,7 +1521,7 @@ static int bcm_connect(struct socket *sock, struct sockaddr *uaddr, int len, | |||
1521 | 1521 | ||
1522 | if (proc_dir) { | 1522 | if (proc_dir) { |
1523 | /* unique socket address as filename */ | 1523 | /* unique socket address as filename */ |
1524 | sprintf(bo->procname, "%p", sock); | 1524 | sprintf(bo->procname, "%lu", sock_i_ino(sk)); |
1525 | bo->bcm_proc_read = proc_create_data(bo->procname, 0644, | 1525 | bo->bcm_proc_read = proc_create_data(bo->procname, 0644, |
1526 | proc_dir, | 1526 | proc_dir, |
1527 | &bcm_proc_fops, sk); | 1527 | &bcm_proc_fops, sk); |