summaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2012-10-04 11:51:11 +0200
committerDavid S. Miller <davem@davemloft.net>2012-10-04 21:58:47 +0200
commit32418cfe495c95013be2e805c087db89dcefac6d (patch)
treeda22a27485f29d6cd87ac8b063006715104981e0 /net/nfc
parentMerge branch 'fixes-for-3.7' of git://gitorious.org/linux-can/linux-can (diff)
downloadlinux-32418cfe495c95013be2e805c087db89dcefac6d.tar.xz
linux-32418cfe495c95013be2e805c087db89dcefac6d.zip
Remove noisy printks from llcp_sock_connect
Validation of userspace input shouldn't trigger dmesg spamming. Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/nfc')
-rw-r--r--net/nfc/llcp/sock.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/net/nfc/llcp/sock.c b/net/nfc/llcp/sock.c
index 40f056debf9a..63e4cdc92376 100644
--- a/net/nfc/llcp/sock.c
+++ b/net/nfc/llcp/sock.c
@@ -497,15 +497,11 @@ static int llcp_sock_connect(struct socket *sock, struct sockaddr *_addr,
pr_debug("sock %p sk %p flags 0x%x\n", sock, sk, flags);
if (!addr || len < sizeof(struct sockaddr_nfc) ||
- addr->sa_family != AF_NFC) {
- pr_err("Invalid socket\n");
+ addr->sa_family != AF_NFC)
return -EINVAL;
- }
- if (addr->service_name_len == 0 && addr->dsap == 0) {
- pr_err("Missing service name or dsap\n");
+ if (addr->service_name_len == 0 && addr->dsap == 0)
return -EINVAL;
- }
pr_debug("addr dev_idx=%u target_idx=%u protocol=%u\n", addr->dev_idx,
addr->target_idx, addr->nfc_protocol);