Message ID | 1446813886-5632-2-git-send-email-pablo@netfilter.org |
---|---|
State | Awaiting Upstream |
Delegated to: | Pablo Neira |
Headers | show |
On Fri, Nov 06, 2015 at 01:44:44PM +0100, Pablo Neira Ayuso wrote: > From: Eric Dumazet <edumazet@google.com> > > [ upstream commit 45efccdbec3cd465c4776ed9ca1d7b1bba1b7e34 ] > Not a valid commit id :( -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Nov 06, 2015 at 09:09:34AM -0800, Greg KH wrote: > On Fri, Nov 06, 2015 at 01:44:44PM +0100, Pablo Neira Ayuso wrote: > > From: Eric Dumazet <edumazet@google.com> > > > > [ upstream commit 45efccdbec3cd465c4776ed9ca1d7b1bba1b7e34 ] > > > > Not a valid commit id :( Same thing: http://git.kernel.org/cgit/linux/kernel/git/davem/net.git/commit/?id=45efccdbec3cd465c4776ed9ca1d7b1bba1b7e34 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 2015-11-06 at 18:26 +0100, Pablo Neira Ayuso wrote: > On Fri, Nov 06, 2015 at 09:09:34AM -0800, Greg KH wrote: > > On Fri, Nov 06, 2015 at 01:44:44PM +0100, Pablo Neira Ayuso wrote: > > > From: Eric Dumazet <edumazet@google.com> > > > > > > [ upstream commit 45efccdbec3cd465c4776ed9ca1d7b1bba1b7e34 ] > > > > > > > Not a valid commit id :( > > Same thing: > > http://git.kernel.org/cgit/linux/kernel/git/davem/net.git/commit/?id= > 45efccdbec3cd465c4776ed9ca1d7b1bba1b7e34 But it's not in mainline yet. You should re-submit to stable once it is. Ben.
On Sat, Nov 07, 2015 at 04:04:02PM +0000, Ben Hutchings wrote: > On Fri, 2015-11-06 at 18:26 +0100, Pablo Neira Ayuso wrote: > > On Fri, Nov 06, 2015 at 09:09:34AM -0800, Greg KH wrote: > > > On Fri, Nov 06, 2015 at 01:44:44PM +0100, Pablo Neira Ayuso wrote: > > > > From: Eric Dumazet <edumazet@google.com> > > > > > > > > [ upstream commit 45efccdbec3cd465c4776ed9ca1d7b1bba1b7e34 ] > > > > > > > > > > Not a valid commit id :( > > > > Same thing: > > > > http://git.kernel.org/cgit/linux/kernel/git/davem/net.git/commit/?id= > > 45efccdbec3cd465c4776ed9ca1d7b1bba1b7e34 > > But it's not in mainline yet. You should re-submit to stable once it > is. Will do and will update my scripts to avoid this race again. Thanks Ben. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/netfilter/xt_TEE.c b/net/netfilter/xt_TEE.c index fd980aa..c5fdea1 100644 --- a/net/netfilter/xt_TEE.c +++ b/net/netfilter/xt_TEE.c @@ -31,8 +31,9 @@ static unsigned int tee_tg4(struct sk_buff *skb, const struct xt_action_param *par) { const struct xt_tee_tginfo *info = par->targinfo; + int oif = info->priv ? info->priv->oif : 0; - nf_dup_ipv4(skb, par->hooknum, &info->gw.in, info->priv->oif); + nf_dup_ipv4(skb, par->hooknum, &info->gw.in, oif); return XT_CONTINUE; } @@ -42,8 +43,9 @@ static unsigned int tee_tg6(struct sk_buff *skb, const struct xt_action_param *par) { const struct xt_tee_tginfo *info = par->targinfo; + int oif = info->priv ? info->priv->oif : 0; - nf_dup_ipv6(skb, par->hooknum, &info->gw.in6, info->priv->oif); + nf_dup_ipv6(skb, par->hooknum, &info->gw.in6, oif); return XT_CONTINUE; }