Commit 9f260e0e authored by Dan Rosenberg's avatar Dan Rosenberg Committed by David S. Miller

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: default avatarDan Rosenberg <drosenberg@vsecurity.com>
Acked-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4a5fc4e1
...@@ -125,7 +125,7 @@ struct bcm_sock { ...@@ -125,7 +125,7 @@ struct bcm_sock {
struct list_head tx_ops; struct list_head tx_ops;
unsigned long dropped_usr_msgs; unsigned long dropped_usr_msgs;
struct proc_dir_entry *bcm_proc_read; struct proc_dir_entry *bcm_proc_read;
char procname [20]; /* pointer printed in ASCII with \0 */ char procname [32]; /* inode number in decimal with \0 */
}; };
static inline struct bcm_sock *bcm_sk(const struct sock *sk) 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,7 +1521,7 @@ static int bcm_connect(struct socket *sock, struct sockaddr *uaddr, int len,
if (proc_dir) { if (proc_dir) {
/* unique socket address as filename */ /* unique socket address as filename */
sprintf(bo->procname, "%p", sock); sprintf(bo->procname, "%lu", sock_i_ino(sk));
bo->bcm_proc_read = proc_create_data(bo->procname, 0644, bo->bcm_proc_read = proc_create_data(bo->procname, 0644,
proc_dir, proc_dir,
&bcm_proc_fops, sk); &bcm_proc_fops, sk);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment