* [patch] isdn: mISDN: set ->family in ->getname()
@ 2013-04-23 6:24 ` Dan Carpenter
0 siblings, 0 replies; 8+ messages in thread
From: Dan Carpenter @ 2013-04-23 6:24 UTC (permalink / raw)
To: Karsten Keil; +Cc: David S. Miller, netdev, kernel-janitors
The "maddr->family" variable was not set but instead it leaked stack
information to userspace.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c
index 8b07f83..a838864 100644
--- a/drivers/isdn/mISDN/socket.c
+++ b/drivers/isdn/mISDN/socket.c
@@ -578,6 +578,7 @@ data_sock_getname(struct socket *sock, struct sockaddr *addr,
lock_sock(sk);
*addr_len = sizeof(*maddr);
+ maddr->family = AF_ISDN;
maddr->dev = _pms(sk)->dev->id;
maddr->channel = _pms(sk)->ch.nr;
maddr->sapi = _pms(sk)->ch.addr & 0xff;
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [patch] isdn: mISDN: set ->family in ->getname()
@ 2013-04-23 6:24 ` Dan Carpenter
0 siblings, 0 replies; 8+ messages in thread
From: Dan Carpenter @ 2013-04-23 6:24 UTC (permalink / raw)
To: Karsten Keil; +Cc: David S. Miller, netdev, kernel-janitors
The "maddr->family" variable was not set but instead it leaked stack
information to userspace.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c
index 8b07f83..a838864 100644
--- a/drivers/isdn/mISDN/socket.c
+++ b/drivers/isdn/mISDN/socket.c
@@ -578,6 +578,7 @@ data_sock_getname(struct socket *sock, struct sockaddr *addr,
lock_sock(sk);
*addr_len = sizeof(*maddr);
+ maddr->family = AF_ISDN;
maddr->dev = _pms(sk)->dev->id;
maddr->channel = _pms(sk)->ch.nr;
maddr->sapi = _pms(sk)->ch.addr & 0xff;
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [patch] isdn: mISDN: set ->family in ->getname()
2013-04-23 6:24 ` Dan Carpenter
@ 2013-04-23 7:40 ` walter harms
-1 siblings, 0 replies; 8+ messages in thread
From: walter harms @ 2013-04-23 7:40 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Karsten Keil, David S. Miller, netdev, kernel-janitors
Am 23.04.2013 08:24, schrieb Dan Carpenter:
> The "maddr->family" variable was not set but instead it leaked stack
> information to userspace.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c
> index 8b07f83..a838864 100644
> --- a/drivers/isdn/mISDN/socket.c
> +++ b/drivers/isdn/mISDN/socket.c
> @@ -578,6 +578,7 @@ data_sock_getname(struct socket *sock, struct sockaddr *addr,
> lock_sock(sk);
>
> *addr_len = sizeof(*maddr);
> + maddr->family = AF_ISDN;
> maddr->dev = _pms(sk)->dev->id;
> maddr->channel = _pms(sk)->ch.nr;
> maddr->sapi = _pms(sk)->ch.addr & 0xff;
just nitpicking ...
net/nfc/llcp/sock.c has a memset(..0,..) for the struct. Is this an options here also ?
(just to make sure everything is 0 in the beginning)
re,
wh
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [patch] isdn: mISDN: set ->family in ->getname()
@ 2013-04-23 7:40 ` walter harms
0 siblings, 0 replies; 8+ messages in thread
From: walter harms @ 2013-04-23 7:40 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Karsten Keil, David S. Miller, netdev, kernel-janitors
Am 23.04.2013 08:24, schrieb Dan Carpenter:
> The "maddr->family" variable was not set but instead it leaked stack
> information to userspace.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c
> index 8b07f83..a838864 100644
> --- a/drivers/isdn/mISDN/socket.c
> +++ b/drivers/isdn/mISDN/socket.c
> @@ -578,6 +578,7 @@ data_sock_getname(struct socket *sock, struct sockaddr *addr,
> lock_sock(sk);
>
> *addr_len = sizeof(*maddr);
> + maddr->family = AF_ISDN;
> maddr->dev = _pms(sk)->dev->id;
> maddr->channel = _pms(sk)->ch.nr;
> maddr->sapi = _pms(sk)->ch.addr & 0xff;
just nitpicking ...
net/nfc/llcp/sock.c has a memset(..0,..) for the struct. Is this an options here also ?
(just to make sure everything is 0 in the beginning)
re,
wh
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [patch] isdn: mISDN: set ->family in ->getname()
2013-04-23 7:40 ` walter harms
@ 2013-04-23 8:02 ` Dan Carpenter
-1 siblings, 0 replies; 8+ messages in thread
From: Dan Carpenter @ 2013-04-23 8:02 UTC (permalink / raw)
To: walter harms; +Cc: Karsten Keil, David S. Miller, netdev, kernel-janitors
On Tue, Apr 23, 2013 at 09:40:07AM +0200, walter harms wrote:
>
>
> Am 23.04.2013 08:24, schrieb Dan Carpenter:
> > The "maddr->family" variable was not set but instead it leaked stack
> > information to userspace.
> >
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> >
> > diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c
> > index 8b07f83..a838864 100644
> > --- a/drivers/isdn/mISDN/socket.c
> > +++ b/drivers/isdn/mISDN/socket.c
> > @@ -578,6 +578,7 @@ data_sock_getname(struct socket *sock, struct sockaddr *addr,
> > lock_sock(sk);
> >
> > *addr_len = sizeof(*maddr);
> > + maddr->family = AF_ISDN;
> > maddr->dev = _pms(sk)->dev->id;
> > maddr->channel = _pms(sk)->ch.nr;
> > maddr->sapi = _pms(sk)->ch.addr & 0xff;
>
> just nitpicking ...
> net/nfc/llcp/sock.c has a memset(..0,..) for the struct. Is this
> an options here also ?
> (just to make sure everything is 0 in the beginning)
In net/nfc/llcp/sock.c the struct has a hole after ->sa_family so
the memset() isn't optional.
These ->getname() patches were from manually auditing all the
->getname() functions. I've tried to follow the local style in my
patches. Quite a few of these use __packed structs to avoid holes
and the need for the memset().
regards,
dan carpenter
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [patch] isdn: mISDN: set ->family in ->getname()
@ 2013-04-23 8:02 ` Dan Carpenter
0 siblings, 0 replies; 8+ messages in thread
From: Dan Carpenter @ 2013-04-23 8:02 UTC (permalink / raw)
To: walter harms; +Cc: Karsten Keil, David S. Miller, netdev, kernel-janitors
On Tue, Apr 23, 2013 at 09:40:07AM +0200, walter harms wrote:
>
>
> Am 23.04.2013 08:24, schrieb Dan Carpenter:
> > The "maddr->family" variable was not set but instead it leaked stack
> > information to userspace.
> >
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> >
> > diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c
> > index 8b07f83..a838864 100644
> > --- a/drivers/isdn/mISDN/socket.c
> > +++ b/drivers/isdn/mISDN/socket.c
> > @@ -578,6 +578,7 @@ data_sock_getname(struct socket *sock, struct sockaddr *addr,
> > lock_sock(sk);
> >
> > *addr_len = sizeof(*maddr);
> > + maddr->family = AF_ISDN;
> > maddr->dev = _pms(sk)->dev->id;
> > maddr->channel = _pms(sk)->ch.nr;
> > maddr->sapi = _pms(sk)->ch.addr & 0xff;
>
> just nitpicking ...
> net/nfc/llcp/sock.c has a memset(..0,..) for the struct. Is this
> an options here also ?
> (just to make sure everything is 0 in the beginning)
In net/nfc/llcp/sock.c the struct has a hole after ->sa_family so
the memset() isn't optional.
These ->getname() patches were from manually auditing all the
->getname() functions. I've tried to follow the local style in my
patches. Quite a few of these use __packed structs to avoid holes
and the need for the memset().
regards,
dan carpenter
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [patch] isdn: mISDN: set ->family in ->getname()
2013-04-23 6:24 ` Dan Carpenter
@ 2013-04-25 5:49 ` David Miller
-1 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2013-04-25 5:49 UTC (permalink / raw)
To: dan.carpenter; +Cc: isdn, netdev, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 23 Apr 2013 09:24:14 +0300
> The "maddr->family" variable was not set but instead it leaked stack
> information to userspace.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-04-25 5:49 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-23 6:24 [patch] isdn: mISDN: set ->family in ->getname() Dan Carpenter
2013-04-23 6:24 ` Dan Carpenter
2013-04-23 7:40 ` walter harms
2013-04-23 7:40 ` walter harms
2013-04-23 8:02 ` Dan Carpenter
2013-04-23 8:02 ` Dan Carpenter
2013-04-25 5:49 ` David Miller
2013-04-25 5:49 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.