Date: Thu, 16 Jan 2014 11:42:06 -0800 (PST)
Message-Id: <20140116.114206.1690186344823616829.davem@davemloft.net>
To: luis.henriques@canonical.com
Cc: bhutchings@solarflare.com, gregkh@linuxfoundation.org,
        linux-kernel@vger.kernel.org, stable@vger.kernel.org,
        linux-net-drivers@solarflare.com
Subject: Re: [PATCH 3.12 40/77] sfc: Add length checks to
 efx_xmit_with_hwtstamp() and efx_ptp_is_ptp_tx()
From: David Miller <davem@davemloft.net>
In-Reply-To: <20140116105026.GA6429@hercules>
References: <20140114002753.640936297@linuxfoundation.org>
	<1389660315.2025.169.camel@bwh-desktop.uk.level5networks.com>
	<20140116105026.GA6429@hercules>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org

From: Luis Henriques <luis.henriques@canonical.com>
Date: Thu, 16 Jan 2014 10:50:26 +0000

> On Tue, Jan 14, 2014 at 12:45:15AM +0000, Ben Hutchings wrote:
>> On Mon, 2014-01-13 at 16:28 -0800, Greg Kroah-Hartman wrote:
>> > 3.12-stable review patch.  If anyone has any objections, please let me know.
>> > 
>> > ------------------
>> > 
>> > From: Ben Hutchings <bhutchings@solarflare.com>
>> > 
>> > [ Upstream commit e5a498e943fbc497f236ab8cf31366c75f337ce6 ]
>> > 
>> > efx_ptp_is_ptp_tx() must be robust against skbs from raw sockets that
>> > have invalid IPv4 and UDP headers.
>> > 
>> > Add checks that:
>> > - the transport header has been found
>> > - there is enough space between network and transport header offset
>> >   for an IPv4 header
>> > - there is enough space after the transport header offset for a
>> >   UDP header
>> > 
>> > Fixes: 7c236c43b838 ('sfc: Add support for IEEE-1588 PTP')
>> 
>> All the PTP fixes for sfc (40-44 in this series) logically apply to
>> 3.10.y as well.  David, did you find conflicts there?

Yes, there were rejects which were beyond my ability to resolve.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/