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=-7.0 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,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 90F62C5B57D for ; Tue, 2 Jul 2019 08:11:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6675C20659 for ; Tue, 2 Jul 2019 08:11:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562055116; bh=xDodtIMsKPm6YhLyrC/CzznVosZQjbuw83e+gldJATs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cQcDzW1m41Qw+H1GC32Q3zzP/2MOm1khpmxsMouwH0xWn0H3QEwQg8IJQ7QMtsYhp pf+lzPaCwv9wV7AUnS/hgJa1PFMuSZY/okPfqm0vD4V9oxVmava/fUYC1HmmaacKrj RqIBFwMo2DQf7/YJFlabVsjqSJHmV+HaVhQ3K3Nc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728429AbfGBILy (ORCPT ); Tue, 2 Jul 2019 04:11:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:57738 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727542AbfGBIJp (ORCPT ); Tue, 2 Jul 2019 04:09:45 -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 C000A20665; Tue, 2 Jul 2019 08:09:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562054985; bh=xDodtIMsKPm6YhLyrC/CzznVosZQjbuw83e+gldJATs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DRtgOtqTN2RJhAg1Zcm4230P2nv+6AglZLjFzjLhoQZ6pCrhXjLTqS1198MCKAY1k 8SipTZt+Q0leU2mp4+k6ukWq5WMcJJtedJgZfQF6fXA+G40L5ymxetn9kwkhmbNz+g LGwKgFfRQ8rE0lZHF+gVzBflE6UOMosifd0ujknA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Dumazet , Sowmini Varadhan , syzbot , "David S. Miller" Subject: [PATCH 4.14 29/43] net/packet: fix memory leak in packet_set_ring() Date: Tue, 2 Jul 2019 10:02:09 +0200 Message-Id: <20190702080125.364407469@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190702080123.904399496@linuxfoundation.org> References: <20190702080123.904399496@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: Eric Dumazet [ Upstream commit 55655e3d1197fff16a7a05088fb0e5eba50eac55 ] syzbot found we can leak memory in packet_set_ring(), if user application provides buggy parameters. Fixes: 7f953ab2ba46 ("af_packet: TX_RING support for TPACKET_V3") Signed-off-by: Eric Dumazet Cc: Sowmini Varadhan Reported-by: syzbot Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/packet/af_packet.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -4354,7 +4354,7 @@ static int packet_set_ring(struct sock * req3->tp_sizeof_priv || req3->tp_feature_req_word) { err = -EINVAL; - goto out; + goto out_free_pg_vec; } } break; @@ -4418,6 +4418,7 @@ static int packet_set_ring(struct sock * prb_shutdown_retire_blk_timer(po, rb_queue); } +out_free_pg_vec: if (pg_vec) free_pg_vec(pg_vec, order, req->tp_block_nr); out: