diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-04-22 22:24:52 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-25 07:47:59 +0200 |
| commit | 5ffedc6ed3d066f5c0d2c2106f9081170b3d24fa (patch) | |
| tree | f1d788d82b8326c1feb5aff0a839592e8fb85551 | |
| parent | isdn: mISDN: set ->family in ->getname() (diff) | |
| download | linux-5ffedc6ed3d066f5c0d2c2106f9081170b3d24fa.tar.xz linux-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>
| -rw-r--r-- | net/nfc/llcp/sock.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/nfc/llcp/sock.c b/net/nfc/llcp/sock.c index 6c94447ec414..e16315719eaf 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; |