Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

tools/lib/bpf/ringbuf.c
  927cbb478adf ("libbpf: Handle size overflow for ringbuf mmap")
  b486d19a0ab0 ("libbpf: checkpatch: Fixed code alignments in ringbuf.c")
https://lore.kernel.org/all/20221121122707.44d1446a@canb.auug.org.au/

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/can/m_can/m_can.c
Simple merge

diff --cc drivers/net/ethernet/altera/altera_tse_main.c
Simple merge

diff --cc drivers/net/ethernet/cavium/liquidio/lio_main.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fec_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/iavf/iavf_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_ptp.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
Simple merge

diff --cc drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
Simple merge

diff --cc drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
Simple merge

diff --cc drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h
Simple merge

diff --cc drivers/net/ethernet/marvell/prestera/prestera_main.c
Simple merge

diff --cc drivers/net/ethernet/mediatek/mtk_eth_soc.c
Simple merge

diff --cc drivers/net/ethernet/mediatek/mtk_ppe.c
Simple merge

diff --cc drivers/net/ethernet/mediatek/mtk_ppe.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/steering/dr_table.c
Simple merge

diff --cc drivers/net/ethernet/microchip/sparx5/sparx5_tc.c
Simple merge

diff --cc drivers/net/ethernet/netronome/nfp/nfp_devlink.c
Simple merge

diff --cc drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/net/ethernet/ti/am65-cpsw-nuss.c
Simple merge

diff --cc drivers/net/ipvlan/ipvlan_main.c
Simple merge

diff --cc drivers/net/loopback.c
Simple merge

diff --cc drivers/net/macsec.c
Simple merge

diff --cc drivers/net/phy/phylink.c
Simple merge

diff --cc drivers/net/tun.c
Simple merge

diff --cc drivers/net/usb/cdc_ncm.c
Simple merge

diff --cc drivers/net/usb/qmi_wwan.c
Simple merge

diff --cc drivers/net/virtio_net.c
Simple merge

diff --cc drivers/nfc/nfcmrvl/i2c.c
Simple merge

diff --cc kernel/bpf/bpf_local_storage.c
Simple merge

diff --cc kernel/trace/ftrace.c
Simple merge

diff --cc net/core/flow_dissector.c
Simple merge

diff --cc net/dccp/ipv6.c
Simple merge

diff --cc net/dccp/proto.c
Simple merge

diff --cc net/ipv4/af_inet.c
Simple merge

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

diff --cc net/ipv6/tcp_ipv6.c
Simple merge

diff --cc net/mptcp/protocol.c
Simple merge

diff --cc net/mptcp/subflow.c
Simple merge

diff --cc net/netfilter/nf_conntrack_core.c
Simple merge

diff --cc net/netfilter/nf_tables_api.c
Simple merge

diff --cc net/netfilter/nft_ct.c
Simple merge

diff --cc net/nfc/nci/core.c
Simple merge

diff --cc net/openvswitch/conntrack.c
Simple merge

diff --cc net/packet/af_packet.c
Simple merge

diff --cc net/rxrpc/ar-internal.h
Simple merge

diff --cc net/rxrpc/conn_client.c
Simple merge

diff --cc net/sched/act_ct.c
Simple merge

diff --cc net/wireless/scan.c
Simple merge

diff --cc tools/lib/bpf/libbpf.c
Simple merge

diff --cc tools/lib/bpf/libbpf_probes.c
Simple merge

diff --cc tools/lib/bpf/ringbuf.c
index 51808c5,6af1429..47855af
--- 1/tools/lib/bpf/ringbuf.c
--- 2/tools/lib/bpf/ringbuf.c
+++ b/tools/lib/bpf/ringbuf.c
@@@ -128,9 -128,13 +128,13 @@@ int ring_buffer__add(struct ring_buffe
        /* Map read-only producer page and data pages. We map twice as big
         * data size to allow simple reading of samples that wrap around the
         * end of a ring buffer. See kernel implementation for details.
 -       * */
 +       */
-       tmp = mmap(NULL, rb->page_size + 2 * info.max_entries, PROT_READ,
-                  MAP_SHARED, map_fd, rb->page_size);
+       mmap_sz = rb->page_size + 2 * (__u64)info.max_entries;
+       if (mmap_sz != (__u64)(size_t)mmap_sz) {
+               pr_warn("ringbuf: ring buffer size (%u) is too big\n", info.max_entries);
+               return libbpf_err(-E2BIG);
+       }
+       tmp = mmap(NULL, (size_t)mmap_sz, PROT_READ, MAP_SHARED, map_fd, rb->page_size);
        if (tmp == MAP_FAILED) {
                err = -errno;
                ringbuf_unmap_ring(rb, r);

diff --cc tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c
Simple merge

diff --cc tools/testing/selftests/net/mptcp/simult_flows.sh
Simple merge