* [patch] NFC: llcp: two bugs in ->getname()
@ 2013-04-23 6:24 Dan Carpenter
2013-04-25 5:49 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2013-04-23 6:24 UTC (permalink / raw)
To: Lauro Ramos Venancio
Cc: Aloisio Almeida Jr, Samuel Ortiz, David S. Miller,
John W. Linville, Thierry Escande, Sasha Levin, linux-wireless,
linux-nfc, netdev, kernel-janitors
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.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/net/nfc/llcp/sock.c b/net/nfc/llcp/sock.c
index c1101e6..c51e97d 100644
--- a/net/nfc/llcp/sock.c
+++ b/net/nfc/llcp/sock.c
@@ -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;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [patch] NFC: llcp: two bugs in ->getname()
2013-04-23 6:24 [patch] NFC: llcp: two bugs in ->getname() Dan Carpenter
@ 2013-04-25 5:49 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2013-04-25 5:49 UTC (permalink / raw)
To: dan.carpenter
Cc: lauro.venancio, aloisio.almeida, sameo, linville, thierry.escande,
levinsasha928, linux-wireless, linux-nfc, netdev, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 23 Apr 2013 09:24:52 +0300
> 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.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-04-25 5:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-23 6:24 [patch] NFC: llcp: two bugs in ->getname() Dan Carpenter
2013-04-25 5:49 ` 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).