[ovs-dev] [PATCH v2] odp-util: Use flexible sized buffer to hold Geneve options.

[Ben Pfaff]

On Mon, Mar 18, 2019 at 07:13:27PM +0300, Ilya Maximets wrote:
> > On Thu, Dec 21, 2017 at 04:30:05PM -0800, Justin Pettit wrote:
> >> 
> >> 
> >> > On Dec 4, 2017, at 11:51 AM, Ben Pfaff <blp at ovn.org> wrote:
> >> > 
> >> > The 'mask' buffer in parse_odp_action() is supposed to always be big
> >> > enough:
> >> >        /* 'mask' is big enough to hold any key. */
> >> > 
> >> > Geneve options can be really big and the comment was wrong.  In addition,
> >> > the user might supply more options than can really fit in any case, so
> >> > we might as well just use a stub.
> >> > 
> >> > Found by libfuzzer.
> >> > 
> >> > Reported-by: Bhargava Shastry <bshastry at sec.t-labs.tu-berlin.de>
> >> > Signed-off-by: Ben Pfaff <blp at ovn.org>
> >> 
> >> Acked-by: Justin Pettit <jpettit at ovn.org>
> > 
> > Thanks, applied to master and backported as far as 2.4.
> 
> Hi Ben and Simon.
> 
> This patch breaks the build on branch-2.4, because there is no such thing
> as OFPBUF_STUB_INITIALIZER on this branch:
> 
> lib/odp-util.c:1063:33: error: undefined identifier 'OFPBUF_STUB_INITIALIZER'
> lib/odp-util.c:1063:56: error: invalid initializer
> 
> We need to revert it or fix in other way.
> 
> 
> BTW, seems nobody uses this branch. It was broken for more than a year.
> Maybe we could stop backporting stuff to it.
> 
> Best regards, Ilya Maximets.

I applied the two patches that Simon identified.

I will stop backporting beyond branch-2.5.  That is a good idea.