From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: netdev@vger.kernel.org
Cc: isdn@linux-pingi.de, jreuter@yaina.de, ralf@linux-mips.org,
alex.aring@gmail.com, stefan@datenfreihafen.org,
orinimron123@gmail.com,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: [PATCH 5/5] nfc: enforce CAP_NET_RAW for raw sockets
Date: Fri, 20 Sep 2019 09:35:49 +0200 [thread overview]
Message-ID: <20190920073549.517481-6-gregkh@linuxfoundation.org> (raw)
In-Reply-To: <20190920073549.517481-1-gregkh@linuxfoundation.org>
From: Ori Nimron <orinimron123@gmail.com>
When creating a raw AF_NFC socket, CAP_NET_RAW needs to be checked
first.
Signed-off-by: Ori Nimron <orinimron123@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
net/nfc/llcp_sock.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c
index 9b8742947aff..8dfea26536c9 100644
--- a/net/nfc/llcp_sock.c
+++ b/net/nfc/llcp_sock.c
@@ -1004,10 +1004,13 @@ static int llcp_sock_create(struct net *net, struct socket *sock,
sock->type != SOCK_RAW)
return -ESOCKTNOSUPPORT;
- if (sock->type == SOCK_RAW)
+ if (sock->type == SOCK_RAW) {
+ if (!capable(CAP_NET_RAW))
+ return -EPERM;
sock->ops = &llcp_rawsock_ops;
- else
+ } else {
sock->ops = &llcp_sock_ops;
+ }
sk = nfc_llcp_sock_alloc(sock, sock->type, GFP_ATOMIC, kern);
if (sk == NULL)
--
2.23.0
next prev parent reply other threads:[~2019-09-20 7:36 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-20 7:35 [PATCH 0/5] Raw socket cleanups Greg Kroah-Hartman
2019-09-20 7:35 ` [PATCH 1/5] mISDN: enforce CAP_NET_RAW for raw sockets Greg Kroah-Hartman
2019-09-20 7:35 ` [PATCH 2/5] appletalk: " Greg Kroah-Hartman
2019-09-20 7:35 ` [PATCH 3/5] ax25: " Greg Kroah-Hartman
2019-09-20 7:35 ` [PATCH 4/5] ieee802154: " Greg Kroah-Hartman
2019-09-21 11:58 ` Stefan Schmidt
2019-09-21 12:30 ` Greg Kroah-Hartman
2019-09-20 7:35 ` Greg Kroah-Hartman [this message]
2019-09-24 14:38 ` [PATCH 0/5] Raw socket cleanups David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190920073549.517481-6-gregkh@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=alex.aring@gmail.com \
--cc=isdn@linux-pingi.de \
--cc=jreuter@yaina.de \
--cc=netdev@vger.kernel.org \
--cc=orinimron123@gmail.com \
--cc=ralf@linux-mips.org \
--cc=stefan@datenfreihafen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).