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=-8.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 493DBC10F11 for ; Wed, 24 Apr 2019 19:07:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 14D6D20835 for ; Wed, 24 Apr 2019 19:07:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VgvFAQiJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730463AbfDXTHr (ORCPT ); Wed, 24 Apr 2019 15:07:47 -0400 Received: from mail-qt1-f194.google.com ([209.85.160.194]:44543 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727504AbfDXTHq (ORCPT ); Wed, 24 Apr 2019 15:07:46 -0400 Received: by mail-qt1-f194.google.com with SMTP id s10so10808631qtc.11 for ; Wed, 24 Apr 2019 12:07:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=mWsHCUreGeCTo2AVpIDnXVvSwg4zb6Zfcp3T4kmLtG8=; b=VgvFAQiJe4DY9HflmYimE1SKkaQgXXgN0rw+3RpA0tLbEKWGpiRrQgGX5i0NdQfwi7 4pVCGCR9pXj44UoysUTEEKmV/Ajk2xOXrAlOQXIEJoXGUD5LMehPdKuRF5LqsiN6XYLr ZzeWQLUGNXaX3hYUZM0R/2iU4rheLBTdvOGzJ+rdCYaac8AmZ349FMo4BLof8o4ABobf A4+gM6ybWB9HVmOHo0KbfemuspkeaeDiphftL01I7mxrO78YM27qeu461HqhjdWX50// 6R/LGuYI6g8JJ/Gsug1V0BRsY0aTeQPx0o7Ydt8bdoA+1HKZ47ptJuTH1jG6NfuRYXJg ntOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=mWsHCUreGeCTo2AVpIDnXVvSwg4zb6Zfcp3T4kmLtG8=; b=bzj1qMqN2mg9BW19RSE/MF/Vahdqv1JSuJf4RgM1UEZ4gvWGRnqXf+Vrs9dY6BRLk4 ku45ALbMJo+osOM4c2G/TJMfc4IGftQdRzKZANXuKXhF91RS30yMp40rlmkuLngiOTwC KNtUvcYsHE0lWUlxb87/PHjV2uk9AxZxance3ixnRVHVE5pyRd6pRflezTenkTriC2gS Kxn7Ry6DaPmWT3gmrxWpLxnULq3uKA7xLig1Yun9jxJKMTNSsFHq1EbCsgeva0nZx7zN 7g4eP3Hgdow4Yx+lrWsrNPzoklPWYRf9ITRqf9hDt4F0Epma2G8OUs2f+2iu8peGVVv1 fc5w== X-Gm-Message-State: APjAAAXTYd137oVlN8hc3tXY7tphHeC+Q5EwLH15uVVpWh4OwqAgpVin GI1u3nHnUW0VOIq+Xp5b/AoUWkfv X-Google-Smtp-Source: APXvYqzirYh7oHwpIZq6B4m/NKp3gD709y225yq7+uDXMCll0RHqsHu8+6j8qKQ8jx7Ce/1KRXpvyQ== X-Received: by 2002:ac8:2f08:: with SMTP id j8mr18047545qta.184.1556132865345; Wed, 24 Apr 2019 12:07:45 -0700 (PDT) Received: from willemb1.nyc.corp.google.com ([2620:0:1003:315:3fa1:a34c:1128:1d39]) by smtp.gmail.com with ESMTPSA id t34sm14717331qth.36.2019.04.24.12.07.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Apr 2019 12:07:44 -0700 (PDT) From: Willem de Bruijn To: netdev@vger.kernel.org Cc: davem@davemloft.net, David.Laight@aculab.com, idosch@idosch.org, Willem de Bruijn Subject: [PATCH net] packet: validate msg_namelen in send directly Date: Wed, 24 Apr 2019 15:07:42 -0400 Message-Id: <20190424190742.178760-1-willemdebruijn.kernel@gmail.com> X-Mailer: git-send-email 2.21.0.593.g511ec345e18-goog 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: Willem de Bruijn Packet sockets in datagram mode take a link layer destination address in sockaddr_ll.sll_addr. For some device types, address length exceeds this field size, extending beyond the struct. This addr argument is then passed to dev_hard_header without length and assumed to be equal to dev->addr_len. Before commit 99137b7888f4 ("packet: validate address length") it was possible to pass a shorter msg_name and msg_namelen, causing an out of bound read. After that and commit 6b8d95f1795c4 ("packet: validate address length if non-zero") send() returns EINVAL if sockaddr_ll.sll_halen is non-zero but less than dev->addr_len (zero length is allowed because sockets in SOCK_RAW mode ignore sll_addr). It turns out that legacy applications require more permissive input. An otherwise legitimate Ethernet application that sets sll_halen > 0, < ETH_ALEN sees EINVAL, even though ETH_ALEN fits in sockaddr_ll, so cannot cause the out of bounds read. Be more permissive. Ignore sll_halen, which is not used elsewhere. Directly compare msg_namelen to dev->addr_len. Fixes: 6b8d95f1795c4 ("packet: validate address length if non-zero") Signed-off-by: Willem de Bruijn --- net/packet/af_packet.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 9419c5cf4de5e..9ae30bbd00913 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -2616,6 +2616,9 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) proto = po->num; addr = NULL; } else { + const int sa_len = offsetof(struct sockaddr_ll, sll_addr); + const short sk_type = po->sk.sk_socket->type; + err = -EINVAL; if (msg->msg_namelen < sizeof(struct sockaddr_ll)) goto out; @@ -2624,9 +2627,9 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) sll_addr))) goto out; proto = saddr->sll_protocol; - addr = saddr->sll_halen ? saddr->sll_addr : NULL; + addr = sk_type == SOCK_DGRAM ? saddr->sll_addr : NULL; dev = dev_get_by_index(sock_net(&po->sk), saddr->sll_ifindex); - if (addr && dev && saddr->sll_halen < dev->addr_len) + if (addr && dev && msg->msg_namelen < (sa_len + dev->addr_len)) goto out_put; } @@ -2818,15 +2821,17 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) proto = po->num; addr = NULL; } else { + const int sa_len = offsetof(struct sockaddr_ll, sll_addr); + err = -EINVAL; if (msg->msg_namelen < sizeof(struct sockaddr_ll)) goto out; if (msg->msg_namelen < (saddr->sll_halen + offsetof(struct sockaddr_ll, sll_addr))) goto out; proto = saddr->sll_protocol; - addr = saddr->sll_halen ? saddr->sll_addr : NULL; + addr = sock->type == SOCK_DGRAM ? saddr->sll_addr : NULL; dev = dev_get_by_index(sock_net(sk), saddr->sll_ifindex); - if (addr && dev && saddr->sll_halen < dev->addr_len) + if (addr && dev && msg->msg_namelen < (sa_len + dev->addr_len)) goto out_unlock; } -- 2.21.0.593.g511ec345e18-goog