Skip to content
  1. Oct 03, 2023
    • Ilya Maximets's avatar
      ipv6: tcp: add a missing nf_reset_ct() in 3WHS handling · 9593c7cb
      Ilya Maximets authored
      Commit b0e214d2 ("netfilter: keep conntrack reference until
      IPsecv6 policy checks are done") is a direct copy of the old
      commit b59c2701 ("[NETFILTER]: Keep conntrack reference until
      IPsec policy checks are done") but for IPv6.  However, it also
      copies a bug that this old commit had.  That is: when the third
      packet of 3WHS connection establishment contains payload, it is
      added into socket receive queue without the XFRM check and the
      drop of connection tracking context.
      
      That leads to nf_conntrack module being impossible to unload as
      it waits for all the conntrack references to be dropped while
      the packet release is deferred in per-cpu cache indefinitely, if
      not consumed by the application.
      
      The issue for IPv4 was fixed in commit 6f0012e3 ("tcp: add a
      missing nf_reset_ct() in 3WHS handling") by adding a missing XFRM
      check and correctly dropping the conntrack context.  However, the
      issue was introduced to IPv6 code afterwards.  Fixing it the
      same way for IPv6 now.
      
      Fixes: b0e214d2 ("netfilter: keep conntrack reference until IPsecv6 policy checks are done")
      Link: https://lore.kernel.org/netdev/d589a999-d4dd-2768-b2d5-89dec64a4a42@ovn.org/
      
      
      Signed-off-by: default avatarIlya Maximets <i.maximets@ovn.org>
      Acked-by: default avatarFlorian Westphal <fw@strlen.de>
      Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
      Link: https://lore.kernel.org/r/20230922210530.2045146-1-i.maximets@ovn.org
      
      
      Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
      9593c7cb
    • Hangbin Liu's avatar
      ipv4/fib: send notify when delete source address routes · 4b2b6060
      Hangbin Liu authored
      After deleting an interface address in fib_del_ifaddr(), the function
      scans the fib_info list for stray entries and calls fib_flush() and
      fib_table_flush(). Then the stray entries will be deleted silently and no
      RTM_DELROUTE notification will be sent.
      
      This lack of notification can make routing daemons, or monitor like
      `ip monitor route` miss the routing changes. e.g.
      
      + ip link add dummy1 type dummy
      + ip link add dummy2 type dummy
      + ip link set dummy1 up
      + ip link set dummy2 up
      + ip addr add 192.168.5.5/24 dev dummy1
      + ip route add 7.7.7.0/24 dev dummy2 src 192.168.5.5
      + ip -4 route
      7.7.7.0/24 dev dummy2 scope link src 192.168.5.5
      192.168.5.0/24 dev dummy1 proto kernel scope link src 192.168.5.5
      + ip monitor route
      + ip addr del 192.168.5.5/24 dev dummy1
      Deleted 192.168.5.0/24 dev dummy1 proto kernel scope link src 192.168.5.5
      Deleted broadcast 192.168.5.255 dev dummy1 table local proto kernel scope link src 192.168.5.5
      Deleted local 192.168.5.5 dev dummy1 table local proto kernel scope host src 192.168.5.5
      
      As Ido reminded, fib_table_flush() isn't only called when an address is
      deleted, but also when an interface is deleted or put down. The lack of
      notification in these cases is deliberate. And commit 7c6bb7d2
      
      
      ("net/ipv6: Add knob to skip DELROUTE message on device down") introduced
      a sysctl to make IPv6 behave like IPv4 in this regard. So we can't send
      the route delete notify blindly in fib_table_flush().
      
      To fix this issue, let's add a new flag in "struct fib_info" to track the
      deleted prefer source address routes, and only send notify for them.
      
      After update:
      + ip monitor route
      + ip addr del 192.168.5.5/24 dev dummy1
      Deleted 192.168.5.0/24 dev dummy1 proto kernel scope link src 192.168.5.5
      Deleted broadcast 192.168.5.255 dev dummy1 table local proto kernel scope link src 192.168.5.5
      Deleted local 192.168.5.5 dev dummy1 table local proto kernel scope host src 192.168.5.5
      Deleted 7.7.7.0/24 dev dummy2 scope link src 192.168.5.5
      
      Suggested-by: default avatarThomas Haller <thaller@redhat.com>
      Signed-off-by: default avatarHangbin Liu <liuhangbin@gmail.com>
      Acked-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
      Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
      Link: https://lore.kernel.org/r/20230922075508.848925-1-liuhangbin@gmail.com
      
      
      Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
      4b2b6060
  2. Oct 02, 2023
  3. Oct 01, 2023
    • Eric Dumazet's avatar
      net: fix possible store tearing in neigh_periodic_work() · 25563b58
      Eric Dumazet authored
      While looking at a related syzbot report involving neigh_periodic_work(),
      I found that I forgot to add an annotation when deleting an
      RCU protected item from a list.
      
      Readers use rcu_deference(*np), we need to use either
      rcu_assign_pointer() or WRITE_ONCE() on writer side
      to prevent store tearing.
      
      I use rcu_assign_pointer() to have lockdep support,
      this was the choice made in neigh_flush_dev().
      
      Fixes: 767e97e1
      
       ("neigh: RCU conversion of struct neighbour")
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
      Reviewed-by: default avatarSimon Horman <horms@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      25563b58
    • David S. Miller's avatar
      Merge tag 'for-net-2023-09-20' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth · c15cd642
      David S. Miller authored
      
      
      bluetooth pull request for net:
      
       - Fix handling of HCI_QUIRK_STRICT_DUPLICATE_FILTER
       - Fix handling of listen for ISO unicast
       - Fix build warnings
       - Fix leaking content of local_codecs
       - Add shutdown function for QCA6174
       - Delete unused hci_req_prepare_suspend() declaration
       - Fix hci_link_tx_to RCU lock usage
       - Avoid redundant authentication
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c15cd642
    • Clark Wang's avatar
      net: stmmac: platform: fix the incorrect parameter · 6b09edc1
      Clark Wang authored
      The second parameter of stmmac_pltfr_init() needs the pointer of
      "struct plat_stmmacenet_data". So, correct the parameter typo when calling the
      function.
      
      Otherwise, it may cause this alignment exception when doing suspend/resume.
      [   49.067201] CPU1 is up
      [   49.135258] Internal error: SP/PC alignment exception: 000000008a000000 [#1] PREEMPT SMP
      [   49.143346] Modules linked in: soc_imx9 crct10dif_ce polyval_ce nvmem_imx_ocotp_fsb_s400 polyval_generic layerscape_edac_mod snd_soc_fsl_asoc_card snd_soc_imx_audmux snd_soc_imx_card snd_soc_wm8962 el_enclave snd_soc_fsl_micfil rtc_pcf2127 rtc_pcf2131 flexcan can_dev snd_soc_fsl_xcvr snd_soc_fsl_sai imx8_media_dev(C) snd_soc_fsl_utils fuse
      [   49.173393] CPU: 0 PID: 565 Comm: sh Tainted: G         C         6.5.0-rc4-next-20230804-05047-g5781a6249dae #677
      [   49.183721] Hardware name: NXP i.MX93 11X11 EVK board (DT)
      [   49.189190] pstate: 60400009 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
      [   49.196140] pc : 0x80800052
      [   49.198931] lr : stmmac_pltfr_resume+0x34/0x50
      [   49.203368] sp : ffff800082f8bab0
      [   49.206670] x29: ffff800082f8bab0 x28: ffff0000047d0ec0 x27: ffff80008186c170
      [   49.213794] x26: 0000000b5e4ff1ba x25: ffff800081e5fa74 x24: 0000000000000010
      [   49.220918] x23: ffff800081fe0000 x22: 0000000000000000 x21: 0000000000000000
      [   49.228042] x20: ffff0000001b4010 x19: ffff0000001b4010 x18: 0000000000000006
      [   49.235166] x17: ffff7ffffe007000 x16: ffff800080000000 x15: 0000000000000000
      [   49.242290] x14: 00000000000000fc x13: 0000000000000000 x12: 0000000000000000
      [   49.249414] x11: 0000000000000001 x10: 0000000000000a60 x9 : ffff800082f8b8c0
      [   49.256538] x8 : 0000000000000008 x7 : 0000000000000001 x6 : 000000005f54a200
      [   49.263662] x5 : 0000000001000000 x4 : ffff800081b93680 x3 : ffff800081519be0
      [   49.270786] x2 : 0000000080800052 x1 : 0000000000000000 x0 : ffff0000001b4000
      [   49.277911] Call trace:
      [   49.280346]  0x80800052
      [   49.282781]  platform_pm_resume+0x2c/0x68
      [   49.286785]  dpm_run_callback.constprop.0+0x74/0x134
      [   49.291742]  device_resume+0x88/0x194
      [   49.295391]  dpm_resume+0x10c/0x230
      [   49.298866]  dpm_resume_end+0x18/0x30
      [   49.302515]  suspend_devices_and_enter+0x2b8/0x624
      [   49.307299]  pm_suspend+0x1fc/0x348
      [   49.310774]  state_store+0x80/0x104
      [   49.314258]  kobj_attr_store+0x18/0x2c
      [   49.318002]  sysfs_kf_write+0x44/0x54
      [   49.321659]  kernfs_fop_write_iter+0x120/0x1ec
      [   49.326088]  vfs_write+0x1bc/0x300
      [   49.329485]  ksys_write+0x70/0x104
      [   49.332874]  __arm64_sys_write+0x1c/0x28
      [   49.336783]  invoke_syscall+0x48/0x114
      [   49.340527]  el0_svc_common.constprop.0+0xc4/0xe4
      [   49.345224]  do_el0_svc+0x38/0x98
      [   49.348526]  el0_svc+0x2c/0x84
      [   49.351568]  el0t_64_sync_handler+0x100/0x12c
      [   49.355910]  el0t_64_sync+0x190/0x194
      [   49.359567] Code: ???????? ???????? ???????? ???????? (????????)
      [   49.365644] ---[ end trace 0000000000000000 ]---
      
      Fixes: 97117eb5
      
       ("net: stmmac: platform: provide stmmac_pltfr_init()")
      Signed-off-by: default avatarClark Wang <xiaoning.wang@nxp.com>
      Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
      Reviewed-by: default avatarSerge Semin <fancer.lancer@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6b09edc1
  4. Sep 28, 2023
    • Michal Schmidt's avatar
      ice: always add legacy 32byte RXDID in supported_rxdids · c070e51d
      Michal Schmidt authored
      When the PF and VF drivers both support flexible rx descriptors and have
      negotiated the VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC capability, the VF driver
      queries the PF for the list of supported descriptor formats
      (VIRTCHNL_OP_GET_SUPPORTED_RXDIDS). The PF driver is supposed to set the
      supported_rxdids bits that correspond to the descriptor formats the
      firmware implements. The legacy 32-byte rx desc format is always
      supported, even though it is not expressed in GLFLXP_RXDID_FLAGS.
      
      The ice driver does not advertise the legacy 32-byte rx desc support,
      which leads to this failure to bring up the VF using the Intel
      out-of-tree iavf driver:
       iavf 0000:41:01.0: PF does not list support for default Rx descriptor format
       ...
       iavf 0000:41:01.0: PF returned error -5 (VIRTCHNL_STATUS_ERR_PARAM) to our request 6
      
      The in-tree iavf driver does not expose this bug, because it does not
      yet implement VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC.
      
      The ice driver must always set the ICE_RXDID_LEGACY_1 bit in
      supported_rxdids. The Intel out-of-tree ice driver and the ice driver in
      DPDK both do this.
      
      I copied this piece of the code and the comment text from the Intel
      out-of-tree driver.
      
      Fixes: e753df8f
      
       ("ice: Add support Flex RXD")
      Signed-off-by: default avatarMichal Schmidt <mschmidt@redhat.com>
      Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
      Link: https://lore.kernel.org/r/20230920115439.61172-1-mschmidt@redhat.com
      
      
      Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
      c070e51d
  5. Sep 22, 2023
    • Alexandra Diupina's avatar
      drivers/net: process the result of hdlc_open() and add call of hdlc_close() in uhdlc_close() · a59addac
      Alexandra Diupina authored
      Process the result of hdlc_open() and call uhdlc_close()
      in case of an error. It is necessary to pass the error
      code up the control flow, similar to a possible
      error in request_irq().
      Also add a hdlc_close() call to the uhdlc_close()
      because the comment to hdlc_close() says it must be called
      by the hardware driver when the HDLC device is being closed
      
      Found by Linux Verification Center (linuxtesting.org) with SVACE.
      
      Fixes: c19b6d24
      
       ("drivers/net: support hdlc function for QE-UCC")
      Signed-off-by: default avatarAlexandra Diupina <adiupina@astralinux.ru>
      Reviewed-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a59addac
    • Linus Torvalds's avatar
      Merge tag 'net-6.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · 27bbf45e
      Linus Torvalds authored
      Pull networking fixes from Paolo Abeni:
       "Including fixes from netfilter and bpf.
      
        Current release - regressions:
      
         - bpf: adjust size_index according to the value of KMALLOC_MIN_SIZE
      
         - netfilter: fix entries val in rule reset audit log
      
         - eth: stmmac: fix incorrect rxq|txq_stats reference
      
        Previous releases - regressions:
      
         - ipv4: fix null-deref in ipv4_link_failure
      
         - netfilter:
            - fix several GC related issues
            - fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP
      
         - eth: team: fix null-ptr-deref when team device type is changed
      
         - eth: i40e: fix VF VLAN offloading when port VLAN is configured
      
         - eth: ionic: fix 16bit math issue when PAGE_SIZE >= 64KB
      
        Previous releases - always broken:
      
         - core: fix ETH_P_1588 flow dissector
      
         - mptcp: fix several connection hang-up conditions
      
         - bpf:
            - avoid deadlock when using queue and stack maps from NMI
            - add override check to kprobe multi link attach
      
         - hsr: properly parse HSRv1 supervisor frames.
      
         - eth: igc: fix infinite initialization loop with early XDP redirect
      
         - eth: octeon_ep: fix tx dma unmap len values in SG
      
         - eth: hns3: fix GRE checksum offload issue"
      
      * tag 'net-6.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (87 commits)
        sfc: handle error pointers returned by rhashtable_lookup_get_insert_fast()
        igc: Expose tx-usecs coalesce setting to user
        octeontx2-pf: Do xdp_do_flush() after redirects.
        bnxt_en: Flush XDP for bnxt_poll_nitroa0()'s NAPI
        net: ena: Flush XDP packets on error.
        net/handshake: Fix memory leak in __sock_create() and sock_alloc_file()
        net: hinic: Fix warning-hinic_set_vlan_fliter() warn: variable dereferenced before check 'hwdev'
        netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP
        netfilter: nf_tables: fix memleak when more than 255 elements expired
        netfilter: nf_tables: disable toggling dormant table state more than once
        vxlan: Add missing entries to vxlan_get_size()
        net: rds: Fix possible NULL-pointer dereference
        team: fix null-ptr-deref when team device type is changed
        net: bridge: use DEV_STATS_INC()
        net: hns3: add 5ms delay before clear firmware reset irq source
        net: hns3: fix fail to delete tc flower rules during reset issue
        net: hns3: only enable unicast promisc when mac table full
        net: hns3: fix GRE checksum offload issue
        net: hns3: add cmdq check for vf periodic service task
        net: stmmac: fix incorrect rxq|txq_stats reference
        ...
      27bbf45e
    • Linus Torvalds's avatar
      Merge tag 'v6.6-rc3.vfs.ctime.revert' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs · b5cbe7c0
      Linus Torvalds authored
      Pull finegrained timestamp reverts from Christian Brauner:
       "Earlier this week we sent a few minor fixes for the multi-grained
        timestamp work in [1]. While we were polishing those up after Linus
        realized that there might be a nicer way to fix them we received a
        regression report in [2] that fine grained timestamps break gnulib
        tests and thus possibly other tools.
      
        The kernel will elide fine-grain timestamp updates when no one is
        actively querying for them to avoid performance impacts. So a sequence
        like write(f1) stat(f2) write(f2) stat(f2) write(f1) stat(f1) may
        result in timestamp f1 to be older than the final f2 timestamp even
        though f1 was last written too but the second write didn't update the
        timestamp.
      
        Such plotholes can lead to subtle bugs when programs compare
        timestamps. For example, the nap() function in [2] will estimate that
        it needs to wait one ns on a fine-grain timestamp enabled filesytem
        between subsequent calls to observe a timestamp change. But in general
        we don't update timestamps with more than one jiffie if we think that
        no one is actively querying for fine-grain timestamps to avoid
        performance impacts.
      
        While discussing various fixes the decision was to go back to the
        drawing board and ultimately to explore a solution that involves only
        exposing such fine-grained timestamps to nfs internally and never to
        userspace.
      
        As there are multiple solutions discussed the honest thing to do here
        is not to fix this up or disable it but to cleanly revert. The general
        infrastructure will probably come back but there is no reason to keep
        this code in mainline.
      
        The general changes to timestamp handling are valid and a good cleanup
        that will stay. The revert is fully bisectable"
      
      Link: https://lore.kernel.org/all/20230918-hirte-neuzugang-4c2324e7bae3@brauner [1]
      Link: https://lore.kernel.org/all/bf0524debb976627693e12ad23690094e4514303.camel@linuxfromscratch.org [2]
      
      * tag 'v6.6-rc3.vfs.ctime.revert' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs:
        Revert "fs: add infrastructure for multigrain timestamps"
        Revert "btrfs: convert to multigrain timestamps"
        Revert "ext4: switch to multigrain timestamps"
        Revert "xfs: switch to multigrain timestamps"
        Revert "tmpfs: add support for multigrain timestamps"
      b5cbe7c0
  6. Sep 21, 2023
    • Linus Torvalds's avatar
      Merge tag 'powerpc-6.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · 7bdfc1af
      Linus Torvalds authored
      Pull powerpc fixes from Michael Ellerman:
      
       - A fix for breakpoint handling which was using get_user() while atomic
      
       - Fix the Power10 HASHCHK handler which was using get_user() while
         atomic
      
       - A few build fixes for issues caused by recent changes
      
      Thanks to Benjamin Gray, Christophe Leroy, Kajol Jain, and Naveen N Rao.
      
      * tag 'powerpc-6.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
        powerpc/dexcr: Move HASHCHK trap handler
        powerpc/82xx: Select FSL_SOC
        powerpc: Fix build issue with LD_DEAD_CODE_DATA_ELIMINATION and FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY
        powerpc/watchpoints: Annotate atomic context in more places
        powerpc/watchpoint: Disable pagefaults when getting user instruction
        powerpc/watchpoints: Disable preemption in thread_change_pc()
        powerpc/perf/hv-24x7: Update domain value check
      7bdfc1af
    • Linus Torvalds's avatar
      Merge tag 'for-linus-6.6a-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 88a174a9
      Linus Torvalds authored
      Pull xen fixes from Juergen Gross:
      
       - remove some unused functions in the Xen event channel handling
      
       - fix a regression (introduced during the merge window) when booting as
         Xen PV guest
      
       - small cleanup removing another strncpy() instance
      
      * tag 'for-linus-6.6a-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen/efi: refactor deprecated strncpy
        x86/xen: allow nesting of same lazy mode
        x86/xen: move paravirt lazy code
        arm/xen: remove lazy mode related definitions
        xen: simplify evtchn_do_upcall() call maze
      88a174a9
    • Linus Torvalds's avatar
      Merge tag 'fixes-2023-09-21' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock · fb8b1b93
      Linus Torvalds authored
      Pull memblock test fixes from Mike Rapoport:
       "Fix several compilation errors and warnings in memblock tests"
      
      * tag 'fixes-2023-09-21' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
        memblock tests: fix warning ‘struct seq_file’ declared inside parameter list
        memblock tests: fix warning: "__ALIGN_KERNEL" redefined
        memblock tests: Fix compilation errors.
      fb8b1b93
    • Linus Torvalds's avatar
      Merge tag 'sound-6.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 2af5acba
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "A large collection of fixes around this time.
      
        All small and mostly trivial fixes.
      
         - Lots of fixes for the new -Wformat-truncation warnings
      
         - A fix in ALSA rawmidi core regression and UMP handling
      
         - Series of Cirrus codec fixes
      
         - ASoC Intel and Realtek codec fixes
      
         - Usual HD- and USB-audio quirks and AMD ASoC quirks"
      
      * tag 'sound-6.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (64 commits)
        ALSA: hda/realtek - ALC287 Realtek I2S speaker platform support
        ALSA: hda: cs35l56: Use the new RUNTIME_PM_OPS() macro
        ALSA: usb-audio: scarlett_gen2: Fix another -Wformat-truncation warning
        ALSA: rawmidi: Fix NULL dereference at proc read
        ASoC: SOF: core: Only call sof_ops_free() on remove if the probe was successful
        ASoC: SOF: Intel: MTL: Reduce the DSP init timeout
        ASoC: cs42l43: Add shared IRQ flag for shutters
        ASoC: imx-audmix: Fix return error with devm_clk_get()
        ASoC: hdaudio.c: Add missing check for devm_kstrdup
        ALSA: riptide: Fix -Wformat-truncation warning for longname string
        ALSA: cs4231: Fix -Wformat-truncation warning for longname string
        ALSA: ad1848: Fix -Wformat-truncation warning for longname string
        ALSA: hda: generic: Check potential mixer name string truncation
        ALSA: cmipci: Fix -Wformat-truncation warning
        ALSA: firewire: Fix -Wformat-truncation warning for MIDI stream names
        ALSA: firewire: Fix -Wformat-truncation warning for longname string
        ALSA: xen: Fix -Wformat-truncation warning
        ALSA: opti9x: Fix -Wformat-truncation warning
        ALSA: es1688: Fix -Wformat-truncation warning
        ALSA: cs4236: Fix -Wformat-truncation warning
        ...
      2af5acba
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-v6.6-rc3' of... · b300c0fd
      Linus Torvalds authored
      Merge tag 'hwmon-for-v6.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull hwmon fix from Guenter Roeck:
       "One patch to drop a non-existent alarm attribute in the nct6775 driver"
      
      * tag 'hwmon-for-v6.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (nct6775) Fix non-existent ALARM warning
      b300c0fd
    • Paolo Abeni's avatar
      Merge tag 'nf-23-09-20' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf · ecf43926
      Paolo Abeni authored
      Florian Westphal says:
      
      ====================
      netfilter updates for net
      
      The following three patches fix regressions in the netfilter subsystem:
      
      1. Reject attempts to repeatedly toggle the 'dormant' flag in a single
         transaction.  Doing so makes nf_tables lose track of the real state
         vs. the desired state.  This ends with an attempt to unregister hooks
         that were never registered in the first place, which yields a splat.
      
      2. Fix element counting in the new nftables garbage collection infra
         that came with 6.5:  More than 255 expired elements wraps a counter
         which results in memory leak.
      
      3. Since 6.4 ipset can BUG when a set is renamed while a CREATE command
         is in progress, fix from Jozsef Kadlecsik.
      
      * tag 'nf-23-09-20' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf:
        netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP
        netfilter: nf_tables: fix memleak when more than 255 elements expired
        netfilter: nf_tables: disable toggling dormant table state more than once
      ====================
      
      Link: https://lore.kernel.org/r/20230920084156.4192-1-fw@strlen.de
      
      
      Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
      ecf43926
    • Edward Cree's avatar
      sfc: handle error pointers returned by rhashtable_lookup_get_insert_fast() · fc21f083
      Edward Cree authored
      Several places in TC offload code assumed that the return from
       rhashtable_lookup_get_insert_fast() was always either NULL or a valid
       pointer to an existing entry, but in fact that function can return an
       error pointer.  In that case, perform the usual cleanup of the newly
       created entry, then pass up the error, rather than attempting to take a
       reference on the old entry.
      
      Fixes: d902e1a7
      
       ("sfc: bare bones TC offload on EF100")
      Reported-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
      Signed-off-by: default avatarEdward Cree <ecree.xilinx@gmail.com>
      Link: https://lore.kernel.org/r/20230919183949.59392-1-edward.cree@amd.com
      
      
      Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
      fc21f083
    • Muhammad Husaini Zulkifli's avatar
      igc: Expose tx-usecs coalesce setting to user · 1703b2e0
      Muhammad Husaini Zulkifli authored
      When users attempt to obtain the coalesce setting using the
      ethtool command, current code always returns 0 for tx-usecs.
      This is because I225/6 always uses a queue pair setting, hence
      tx_coalesce_usecs does not return a value during the
      igc_ethtool_get_coalesce() callback process. The pair queue
      condition checking in igc_ethtool_get_coalesce() is removed by
      this patch so that the user gets information of the value of tx-usecs.
      
      Even if i225/6 is using queue pair setting, there is no harm in
      notifying the user of the tx-usecs. The implementation of the current
      code may have previously been a copy of the legacy code i210.
      Since I225 has the queue pair setting enabled, tx-usecs will always adhere
      to the user-set rx-usecs value. An error message will appear when the user
      attempts to set the tx-usecs value for the input parameters because,
      by default, they should only set the rx-usecs value.
      
      This patch also adds the helper function to get the
      previous rx coalesce value similar to tx coalesce.
      
      How to test:
      User can get the coalesce value using ethtool command.
      
      Example command:
      Get: ethtool -c <interface>
      
      Previous output:
      
      rx-usecs: 3
      rx-frames: n/a
      rx-usecs-irq: n/a
      rx-frames-irq: n/a
      
      tx-usecs: 0
      tx-frames: n/a
      tx-usecs-irq: n/a
      tx-frames-irq: n/a
      
      New output:
      
      rx-usecs: 3
      rx-frames: n/a
      rx-usecs-irq: n/a
      rx-frames-irq: n/a
      
      tx-usecs: 3
      tx-frames: n/a
      tx-usecs-irq: n/a
      tx-frames-irq: n/a
      
      Fixes: 8c5ad0da
      
       ("igc: Add ethtool support")
      Signed-off-by: default avatarMuhammad Husaini Zulkifli <muhammad.husaini.zulkifli@intel.com>
      Tested-by: default avatarNaama Meir <naamax.meir@linux.intel.com>
      Reviewed-by: default avatarSimon Horman <horms@kernel.org>
      Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
      Link: https://lore.kernel.org/r/20230919170331.1581031-1-anthony.l.nguyen@intel.com
      
      
      Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
      1703b2e0
    • Paolo Abeni's avatar
      Merge branch 'add-missing-xdp_do_flush-invocations' · 49dcffef
      Paolo Abeni authored
      Sebastian Andrzej Siewior says:
      
      ====================
      Add missing xdp_do_flush() invocations.
      
      I've been looking at the drivers/ XDP users and noticed that some
      XDP_REDIRECT user don't invoke xdp_do_flush() at the end.
      ====================
      
      Link: https://lore.kernel.org/r/20230918153611.165722-1-bigeasy@linutronix.de
      
      
      Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
      49dcffef
    • Sebastian Andrzej Siewior's avatar
      octeontx2-pf: Do xdp_do_flush() after redirects. · 70b2b689
      Sebastian Andrzej Siewior authored
      xdp_do_flush() should be invoked before leaving the NAPI poll function
      if XDP-redirect has been performed.
      
      Invoke xdp_do_flush() before leaving NAPI.
      
      Cc: Geetha sowjanya <gakula@marvell.com>
      Cc: Subbaraya Sundeep <sbhatta@marvell.com>
      Cc: Sunil Goutham <sgoutham@marvell.com>
      Cc: hariprasad <hkelam@marvell.com>
      Fixes: 06059a1a
      
       ("octeontx2-pf: Add XDP support to netdev PF")
      Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
      Acked-by: default avatarGeethasowjanya Akula <gakula@marvell.com>
      Acked-by: default avatarJesper Dangaard Brouer <hawk@kernel.org>
      Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
      70b2b689
    • Sebastian Andrzej Siewior's avatar
      bnxt_en: Flush XDP for bnxt_poll_nitroa0()'s NAPI · edc0140c
      Sebastian Andrzej Siewior authored
      bnxt_poll_nitroa0() invokes bnxt_rx_pkt() which can run a XDP program
      which in turn can return XDP_REDIRECT. bnxt_rx_pkt() is also used by
      __bnxt_poll_work() which flushes (xdp_do_flush()) the packets after each
      round. bnxt_poll_nitroa0() lacks this feature.
      xdp_do_flush() should be invoked before leaving the NAPI callback.
      
      Invoke xdp_do_flush() after a redirect in bnxt_poll_nitroa0() NAPI.
      
      Cc: Michael Chan <michael.chan@broadcom.com>
      Fixes: f18c2b77
      
       ("bnxt_en: optimized XDP_REDIRECT support")
      Reviewed-by: default avatarAndy Gospodarek <gospo@broadcom.com>
      Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
      Reviewed-by: default avatarMichael Chan <michael.chan@broadcom.com>
      Acked-by: default avatarJesper Dangaard Brouer <hawk@kernel.org>
      Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
      edc0140c
    • Sebastian Andrzej Siewior's avatar
      net: ena: Flush XDP packets on error. · 6f411fb5
      Sebastian Andrzej Siewior authored
      xdp_do_flush() should be invoked before leaving the NAPI poll function
      after a XDP-redirect. This is not the case if the driver leaves via
      the error path (after having a redirect in one of its previous
      iterations).
      
      Invoke xdp_do_flush() also in the error path.
      
      Cc: Arthur Kiyanovski <akiyano@amazon.com>
      Cc: David Arinzon <darinzon@amazon.com>
      Cc: Noam Dagan <ndagan@amazon.com>
      Cc: Saeed Bishara <saeedb@amazon.com>
      Cc: Shay Agroskin <shayagr@amazon.com>
      Fixes: a318c70a
      
       ("net: ena: introduce XDP redirect implementation")
      Acked-by: default avatarArthur Kiyanovski <akiyano@amazon.com>
      Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
      Acked-by: default avatarJesper Dangaard Brouer <hawk@kernel.org>
      Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
      6f411fb5
    • Linus Torvalds's avatar
      Merge tag 'media/v6.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 42dc8149
      Linus Torvalds authored
      Pull media fixes from Mauro Carvalho Chehab:
      
       - driver fixes due to incorrect fwnode_handle_put() call
      
       - bt8xx: bttv_risc_packed(): remove field checks
      
       - vb2: frame_vector.c: replace WARN_ONCE with a comment
      
       - imx219: a couple typo fixes and perform a full mode set
         unconditionally
      
       - uvcvideo: Fix OOB read
      
       - some dependency fixes
      
      * tag 'media/v6.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
        media: imx-mipi-csis: Remove an incorrect fwnode_handle_put() call
        media: vb2: frame_vector.c: replace WARN_ONCE with a comment
        media: uvcvideo: Fix OOB read
        media: bt8xx: bttv_risc_packed(): remove field checks
        media: i2c: rdacm21: Remove an incorrect fwnode_handle_put() call
        media: i2c: imx219: Perform a full mode set unconditionally
        media: i2c: imx219: Fix crop rectangle setting when changing format
        media: i2c: imx219: Fix a typo referring to a wrong variable
        media: i2c: max9286: Remove an incorrect fwnode_handle_put() call
        media: ivsc: Depend on VIDEO_DEV
        media: via: Use correct dependency for camera sensor drivers
        media: v4l: Use correct dependency for camera sensor drivers
        media: pci: ivsc: Select build dependencies
      42dc8149
    • Linus Torvalds's avatar
      Merge tag 'for-6.6-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux · a229cf67
      Linus Torvalds authored
      Pull btrfs fixes from David Sterba:
       "A few more followup fixes to the directory listing.
      
        People have noticed different behaviour compared to other filesystems
        after changes in 6.5. This is now unified to more "logical" and
        expected behaviour while still within POSIX. And a few more fixes for
        stable.
      
         - change behaviour of readdir()/rewinddir() when new directory
           entries are created after opendir(), properly tracking the last
           entry
      
         - fix race in readdir when multiple threads can set the last entry
           index for a directory
      
        Additionally:
      
         - use exclusive lock when direct io might need to drop privs and call
           notify_change()
      
         - don't clear uptodate bit on page after an error, this may lead to a
           deadlock in subpage mode
      
         - fix waiting pattern when multiple readers block on Merkle tree
           data, switch to folios"
      
      * tag 'for-6.6-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
        btrfs: fix race between reading a directory and adding entries to it
        btrfs: refresh dir last index during a rewinddir(3) call
        btrfs: set last dir index to the current last index when opening dir
        btrfs: don't clear uptodate on write errors
        btrfs: file_remove_privs needs an exclusive lock in direct io write
        btrfs: convert btrfs_read_merkle_tree_page() to use a folio
      a229cf67
    • Luiz Augusto von Dentz's avatar
      Bluetooth: hci_codec: Fix leaking content of local_codecs · b938790e
      Luiz Augusto von Dentz authored
      The following memory leak can be observed when the controller supports
      codecs which are stored in local_codecs list but the elements are never
      freed:
      
      unreferenced object 0xffff88800221d840 (size 32):
        comm "kworker/u3:0", pid 36, jiffies 4294898739 (age 127.060s)
        hex dump (first 32 bytes):
          f8 d3 02 03 80 88 ff ff 80 d8 21 02 80 88 ff ff  ..........!.....
          00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
        backtrace:
          [<ffffffffb324f557>] __kmalloc+0x47/0x120
          [<ffffffffb39ef37d>] hci_codec_list_add.isra.0+0x2d/0x160
          [<ffffffffb39ef643>] hci_read_codec_capabilities+0x183/0x270
          [<ffffffffb39ef9ab>] hci_read_supported_codecs+0x1bb/0x2d0
          [<ffffffffb39f162e>] hci_read_local_codecs_sync+0x3e/0x60
          [<ffffffffb39ff1b3>] hci_dev_open_sync+0x943/0x11e0
          [<ffffffffb396d55d>] hci_power_on+0x10d/0x3f0
          [<ffffffffb30c99b4>] process_one_work+0x404/0x800
          [<ffffffffb30ca134>] worker_thread+0x374/0x670
          [<ffffffffb30d9108>] kthread+0x188/0x1c0
          [<ffffffffb304db6b>] ret_from_fork+0x2b/0x50
          [<ffffffffb300206a>] ret_from_fork_asm+0x1a/0x30
      
      Cc: stable@vger.kernel.org
      Fixes: 8961987f
      
       ("Bluetooth: Enumerate local supported codec and cache details")
      Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
      b938790e
    • Luiz Augusto von Dentz's avatar
      Bluetooth: hci_core: Fix build warnings · dcda1657
      Luiz Augusto von Dentz authored
      
      
      This fixes the following warnings:
      
      net/bluetooth/hci_core.c: In function ‘hci_register_dev’:
      net/bluetooth/hci_core.c:2620:54: warning: ‘%d’ directive output may
      be truncated writing between 1 and 10 bytes into a region of size 5
      [-Wformat-truncation=]
       2620 |         snprintf(hdev->name, sizeof(hdev->name), "hci%d", id);
            |                                                      ^~
      net/bluetooth/hci_core.c:2620:50: note: directive argument in the range
      [0, 2147483647]
       2620 |         snprintf(hdev->name, sizeof(hdev->name), "hci%d", id);
            |                                                  ^~~~~~~
      net/bluetooth/hci_core.c:2620:9: note: ‘snprintf’ output between 5 and
      14 bytes into a destination of size 8
       2620 |         snprintf(hdev->name, sizeof(hdev->name), "hci%d", id);
            |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      
      Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
      dcda1657
    • Ying Hsu's avatar
      Bluetooth: Avoid redundant authentication · 1d8e8014
      Ying Hsu authored
      While executing the Android 13 CTS Verifier Secure Server test on a
      ChromeOS device, it was observed that the Bluetooth host initiates
      authentication for an RFCOMM connection after SSP completes.
      When this happens, some Intel Bluetooth controllers, like AC9560, would
      disconnect with "Connection Rejected due to Security Reasons (0x0e)".
      
      Historically, BlueZ did not mandate this authentication while an
      authenticated combination key was already in use for the connection.
      This behavior was changed since commit 7b5a9241
      
      
      ("Bluetooth: Introduce requirements for security level 4").
      So, this patch addresses the aforementioned disconnection issue by
      restoring the previous behavior.
      
      Signed-off-by: default avatarYing Hsu <yinghsu@chromium.org>
      Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
      1d8e8014
    • Luiz Augusto von Dentz's avatar
      Bluetooth: ISO: Fix handling of listen for unicast · e0275ea5
      Luiz Augusto von Dentz authored
      iso_listen_cis shall only return -EADDRINUSE if the listening socket has
      the destination set to BDADDR_ANY otherwise if the destination is set to
      a specific address it is for broadcast which shall be ignored.
      
      Fixes: f764a6c2
      
       ("Bluetooth: ISO: Add broadcast support")
      Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
      e0275ea5
    • Ying Hsu's avatar
      Bluetooth: Fix hci_link_tx_to RCU lock usage · c7eaf80b
      Ying Hsu authored
      Syzbot found a bug "BUG: sleeping function called from invalid context
      at kernel/locking/mutex.c:580". It is because hci_link_tx_to holds an
      RCU read lock and calls hci_disconnect which would hold a mutex lock
      since the commit a13f316e ("Bluetooth: hci_conn: Consolidate code
      for aborting connections"). Here's an example call trace:
      
         __dump_stack lib/dump_stack.c:88 [inline]
         dump_stack_lvl+0xfc/0x174 lib/dump_stack.c:106
         ___might_sleep+0x4a9/0x4d3 kernel/sched/core.c:9663
         __mutex_lock_common kernel/locking/mutex.c:576 [inline]
         __mutex_lock+0xc7/0x6e7 kernel/locking/mutex.c:732
         hci_cmd_sync_queue+0x3a/0x287 net/bluetooth/hci_sync.c:388
         hci_abort_conn+0x2cd/0x2e4 net/bluetooth/hci_conn.c:1812
         hci_disconnect+0x207/0x237 net/bluetooth/hci_conn.c:244
         hci_link_tx_to net/bluetooth/hci_core.c:3254 [inline]
         __check_timeout net/bluetooth/hci_core.c:3419 [inline]
         __check_timeout+0x310/0x361 net/bluetooth/hci_core.c:3399
         hci_sched_le net/bluetooth/hci_core.c:3602 [inline]
         hci_tx_work+0xe8f/0x12d0 net/bluetooth/hci_core.c:3652
         process_one_work+0x75c/0xba1 kernel/workqueue.c:2310
         worker_thread+0x5b2/0x73a kernel/workqueue.c:2457
         kthread+0x2f7/0x30b kernel/kthread.c:319
         ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:298
      
      This patch releases RCU read lock before calling hci_disconnect and
      reacquires it afterward to fix the bug.
      
      Fixes: a13f316e
      
       ("Bluetooth: hci_conn: Consolidate code for aborting connections")
      Signed-off-by: default avatarYing Hsu <yinghsu@chromium.org>
      Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
      c7eaf80b
    • Luiz Augusto von Dentz's avatar
      Bluetooth: hci_sync: Fix handling of HCI_QUIRK_STRICT_DUPLICATE_FILTER · 941c998b
      Luiz Augusto von Dentz authored
      When HCI_QUIRK_STRICT_DUPLICATE_FILTER is set LE scanning requires
      periodic restarts of the scanning procedure as the controller would
      consider device previously found as duplicated despite of RSSI changes,
      but in order to set the scan timeout properly set le_scan_restart needs
      to be synchronous so it shall not use hci_cmd_sync_queue which defers
      the command processing to cmd_sync_work.
      
      Cc: stable@vger.kernel.org
      Link: https://lore.kernel.org/linux-bluetooth/578e6d7afd676129decafba846a933f5@agner.ch/#t
      Fixes: 27d54b77
      
       ("Bluetooth: Rework le_scan_restart for hci_sync")
      Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
      941c998b
    • Rocky Liao's avatar
      Bluetooth: btusb: add shutdown function for QCA6174 · 187f8b64
      Rocky Liao authored
      
      
      We should send hci reset command before bt turn off, which can reset bt
      firmware status.
      
      Signed-off-by: default avatarRocky Liao <quic_rjliao@quicinc.com>
      Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
      187f8b64
    • Yao Xiao's avatar
      Bluetooth: Delete unused hci_req_prepare_suspend() declaration · cbaabbcd
      Yao Xiao authored
      hci_req_prepare_suspend() has been deprecated in favor of
      hci_suspend_sync().
      
      Fixes: 182ee45d
      
       ("Bluetooth: hci_sync: Rework hci_suspend_notifier")
      Signed-off-by: default avatarYao Xiao <xiaoyao@rock-chips.com>
      Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
      cbaabbcd
    • Linus Torvalds's avatar
      Merge tag 'spi-fix-v6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · 5d2f5353
      Linus Torvalds authored
      Pull spi fixes from Mark Brown:
       "A small collection of fixes, plus a new device ID for Intel Granite
        Rapids systems.
      
        The fix for the i.MX driver is fairly urgent, it's fixing a data
        corruption issue when bits per word isn't 8.
      
        There's also one fix which was queued but not sent for v6.4 due to
        being minor and arriving at the end of the release"
      
      * tag 'spi-fix-v6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
        spi: imx: Take in account bits per word instead of assuming 8-bits
        spi: intel-pci: Add support for Granite Rapids SPI serial flash
        spi: stm32: add a delay before SPI disable
        spi: nxp-fspi: reset the FLSHxCR1 registers
        spi: zynqmp-gqspi: fix clock imbalance on probe failure
      5d2f5353