Add Broadcom / Netgear changes from RAXE 1.0.10.82

U-Boot changes from RAXE500_RAXE450-V1.0.10.82_GPL_release.zip

There are few more GPL releases but they don't really introduce any
changes to U-Boot:

1. 1.0.10.84 (RAXE500-V1.0.10.84_GPL_release.zip)
   Unrelated u-boot-2019.07 files added (accidentally?):
   * arch/arm/dts/zynq-zc770-xm011-x16.dts
   * arch/microblaze/dts/include/dt-bindings
   * arch/mips/dts/include/dt-bindings
   * arch/nios2/dts/include/dt-bindings
   * arch/sandbox/dts/include/dt-bindings
   * arch/x86/dts/include/dt-bindings
   * arch/xtensa/dts/include/dt-bindings
   * board/xilinx/zynq/zynq-cse-nand
   * board/xilinx/zynq/zynq-cse-nor
   * board/xilinx/zynq/zynq-cse-qspi-single
   * board/xilinx/zynqmp/avnet-ultra96-rev1
   * board/xilinx/zynqmp/zynqmp-mini
   * board/xilinx/zynqmp/zynqmp-mini-emmc0
   * board/xilinx/zynqmp/zynqmp-mini-emmc1
   * board/xilinx/zynqmp/zynqmp-mini-qspi
   * board/xilinx/zynqmp/zynqmp-zc1275-revA
   * board/xilinx/zynqmp/zynqmp-zcu104-revC
   * tools/binman/binman
   * tools/binman/test/u_boot_binman_syms_bad.c
   * tools/buildman/buildman
   * tools/dtoc/dtoc
   * tools/dtoc/test_fdt
   * tools/microcode-tool
   * tools/patman/patman
   * tools/version.h

2. 1.0.10.86 (RAXE500-V1.0.10.86_GPL_release.zip)
   All new u-boot-2019.07 files from 1.0.10.84 got removed

3. 1.0.10.94 (RAXE500-V1.0.11.94_GPL_release.zip)
   No u-boot-2019.07 changes

4. 1.0.12.96 (RAXE500-V1.0.12.96_GPL_release.zip)
   No u-boot-2019.07 changes

5. 1.2.13.100 (RAXE500-V1.2.13.100_GPL_release.zip)
   No u-boot-2019.07 changes

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

diff --git a/net/nmrp.c b/net/nmrp.c
index 3e603fd58dcecb854b9a1d5bce8d7d3d055c5e1e..ffae406f77ae91de7fbd45b4478a7d68e64cd787 100755 (executable)
--- a/net/nmrp.c
+++ b/net/nmrp.c
@@ -389,6 +389,11 @@ static int Nmrp_Parse_Opts(uchar *pkt, NMRP_PARSED_MSG *nmrp_parsed)
        nmrp_opt = &nmrphdr->opt;
        while (remain_len > 0){
                memcpy(&nmrp_parsed->options[opt_index], nmrp_opt, ntohs(nmrp_opt->len));
+        if(ntohs(nmrp_opt->len) <= 0)
+        {
+           printf("NMRP opt error\n");
+           return -1;
+        }
                remain_len -= ntohs(nmrp_opt->len);
                nmrp_opt = ((uchar *)nmrp_opt) + ntohs(nmrp_opt->len);
                opt_index++;