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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 AEBD7C32792 for ; Thu, 3 Oct 2019 16:03:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7BFCC215EA for ; Thu, 3 Oct 2019 16:03:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570118619; bh=3D7JlMLXuSw8WycHbvY81UgjIJZwL4MmJMz3WIxlpkI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Rg2kBT65nfSBDH4j9BrgBOYQUFEEcLayps9x6Y+F1ePcWqU44gqm5Rc3iShKr9/Ko WuRtpwmIQ9t8T1FX/aYTUsDIv8/yRi+EJNLUx4AfURJp4eLyvqusPg/ChVHhjN5uKt mx+IJZaXWFYOmlHEVIWStlt2MlmzIoIgMdeCOoLw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732269AbfJCQDi (ORCPT ); Thu, 3 Oct 2019 12:03:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:48940 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729441AbfJCQDc (ORCPT ); Thu, 3 Oct 2019 12:03:32 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 A17C621848; Thu, 3 Oct 2019 16:03:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570118612; bh=3D7JlMLXuSw8WycHbvY81UgjIJZwL4MmJMz3WIxlpkI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e2HMdVxIJEe5NqjH4OlzsI+ymdgqQryVXIvxo9+V9WSNyaoKzdaxDrukYM6PYXSb1 eBeraSGiUuJqQmogNlN2tmiX1uxJ1ZQRY0sEBWonCkdlXyfhQ6ZhT3enxUyjN9Emyg 6qAeOz+AKXHSfAajNCdxRTzljDDPA8PaC7HkYvVs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ori Nimron , "David S. Miller" Subject: [PATCH 4.9 038/129] nfc: enforce CAP_NET_RAW for raw sockets Date: Thu, 3 Oct 2019 17:52:41 +0200 Message-Id: <20191003154335.275063316@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154318.081116689@linuxfoundation.org> References: <20191003154318.081116689@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ori Nimron [ Upstream commit 3a359798b176183ef09efb7a3dc59abad1cc7104 ] 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 Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/nfc/llcp_sock.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/net/nfc/llcp_sock.c +++ b/net/nfc/llcp_sock.c @@ -1011,10 +1011,13 @@ static int llcp_sock_create(struct net * 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)