From owner-freebsd-net@FreeBSD.ORG  Tue Mar 18 09:49:08 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 EEA4E1E0
 for <net@FreeBSD.org>; Tue, 18 Mar 2014 09:49:08 +0000 (UTC)
Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [188.134.15.200])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A604B3E6
 for <net@FreeBSD.org>; Tue, 18 Mar 2014 09:49:08 +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 353187F4AE;
 Tue, 18 Mar 2014 13:11:14 +0400 (MSK)
X-DKIM: Sendmail DKIM Filter v2.8.2 shelob.oktetlabs.ru 353187F4AE
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=oktetlabs.ru;
 s=default; t=1395133874;
 bh=GaBnJsNunYZ58EGb+jVqjEkIOJY4qf0HTdRVNtBhpxA=; l=547;
 h=Message-ID:Date:From:MIME-Version:To:CC:Subject:Content-Type:
 Content-Transfer-Encoding;
 b=xg4s5/GZEgziJgnpfixJ2+hrDa+k03hvSflztZIZSoTKQFLTNuK7VMFagq9OgIlDI
 ND++n+Z4h58+RNNgBh5A1m7JC+4IDR59iW6wnXIf9ROtpyl64QyzaV59Cyd5zvrIaM
 5ezCINcgLOlev9v564bWrNgK2OaxaQ5IaEF/dvU8=
Message-ID: <53280DB3.4080900@oktetlabs.ru>
Date: Tue, 18 Mar 2014 13:11:15 +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: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
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: Tue, 18 Mar 2014 09:49:09 -0000


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);

  }