Skip to contentSkip to conversation

CAN: Use inode instead of kernel address for /proc file

PATCH Applied Dan Rosenberg 3 participants 3 messages Dec 26, 2010 – Dec 31, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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.

---
 net/can/bcm.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
net/can/bcm.c +2 -2
index 6faa825..bc51b56 100644
@@ -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 [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)
@@ -1521,7 +1521,7 @@ static int bcm_connect(struct socket *sock, struct sockaddr *uaddr, int len,
 
 	if (proc_dir) {
 		/* 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,
 						     proc_dir,
 						     &bcm_proc_fops, sk);
maintainer Acked-by on v2 1/1
#1 lore raw
Quoted 8 lines · Dan Rosenberg

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.

Thanks Dan

Quoted 28 lines
---
 net/can/bcm.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
net/can/bcm.c +2 -2
index 6faa825..bc51b56 100644
@@ -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 [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)
@@ -1521,7 +1521,7 @@ static int bcm_connect(struct socket *sock, struct sockaddr *uaddr, int len,
 
 	if (proc_dir) {
 		/* 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,
 						     proc_dir,
 						     &bcm_proc_fops, sk);
maintainer Applied
#2 lore raw

From: Oliver Hartkopp <[email protected]>
Date: Mon, 27 Dec 2010 14:39:19 +0100

Quoted 11 lines · Dan Rosenberg
Quoted 8 lines

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.

Applied, thanks.