Skip to contentSkip to conversation

isdn: mISDN: set ->family in ->getname()

PATCH Applied Dan Carpenter 3 participants 4 messages Apr 23, 2013 – Apr 25, 2013

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

PATCH 1/1 isdn: mISDN: set ->family in ->getname()

The "maddr->family" variable was not set but instead it leaked stack information to userspace.

drivers/isdn/mISDN/socket.c +1 -0
index 8b07f83..a838864 100644
@@ -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;
#1 lore raw

Am 23.04.2013 08:24, schrieb Dan Carpenter:

Quoted 10 lines

The "maddr->family" variable was not set but instead it leaked stack information to userspace.

drivers/isdn/mISDN/socket.c +0 -0
index 8b07f83..a838864 100644

drivers/isdn/mISDN/socket.c data_sock_getname(struct socket *sock, struct sockaddr *addr, · line 584

Quoted 7 lines
drivers/isdn/mISDN/socket.c +1 -0
@@ -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

#2 lore raw
Quoted 15 lines · walter harms

Am 23.04.2013 08:24, schrieb Dan Carpenter:

Quoted 12 lines

The "maddr->family" variable was not set but instead it leaked stack information to userspace.

drivers/isdn/mISDN/socket.c +0 -0
index 8b07f83..a838864 100644
@@ -578,6 +578,7 @@ data_sock_getname(struct socket *sock, struct sockaddr *addr,
 	lock_sock(sk);
 
Quoted 10 lines

drivers/isdn/mISDN/socket.c data_sock_getname(struct socket *sock, struct sockaddr *addr, · line 584

Quoted 5 lines
drivers/isdn/mISDN/socket.c +1 -0
 	*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