2013-04-23 06:25:13

by Dan Carpenter

Subject: [patch] 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.

Signed-off-by: Dan Carpenter <[email protected]>

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;

2013-04-25 05:49:13

by David Miller

Subject: Re: [patch] NFC: llcp: two bugs in ->getname()

From: Dan Carpenter <[email protected]>
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 <[email protected]>

Applied.