NFC: llcp: two bugs in ->getname()
Subsystems (4)
PATCH 1/1 NFC: llcp: two bugs in ->getname()
The sockaddr_nfc_llcp struct has as hole between ->sa_family and ->dev_idx so I've added a memset() to clear it and prevent an information leak.
Also the ->nfc_protocol element wasn't set so I've added that.
"uaddr->sa_family" and "llcp_addr->sa_family" are the same thing but it's less confusing to use llcp_addr consistently throughout.
net/nfc/llcp/sock.c +3 -2
@@ -476,12 +476,13 @@ static int llcp_sock_getname(struct socket *sock, struct sockaddr *uaddr,pr_debug ("%p %d %d %d\n" , sk, llcp_sock->target_idx, llcp_sock->dsap, llcp_sock->ssap); - uaddr->sa_family =AF_NFC ; - +memset (llcp_addr,0 ,sizeof (*llcp_addr)); *len =sizeof (struct sockaddr_nfc_llcp ); + llcp_addr->sa_family =AF_NFC ; llcp_addr->dev_idx = llcp_sock->dev->idx; llcp_addr->target_idx = llcp_sock->target_idx; + llcp_addr->nfc_protocol = llcp_sock->nfc_protocol; llcp_addr->dsap = llcp_sock->dsap; llcp_addr->ssap = llcp_sock->ssap; llcp_addr->service_name_len = llcp_sock->service_name_len;
From: Dan Carpenter <[email protected]>
Date: Tue, 23 Apr 2013 09:24:52 +0300
Quoted 10 lines
The
sockaddr_nfc_llcpstruct has as hole between ->sa_family and ->dev_idx so I've added amemset()to clear it and prevent an information leak.Also the ->nfc_protocol element wasn't set so I've added that.
"
uaddr->sa_family" and "llcp_addr->sa_family" are the same thing but it's less confusing to usellcp_addrconsistently throughout.Signed-off-by Dan Carpenter <[email protected]>
Applied.