From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joe Hershberger Date: Wed, 04 Sep 2019 11:42:42 -0500 Subject: [U-Boot] Pull request: u-boot-net.git master Message-ID: <201909041644.x84Givxh008844@osboxes.amer.corp.natinst.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Tom, This PR has bug, CVE, and regression fixes as well as a few features that took some back-and-forth. Travis tested here: https://travis-ci.org/jhershbe/u-boot/builds/580493530 The following changes since commit 448f11f7503995746a7b71e5e3b3a831c4651be9: Merge tag 'arc-for-2019.10-rc4' of https://gitlab.denx.de/u-boot/custodians/u-boot-arc (2019-09-03 12:40:50 -0400) are available in the git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-net.git master for you to fetch changes up to 5a5d1def59024dd3225e2a6142f8ee3ee10180a8: net: nfs: remove superfluous packed attribute (2019-09-04 11:37:19 -0500) ---------------------------------------------------------------- Alex Marginean (6): drivers: net: driver for MDIO muxes controlled over I2C net: mdio-uclass: name MDIO according to device-name property if preset doc: bindings: add mdio.txt describing generic MDIO properties drivers: net: add marvell MDIO driver arm: dts: Set custom names for cp110 master/slave MDIO buses drivers: net: fsl_enet_mdio: fix missing terminator in PCI ID array Bin Meng (1): Revert "net: macb: Fixed reading MII_LPA register" Florinel Iordache (1): drivers/fsl-mc: Create Kconfig file to manage driver specific configs better Heinrich Schuchardt (6): test: dm_mdio: avoid out of bounds access drivers: net: pfe_eth: undefined return value network: set timeline for CONFIG_DM_ETH conversion env: net: U_BOOT_ENV_CALLBACKs should not depend on CMD_NET net: nfs: remove superfluous conversions net: nfs: remove superfluous packed attribute Joe Hershberger (3): net: Fix Covarity Defect 244093 net: mdio: Clarify code flow Covarity 244085 & 244090 Revert "drivers: net: driver for MDIO muxes controlled over I2C" Matt Pelland (1): net: mvpp2: support setting hardware addresses from ethernet core Michael Walle (1): net: make net_random_ethaddr() more random Patrick Delaunay (2): net: dwc_eth_qos: Change eqos_ops function to static net: dwc_et_qos: update weak function board_interface_eth_init Ralph Siemsen (1): net: designware: drop compatible altr, socfpga-stmmac Ramon Fried (3): net: introduce packet capture support doc: pcap: add pcap cmd documentation configs: sandbox: enable PCAP capture cmd Stefan Roese (1): net: macb: Fix rx buffer cache handling liucheng (G) (5): CVE: net: fix unbounded memcpy of UDP packet CVE: nfs: fix stack-based buffer overflow in some nfs_handler reply helper functions CVE-2019-14194/CVE-2019-14198: nfs: fix unbounded memcpy with a failed length check at nfs_read_reply CVE-2019-14195: nfs: fix unbounded memcpy with unvalidated length at nfs_readlink_reply CVE-2019-14196: nfs: fix unbounded memcpy with a failed length check at nfs_lookup_reply Makefile | 11 ++ arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 17 -- arch/arm/dts/armada-cp110-master.dtsi | 1 + arch/arm/dts/armada-cp110-slave.dtsi | 1 + board/st/stm32mp1/stm32mp1.c | 16 +- cmd/Kconfig | 7 + cmd/Makefile | 1 + cmd/mdio.c | 3 +- cmd/pcap.c | 71 ++++++++ configs/sandbox_defconfig | 1 + doc/README.pcap | 62 +++++++ doc/device-tree-bindings/net/marvell-mdio.txt | 15 ++ doc/device-tree-bindings/net/mdio.txt | 36 ++++ doc/driver-model/migration.rst | 8 + drivers/net/Kconfig | 11 ++ drivers/net/Makefile | 1 + drivers/net/designware.c | 1 - drivers/net/dwc_eth_qos.c | 28 +-- drivers/net/fsl-mc/Kconfig | 25 +++ drivers/net/fsl_enetc_mdio.c | 1 + drivers/net/macb.c | 8 +- drivers/net/mdio_mux_i2creg.c | 108 ++++++++++++ drivers/net/mdio_sandbox.c | 4 +- drivers/net/mvmdio.c | 236 ++++++++++++++++++++++++++ drivers/net/mvpp2.c | 8 + drivers/net/pfe_eth/pfe_mdio.c | 3 +- include/env_callback.h | 2 +- include/env_flags.h | 2 +- include/net.h | 2 +- include/net/pcap.h | 55 ++++++ include/netdev.h | 3 + net/Makefile | 1 + net/eth-uclass.c | 5 + net/eth_legacy.c | 10 +- net/mdio-uclass.c | 13 +- net/net.c | 14 ++ net/nfs.c | 19 ++- net/nfs.h | 2 +- net/pcap.c | 156 +++++++++++++++++ 39 files changed, 911 insertions(+), 57 deletions(-) create mode 100644 cmd/pcap.c create mode 100644 doc/README.pcap create mode 100644 doc/device-tree-bindings/net/marvell-mdio.txt create mode 100644 doc/device-tree-bindings/net/mdio.txt create mode 100644 drivers/net/fsl-mc/Kconfig create mode 100644 drivers/net/mdio_mux_i2creg.c create mode 100644 drivers/net/mvmdio.c create mode 100644 include/net/pcap.h create mode 100644 net/pcap.c Thanks! -Joe