[U-Boot] [PATCH 2/2] net: remove CONFIG_MCAST_TFTP

[Simon Goldschmidt]

On Tue, Nov 27, 2018 at 4:15 AM Chris Packham <judge.packham at gmail.com> wrote:
>
> On Mon, Nov 26, 2018 at 9:15 PM Simon Goldschmidt
> <simon.k.r.goldschmidt at gmail.com> wrote:
> >
> > On Mon, Nov 26, 2018 at 9:00 AM Chris Packham <judge.packham at gmail.com> wrote:
> > >
> > > No mainline board enables CONFIG_MCAST_TFTP and there have been
> > > compilation issues with the code for some time. Additionally, it has a
> > > potential buffer underrun issue (reported as a side note in
> > > CVE-2018-18439).
> > >
> > > Remove the multicast TFTP code but keep the driver API for the future
> > > addition of IPv6.
> >
> > Thanks for taking this.
> > I expect that there will be merge conflicts between this patch any my
> > patch fixing CVE-2018-18439.
> >
> > Joe, how should we proceed? I can rebase my series on top of this if you want.
>
> I actually thought your latest series [1] won't conflict because you
> dropped your version of this. I think your changes should take
> precedence as it is fixing a real issue as opposed to my removal of
> dead code. If anything I should rebase on top of your series.

Yes I dropped the code you remove here, but still your patch does not
apply for me. I guess this is because our changes are around the same
lines. So one of us needs to rebase after applying the other.

And since my patch fixes the buffer underrun issue for MCAST_TFTP,
too, you're right that it should probably be pushed first.

Thanks,
Simon

>
> [1] - http://patchwork.ozlabs.org/patch/1002685/