diff mbox series

[3/5] appletalk: enforce CAP_NET_RAW for raw sockets

Message ID 20191003181318.19616-4-tyhicks@canonical.com
State New
Headers show
Series CVE-2019-1705{2, 3, 4, 5, 6}: Missing CAP_NET_RAW checks | expand

Commit Message

Tyler Hicks Oct. 3, 2019, 6:13 p.m. UTC 
From: Ori Nimron <orinimron123@gmail.com>

When creating a raw AF_APPLETALK 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>
Signed-off-by: David S. Miller <davem@davemloft.net>

CVE-2019-17054

(cherry picked from commit 6cc03e8aa36c51f3b26a0d21a3c4ce2809c842ac)
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
---
 net/appletalk/ddp.c | 5 +++++
 1 file changed, 5 insertions(+)
diff mbox series

Patch

diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index a8cb6b2e20c1..5a203acdcae5 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -1023,6 +1023,11 @@  static int atalk_create(struct net *net, struct socket *sock, int protocol,
 	 */
 	if (sock->type != SOCK_RAW && sock->type != SOCK_DGRAM)
 		goto out;
+
+	rc = -EPERM;
+	if (sock->type == SOCK_RAW && !kern && !capable(CAP_NET_RAW))
+		goto out;
+
 	rc = -ENOMEM;
 	sk = sk_alloc(net, PF_APPLETALK, GFP_KERNEL, &ddp_proto, kern);
 	if (!sk)