netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] CAN: Use inode instead of kernel address for /proc file
@ 2010-12-26 16:54 Dan Rosenberg
  2010-12-27 13:39 ` Oliver Hartkopp
  0 siblings, 1 reply; 3+ messages in thread
From: Dan Rosenberg @ 2010-12-26 16:54 UTC (permalink / raw)
  To: Oliver Hartkopp, Urs Thuermann, David S. Miller; +Cc: netdev, security

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>
Cc: stable <stable@kernel.org>
---
 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 6faa825..bc51b56 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 [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);



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] CAN: Use inode instead of kernel address for /proc file
  2010-12-26 16:54 [PATCH v2] CAN: Use inode instead of kernel address for /proc file Dan Rosenberg
@ 2010-12-27 13:39 ` Oliver Hartkopp
  2010-12-31 19:13   ` David Miller
  0 siblings, 1 reply; 3+ messages in thread
From: Oliver Hartkopp @ 2010-12-27 13:39 UTC (permalink / raw)
  To: Dan Rosenberg; +Cc: Urs Thuermann, David S. Miller, netdev, security

On 26.12.2010 17:54, Dan Rosenberg wrote:
> 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>
> Cc: stable <stable@kernel.org>

Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>

Thanks Dan

> ---
>  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 6faa825..bc51b56 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 [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);
> 
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] CAN: Use inode instead of kernel address for /proc file
  2010-12-27 13:39 ` Oliver Hartkopp
@ 2010-12-31 19:13   ` David Miller
  0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2010-12-31 19:13 UTC (permalink / raw)
  To: socketcan; +Cc: drosenberg, urs.thuermann, netdev, security

From: Oliver Hartkopp <socketcan@hartkopp.net>
Date: Mon, 27 Dec 2010 14:39:19 +0100

> On 26.12.2010 17:54, Dan Rosenberg wrote:
>> 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>
>> Cc: stable <stable@kernel.org>
> 
> Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>

Applied, thanks.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2010-12-31 19:12 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-26 16:54 [PATCH v2] CAN: Use inode instead of kernel address for /proc file Dan Rosenberg
2010-12-27 13:39 ` Oliver Hartkopp
2010-12-31 19:13   ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).