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=-10.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 95420C43612 for ; Fri, 11 Jan 2019 15:09:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4C2A120874 for ; Fri, 11 Jan 2019 15:09:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547219398; bh=r+QoRoKxEf5/B8uRQ7SISxNKbQdkJHnXm2AeT8kt4NE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zHwQJH1PVZaguDMGMwwUyKgasziATKp8pVG82YawEOVrmMXwectK5sCfA8C2GOYvJ TXajNqJS+zMd+V7y4Fo9SkBuIOCCzEWRtBKu79Dg3PA6y8bcpHHYuZPMia1cEFeD6A G08N5JWQslv8xtHb2w2is7E+B+yC/9kVqAcwtP20= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731529AbfAKORL (ORCPT ); Fri, 11 Jan 2019 09:17:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:33552 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387818AbfAKORK (ORCPT ); Fri, 11 Jan 2019 09:17:10 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 5AF812184B; Fri, 11 Jan 2019 14:17:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547216229; bh=r+QoRoKxEf5/B8uRQ7SISxNKbQdkJHnXm2AeT8kt4NE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JKMTr1Cfu59E4ZyY6c3yXF7qOAYuesuTDxMAIusVRsLtn0/WIMDvdl/0nJsExlsat CprcHmDw+I5KpmBuXzOAHib+XPuefry6p8VjFoG+P5/75eArhdKZFs4M2dgZZ0dMis eJD9xSFsYTj+U46rGq7Kh3VOaz7Fca/ZVuc8M0k0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ido Schimmel , Willem de Bruijn , "David S. Miller" Subject: [PATCH 4.4 23/88] packet: validate address length if non-zero Date: Fri, 11 Jan 2019 15:07:52 +0100 Message-Id: <20190111131049.608364375@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190111131045.137499039@linuxfoundation.org> References: <20190111131045.137499039@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Willem de Bruijn [ Upstream commit 6b8d95f1795c42161dc0984b6863e95d6acf24ed ] Validate packet socket address length if a length is given. Zero length is equivalent to not setting an address. Fixes: 99137b7888f4 ("packet: validate address length") Reported-by: Ido Schimmel Signed-off-by: Willem de Bruijn Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/packet/af_packet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -2511,7 +2511,7 @@ static int tpacket_snd(struct packet_soc sll_addr))) goto out; proto = saddr->sll_protocol; - addr = saddr->sll_addr; + addr = saddr->sll_halen ? 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) goto out; @@ -2680,7 +2680,7 @@ static int packet_snd(struct socket *soc if (msg->msg_namelen < (saddr->sll_halen + offsetof(struct sockaddr_ll, sll_addr))) goto out; proto = saddr->sll_protocol; - addr = saddr->sll_addr; + addr = saddr->sll_halen ? saddr->sll_addr : NULL; dev = dev_get_by_index(sock_net(sk), saddr->sll_ifindex); if (addr && dev && saddr->sll_halen < dev->addr_len) goto out;