On Thu, Jan 16, 2014 at 11:42:06AM -0800, David Miller wrote:
> From: Luis Henriques <luis.henriques@xxxxxxxxxxxxx>
> 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@xxxxxxxxxxxxxx>
> >> >
> >> > [ 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.
For the 3.11 kernel, only cd6fe65 ("sfc: Maintain current frequency
adjustment when applying a time offset") required some rework -- basically,
replacing MCDI_SET_QWORD() by two MCDI_SET_DWORD()). All the others we're
(almost) clean cherry-picks.
Cheers,
--
Luis
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html