From patchwork Fri Sep 20 07:35:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 1165059 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="DgPgvpnh"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46ZQW653w1z9sDB for ; Fri, 20 Sep 2019 17:36:02 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2395110AbfITHgB (ORCPT ); Fri, 20 Sep 2019 03:36:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:58332 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393025AbfITHgB (ORCPT ); Fri, 20 Sep 2019 03:36:01 -0400 Received: from localhost (unknown [89.205.140.247]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7B068207FC; Fri, 20 Sep 2019 07:36:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568964961; bh=+PPOrOvLe8rfiaGSPY3cPe8ZrbVFOI/MYrTa0M/ejCU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DgPgvpnh9ku/UGmk04qzseXtOcIbu8fyeXpcxMlQdJrlr14BfHQrlVwNFyB/DhKG7 qeGXKBTqh2Db0ADmeJLzGecfrvJUZvOU44NxFeJCNAWcOth+OOnoBxt1x6+WodrKA5 NvfgT5Pp3Ut96NGJllyr9bhxSPmdPJLsv6G7fnmY= From: Greg Kroah-Hartman 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 Subject: [PATCH 1/5] mISDN: enforce CAP_NET_RAW for raw sockets Date: Fri, 20 Sep 2019 09:35:45 +0200 Message-Id: <20190920073549.517481-2-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190920073549.517481-1-gregkh@linuxfoundation.org> References: <20190920073549.517481-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ori Nimron When creating a raw AF_ISDN socket, CAP_NET_RAW needs to be checked first. Signed-off-by: Ori Nimron Signed-off-by: Greg Kroah-Hartman --- drivers/isdn/mISDN/socket.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c index c6ba37df4b9d..dff4132b3702 100644 --- a/drivers/isdn/mISDN/socket.c +++ b/drivers/isdn/mISDN/socket.c @@ -754,6 +754,8 @@ base_sock_create(struct net *net, struct socket *sock, int protocol, int kern) if (sock->type != SOCK_RAW) return -ESOCKTNOSUPPORT; + if (!capable(CAP_NET_RAW)) + return -EPERM; sk = sk_alloc(net, PF_ISDN, GFP_KERNEL, &mISDN_proto, kern); if (!sk) From patchwork Fri Sep 20 07:35:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 1165061 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="ftaALDX7"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46ZQWN004yz9s4Y for ; Fri, 20 Sep 2019 17:36:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2437510AbfITHgP (ORCPT ); Fri, 20 Sep 2019 03:36:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:58690 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730493AbfITHgO (ORCPT ); Fri, 20 Sep 2019 03:36:14 -0400 Received: from localhost (unknown [89.205.140.247]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9FEAE207FC; Fri, 20 Sep 2019 07:36:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568964974; bh=CTTZtX6AxA076NKL6BVqHwg/gxozWHMsOn7UROYNgLE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ftaALDX7aZt2gwmAIl7/XM6xOuXkbeUWOUzYQKgGxh1/veWuDuKkC9rTIJ1X5UUV9 9B/Id6j0Cb7CF9Q0ezxQaQ/51spX4dTgziPfZJTWUZTpK45QNBfhUcEo80iuVqw+8V c51FphdX0haoR4ssSVR2fZvsx/UmPliyiLe+U9vg= From: Greg Kroah-Hartman 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 Subject: [PATCH 2/5] appletalk: enforce CAP_NET_RAW for raw sockets Date: Fri, 20 Sep 2019 09:35:46 +0200 Message-Id: <20190920073549.517481-3-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190920073549.517481-1-gregkh@linuxfoundation.org> References: <20190920073549.517481-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ori Nimron When creating a raw AF_APPLETALK socket, CAP_NET_RAW needs to be checked first. Signed-off-by: Ori Nimron Signed-off-by: Greg Kroah-Hartman --- net/appletalk/ddp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c index 4072e9d394d6..b41375d4d295 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) From patchwork Fri Sep 20 07:35:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 1165064 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="RNkb2Mag"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46ZQWY5TRlz9s4Y for ; Fri, 20 Sep 2019 17:36:25 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2437526AbfITHgY (ORCPT ); Fri, 20 Sep 2019 03:36:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:58864 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2437511AbfITHgY (ORCPT ); Fri, 20 Sep 2019 03:36:24 -0400 Received: from localhost (unknown [89.205.140.247]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5A61920B7C; Fri, 20 Sep 2019 07:36:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568964983; bh=K17LGXzzk4QNV6vN+lSnmKznG9LRxMNsypg5Johj0g0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RNkb2MaggirkF/EttG1tKln3V8V6MqNVfLnmgVaZEyanAoel1YjtpW1hojJDEbbj5 Q7ix65HCmdScXZmY4gCD6B1t3Zj7LVoBE5bz8NmBu6y8UEKViUeUtj3SeEjSrD+mBo rRpoLTd2LVq6aJp21Cic/gHCC/+n0jciHVT1p3P4= From: Greg Kroah-Hartman 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 Subject: [PATCH 3/5] ax25: enforce CAP_NET_RAW for raw sockets Date: Fri, 20 Sep 2019 09:35:47 +0200 Message-Id: <20190920073549.517481-4-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190920073549.517481-1-gregkh@linuxfoundation.org> References: <20190920073549.517481-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ori Nimron When creating a raw AF_AX25 socket, CAP_NET_RAW needs to be checked first. Signed-off-by: Ori Nimron Signed-off-by: Greg Kroah-Hartman --- net/ax25/af_ax25.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c index ca5207767dc2..bb222b882b67 100644 --- a/net/ax25/af_ax25.c +++ b/net/ax25/af_ax25.c @@ -855,6 +855,8 @@ static int ax25_create(struct net *net, struct socket *sock, int protocol, break; case SOCK_RAW: + if (!capable(CAP_NET_RAW)) + return -EPERM; break; default: return -ESOCKTNOSUPPORT; From patchwork Fri Sep 20 07:35:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 1165062 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="KmVpWpUR"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46ZQWR49Lzz9s4Y for ; Fri, 20 Sep 2019 17:36:19 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2437516AbfITHgS (ORCPT ); Fri, 20 Sep 2019 03:36:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:58752 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2437511AbfITHgS (ORCPT ); Fri, 20 Sep 2019 03:36:18 -0400 Received: from localhost (unknown [89.205.140.247]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C2DE720882; Fri, 20 Sep 2019 07:36:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568964977; bh=H6ouQjqr2XxrN24f+ltvt/OqwmUqSWyTn66raHrndfk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KmVpWpURBNjc6U7rb0KEvRhDnrJH77kc2mh0eVP1GubUh47hICKYcs045kHUQ1riF bom2Tf1WXSoihJ0wSMToDU2Nr5LbFvwnnRdujP8kPiLj6ua0w6tuOWfnCaW+hydXa2 v25LDc0GJJ1BaixZUOhdjwp2lTeJ3flaPWvL2ba0= From: Greg Kroah-Hartman 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 Subject: [PATCH 4/5] ieee802154: enforce CAP_NET_RAW for raw sockets Date: Fri, 20 Sep 2019 09:35:48 +0200 Message-Id: <20190920073549.517481-5-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190920073549.517481-1-gregkh@linuxfoundation.org> References: <20190920073549.517481-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ori Nimron When creating a raw AF_IEEE802154 socket, CAP_NET_RAW needs to be checked first. Signed-off-by: Ori Nimron Signed-off-by: Greg Kroah-Hartman Acked-by: Stefan Schmidt --- net/ieee802154/socket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/ieee802154/socket.c b/net/ieee802154/socket.c index badc5cfe4dc6..d93d4531aa9b 100644 --- a/net/ieee802154/socket.c +++ b/net/ieee802154/socket.c @@ -1008,6 +1008,9 @@ static int ieee802154_create(struct net *net, struct socket *sock, switch (sock->type) { case SOCK_RAW: + rc = -EPERM; + if (!capable(CAP_NET_RAW)) + goto out; proto = &ieee802154_raw_prot; ops = &ieee802154_raw_ops; break; From patchwork Fri Sep 20 07:35:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 1165063 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="HkoYZGny"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46ZQWV4dN0z9s4Y for ; Fri, 20 Sep 2019 17:36:22 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2437521AbfITHgV (ORCPT ); Fri, 20 Sep 2019 03:36:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:58806 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2437511AbfITHgV (ORCPT ); Fri, 20 Sep 2019 03:36:21 -0400 Received: from localhost (unknown [89.205.140.247]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D41C0208C0; Fri, 20 Sep 2019 07:36:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568964980; bh=nzhgttOSPXQ3oeiv/D97eXaK7/HXlb3JCh5T8wct42w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HkoYZGnylmfdHl6aw4A6Rac9rbHWS7Ac039nZ2OWGrL2kkr7vj3+2FmbkAPAAiHhi mMfpC3449C0RkwuQTIPE3LexA8j92ZQ9sSR3BM3FZxBztsVnuIKg1InwsUhxlhmo84 lPIoJDuwuhyCIL6eryaGqXqcHrJ24oFALpsc9wSU= From: Greg Kroah-Hartman 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 Subject: [PATCH 5/5] nfc: enforce CAP_NET_RAW for raw sockets Date: Fri, 20 Sep 2019 09:35:49 +0200 Message-Id: <20190920073549.517481-6-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190920073549.517481-1-gregkh@linuxfoundation.org> References: <20190920073549.517481-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ori Nimron When creating a raw AF_NFC socket, CAP_NET_RAW needs to be checked first. Signed-off-by: Ori Nimron Signed-off-by: Greg Kroah-Hartman --- 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)