From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23FF2C4CEC9 for ; Fri, 20 Sep 2019 07:36:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E5739208C3 for ; Fri, 20 Sep 2019 07:36:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568964976; bh=CTTZtX6AxA076NKL6BVqHwg/gxozWHMsOn7UROYNgLE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1KjQ6Dvs63qWFBAvI5gwDtGfkoS1F8biR4eOB8nEIqD4LxeOTj3H8y9jwu+Ik+fmN gm5QbvY3nnNFit9Mp9X+DK1y8sGkqlDWpVVnntiujui55Y24a9eaJqOPQHyqHipAoy Qb5UpiQCVgUnPtiaX4TwvJcoJtuVanI8HzjiL8Dw= 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 Content-Transfer-Encoding: 8bit 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) -- 2.23.0