--- net/can/bcm.c

+++ net/can/bcm.c

@@ -124,7 +124,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)

@@ -1425,9 +1425,14 @@ static int bcm_init(struct sock *sk)

static int bcm_release(struct socket *sock)

{

struct sock *sk = sock->sk;

- struct bcm_sock *bo = bcm_sk(sk);

+ struct bcm_sock *bo;

struct bcm_op *op, *next;

+ if (sk == NULL)

+ return 0;

+

+ bo = bcm_sk(sk);

+

/* remove bcm_ops, timer, rx_unregister(), etc. */

unregister_netdevice_notifier(&bo->notifier);

@@ -1519,7 +1524,7 @@ static int bcm_connect(struct socket *so

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);