summaryrefslogtreecommitdiff
path: root/net/nfc
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2013-04-22 20:24:52 +0000
committerDavid S. Miller <davem@davemloft.net>2013-04-25 01:47:59 -0400
commit5ffedc6ed3d066f5c0d2c2106f9081170b3d24fa (patch)
treef1d788d82b8326c1feb5aff0a839592e8fb85551 /net/nfc
parentd9152097acc5f9fdc0bf1a8e3454634dfae47742 (diff)
downloadlinux-3.10-5ffedc6ed3d066f5c0d2c2106f9081170b3d24fa.tar.gz
linux-3.10-5ffedc6ed3d066f5c0d2c2106f9081170b3d24fa.tar.bz2
linux-3.10-5ffedc6ed3d066f5c0d2c2106f9081170b3d24fa.zip
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 <dan.carpenter@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/nfc')
-rw-r--r--net/nfc/llcp/sock.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/nfc/llcp/sock.c b/net/nfc/llcp/sock.c
index 6c94447ec41..e16315719ea 100644
--- a/net/nfc/llcp/sock.c
+++ b/net/nfc/llcp/sock.c
@@ -358,12 +358,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;