From owner-freebsd-net@FreeBSD.ORG  Sun Mar 16 03:08:51 2014
Return-Path: <owner-freebsd-net@FreeBSD.ORG>
Delivered-To: net@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 037F0775
 for <net@FreeBSD.org>; Sun, 16 Mar 2014 03:08:51 +0000 (UTC)
Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [195.131.132.186])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9BB8E62F
 for <net@FreeBSD.org>; Sun, 16 Mar 2014 03:08:50 +0000 (UTC)
Received: from [192.168.38.17] (aros.oktetlabs.ru [192.168.38.17])
 (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
 (No client certificate requested)
 by shelob.oktetlabs.ru (Postfix) with ESMTPSA id 2E22F7F45D;
 Sat, 15 Mar 2014 17:13:06 +0400 (MSK)
X-DKIM: Sendmail DKIM Filter v2.8.2 shelob.oktetlabs.ru 2E22F7F45D
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=oktetlabs.ru;
 s=default; t=1394889186;
 bh=kHuflD9fbl1E8NGYsUN0aBMeYazJ97SEVlj8/uqSFWI=; l=957;
 h=Message-ID:Date:From:MIME-Version:To:CC:Subject:Content-Type;
 b=R23PPyKxMnECk/YQHncb2XmPrrWBokMQl6QsSNV1okwn+37a8TQ0aQnbWs1MGh6KV
 QaTKfZHkOuHejBDvzUxrdUVA7795YDG/nJ98DLRzJ9UmLo6sl5Cwbt1rWsYQdEycNC
 k027Oz77cZ29K7uDeL+DpaJHWlsgP/aLXTcZUqAw=
Message-ID: <532451E2.20407@oktetlabs.ru>
Date: Sat, 15 Mar 2014 17:13:06 +0400
From: Andrew Rybchenko <Andrew.Rybchenko@oktetlabs.ru>
Organization: OKTET Labs
User-Agent: Mozilla/5.0 (X11; Linux i686 on x86_64;
 rv:24.0) Gecko/20100101 Thunderbird/24.3.0
MIME-Version: 1.0
To: net@FreeBSD.org
Subject: [patch] [1/6] sfxge: fix mbuf leak if it does not fit in software
 queue
Content-Type: multipart/mixed; boundary="------------040304000606070504070008"
X-BeenThere: freebsd-net@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: Networking and TCP/IP with FreeBSD <freebsd-net.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-net>,
 <mailto:freebsd-net-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-net/>
List-Post: <mailto:freebsd-net@freebsd.org>
List-Help: <mailto:freebsd-net-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
 <mailto:freebsd-net-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Mar 2014 03:08:51 -0000

This is a multi-part message in MIME format.
--------------040304000606070504070008
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit



--------------040304000606070504070008
Content-Type: text/x-patch;
 name="1-sfxge-leak.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="1-sfxge-leak.patch"

sfxge: fix mbuf leak if it does not fit in software queue

mbuf should be owned by if_transmit function in any case.

Submitted-by:   Andrew Rybchenko <Andrew.Rybchenko@oktetlabs.ru>
Sponsored by:   Solarflare Communications, Inc.

diff -r e2bc8f64f1b2 -r ff9f5d3dbafe src/driver/freebsd/sfxge_tx.c
--- a/head/sys/dev/sfxge/sfxge_tx.c	Tue Mar 04 13:13:05 2014 +0400
+++ b/head/sys/dev/sfxge/sfxge_tx.c	Tue Mar 04 13:15:13 2014 +0400
@@ -536,6 +536,7 @@
 	return (0);
 
 fail:
+	m_freem(m);
 	return (rc);
 	
 }

--------------040304000606070504070008--