openwrt/upstream - upstream openwrt

	Commit message (Expand)	Author	Age	Files	Lines
*	fix ebtables compile	Felix Fietkau	2009-05-04	1	-0/+2
*	get rid of $Id$ - it has never helped us and it has broken too many patches ;)	Felix Fietkau	2009-04-17	1	-1/+0
*	ebtables-utils: create $(1)/usr/sbin/ dir before files are installed into it	Andy Boyett	2008-10-03	1	-0/+1
*	Split ebtables into ebtables and ebtables-utils, bump release number	Florian Fainelli	2008-10-01	1	-1/+14
*	Fix location to the ebtables modules (#3855)	Florian Fainelli	2008-09-27	1	-1/+2
*	ebtables: useless without kmod-eptables	Gabor Juhos	2008-08-06	1	-0/+1
*	ebtables: Update to 2.0.8-2	Andy Boyett	2008-06-22	2	-18/+12
*	bump package versions after updates	Felix Fietkau	2007-09-07	1	-1/+1
*	ebtables: fix use of cflags	Felix Fietkau	2007-07-31	1	-0/+3
*	refresh all package patches in the buildroot using quilt	Felix Fietkau	2007-06-04	1	-3/+4
*	add file type autodetection for the unpack command and nuke PKG_CAT:= in lots...	Felix Fietkau	2007-03-16	1	-1/+0
*	fix ebtables compile	Felix Fietkau	2006-12-14	1	-0/+12
*	replace lots of manual install commands with INSTALL_* variables	Felix Fietkau	2006-11-23	1	-9/+9
*	finally move buildroot-ng to trunk	Felix Fietkau	2016-03-20	1	-0/+43

From b95f457bb7ba38f03a71b474e35f53670322f0db Mon Sep 17 00:00:00 2001 From: Camelia Groza <camelia.groza@nxp.com> Date: Mon, 15 Jan 2018 17:41:01 +0200 Subject: [PATCH] sdk_dpaa: update buffer recycling conditions Guarantee there is enough space inside the skb's headroom to store the skb back-pointer before recycling the buffer. The back-pointer is stored right before the buffer's start. Signed-off-by: Camelia Groza <camelia.groza@nxp.com> --- drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) --- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c +++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c @@ -350,7 +350,13 @@ bool dpa_buf_is_recyclable(struct sk_buf /* left align to the nearest cacheline */ new = (unsigned char *)((unsigned long)new & ~(SMP_CACHE_BYTES - 1)); - if (likely(new >= skb->head && + /* Make sure there is enough space to store the skb back-pointer in + * the headroom, right before the start of the buffer. + * + * Guarantee that both maximum size and maximum data offsets aren't + * crossed. + */ + if (likely(new >= (skb->head + sizeof(void *)) && new >= (skb->data - DPA_MAX_FD_OFFSET) && skb_end_pointer(skb) - new <= DPA_RECYCLE_MAX_SIZE)) { *new_buf_start = new;