2017-04-21, 19:06:44 +0800, Herbert Xu wrote:
> On Fri, Apr 21, 2017 at 12:14:51PM +0200, Sabrina Dubroca wrote:
> > When CONFIG_XFRM_SUB_POLICY=y, xfrm_dst stores a copy of the flowi for
> > that dst. Unfortunately, the code that allocates and fills this copy
> > doesn't care about what type of flowi (flowi, flowi4, flowi6) gets
> > passed. In multiple code paths (from raw_sendmsg, from TCP when
> > replying to a FIN, in vxlan, geneve, and gre), the flowi that gets
> > passed to xfrm is actually an on-stack flowi4, so we end up reading
> > memory on the stack past the end of the flowi4 struct.
> >
> > Since xfrm_dst->origin isn't used anywhere, just get rid of it.
> > xfrm_dst->partner isn't used either, so get rid of that too.
> >
> > Fixes: ca116922afa8 ("xfrm: Eliminate "fl" and "pol" args to
> > xfrm_bundle_ok().")
>
> The commit you refer to here doesn't seem to have caused this bug.
You're right. I had a note about that but it got lost. The bug
(ignoring what flavor of flowi is passed) is older than that (from the
introduction of subpolicies, I suspect, but I would have to dig more
into the history), but this commit removed the last uses of
origin/partner.
Looking into raw_sendmsg(), this code may have been safe before
9d6ec938019c ("ipv4: Use flowi4 in public route lookup interfaces."),
since full flowi were used.
If we want a fix for kernels that don't have ca116922afa8, we would
probably need to take the size of the flowi* struct depending on the
address family passed to xfrm_resolve_and_create_bundle().
I'm not sure how to proceed here, any advice?
Thanks,
--
Sabrina
