November 2023 - Linux-stable-mirror

[PATCH net] net: wangxun: fix kernel panic due to null pointer

by Jiawen Wu

When the device uses a custom subsystem vendor ID, the function wx_sw_init() returns before the memory of 'wx->mac_table' is allocated. The null pointer will causes the kernel panic. Fixes: 79625f45ca73 ("net: wangxun: Move MAC address handling to libwx") Signed-off-by: Jiawen Wu <jiawenwu(a)trustnetic.com> --- drivers/net/ethernet/wangxun/libwx/wx_hw.c | 8 +++++--- drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 4 +--- drivers/net/ethernet/wangxun/txgbe/txgbe_main.c | 4 +--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/wangxun/libwx/wx_hw.c b/drivers/net/ethernet/wangxun/libwx/wx_hw.c index a3c5de9d547a..533e912af089 100644 --- a/drivers/net/ethernet/wangxun/libwx/wx_hw.c +++ b/drivers/net/ethernet/wangxun/libwx/wx_hw.c @@ -1769,10 +1769,12 @@ int wx_sw_init(struct wx *wx) wx->subsystem_device_id = pdev->subsystem_device; } else { err = wx_flash_read_dword(wx, 0xfffdc, &ssid); - if (!err) - wx->subsystem_device_id = swab16((u16)ssid); + if (err < 0) { + wx_err(wx, "read of internal subsystem device id failed\n"); + return err; + } - return err; + wx->subsystem_device_id = swab16((u16)ssid); } wx->mac_table = kcalloc(wx->mac.num_rar_entries, diff --git a/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c b/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c index 3d43f808c86b..8db804543e66 100644 --- a/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c +++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c @@ -121,10 +121,8 @@ static int ngbe_sw_init(struct wx *wx) /* PCI config space info */ err = wx_sw_init(wx); - if (err < 0) { - wx_err(wx, "read of internal subsystem device id failed\n"); + if (err < 0) return err; - } /* mac type, phy type , oem type */ ngbe_init_type_code(wx); diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c b/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c index 70f0b5c01dac..526250102db2 100644 --- a/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c +++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c @@ -364,10 +364,8 @@ static int txgbe_sw_init(struct wx *wx) /* PCI config space info */ err = wx_sw_init(wx); - if (err < 0) { - wx_err(wx, "read of internal subsystem device id failed\n"); + if (err < 0) return err; - } txgbe_init_type_code(wx); -- 2.27.0

1 year, 1 month

4
3
0 0

[PATCH 5.15 000/244] 5.15.139-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.15.139 release. There are 244 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Fri, 17 Nov 2023 20:34:45 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.139-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.15.139-rc1 Filipe Manana <fdmanana(a)suse.com> btrfs: use u64 for buffer sizes in the tree search ioctls Dominique Martinet <dominique.martinet(a)atmark-techno.com> Revert "mmc: core: Capture correct oemid-bits for eMMC cards" Yujie Liu <yujie.liu(a)intel.com> tracing/kprobes: Fix the order of argument descriptions Arnd Bergmann <arnd(a)arndb.de> fbdev: fsl-diu-fb: mark wr_reg_wa() static Dan Carpenter <dan.carpenter(a)linaro.org> fbdev: imsttfb: fix a resource leak in probe Helge Deller <deller(a)gmx.de> fbdev: imsttfb: Fix error path of imsttfb_probe() Amit Kumar Mahapatra <amit.kumar-mahapatra(a)amd.com> spi: spi-zynq-qspi: add spi-mem to driver kconfig dependencies Jerome Brunet <jbrunet(a)baylibre.com> ASoC: hdmi-codec: register hpd callback on component probe Erik Kurzinger <ekurzinger(a)nvidia.com> drm/syncobj: fix DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE Florian Westphal <fw(a)strlen.de> netfilter: nat: fix ipv6 nat redirect with mapped and scoped addresses Jeremy Sowden <jeremy(a)azazel.net> netfilter: nft_redir: use `struct nf_nat_range2` throughout and deduplicate eval call-backs Maciej Żenczykowski <zenczykowski(a)gmail.com> netfilter: xt_recent: fix (increase) ipv6 literal buffer length Roman Bacik <roman.bacik(a)broadcom.com> i2c: iproc: handle invalid slave state Heiner Kallweit <hkallweit1(a)gmail.com> r8169: respect userspace disabling IFF_MULTICAST Yu Kuai <yukuai3(a)huawei.com> blk-core: use pr_warn_ratelimited() in bio_check_ro() Miaohe Lin <linmiaohe(a)huawei.com> block: remove unneeded return value of bio_check_ro() George Shuklin <george.shuklin(a)gmail.com> tg3: power down device only on SYSTEM_POWER_OFF D. Wythe <alibuda(a)linux.alibaba.com> net/smc: put sk reference if close work was canceled D. Wythe <alibuda(a)linux.alibaba.com> net/smc: allow cdc msg send rather than drop it with NULL sndbuf_desc D. Wythe <alibuda(a)linux.alibaba.com> net/smc: fix dangling sock under state SMC_APPFINCLOSEWAIT Hangbin Liu <liuhangbin(a)gmail.com> selftests: pmtu.sh: fix result checking Furong Xu <0x1207(a)gmail.com> net: stmmac: xgmac: Enable support for multiple Flexible PPS outputs NeilBrown <neilb(a)suse.de> Fix termination state for idr_for_each_entry_ul() Patrick Thompson <ptf(a)google.com> net: r8169: Disable multicast filter for RTL8168H and RTL8107E Kuniyuki Iwashima <kuniyu(a)amazon.com> dccp/tcp: Call security_inet_conn_request() after setting IPv6 addresses. Kuniyuki Iwashima <kuniyu(a)amazon.com> dccp: Call security_inet_conn_request() after setting IPv4 addresses. Ratheesh Kannoth <rkannoth(a)marvell.com> octeontx2-pf: Fix holes in error code Ratheesh Kannoth <rkannoth(a)marvell.com> octeontx2-pf: Fix error codes Eric Dumazet <edumazet(a)google.com> inet: shrink struct flowi_common Hou Tao <houtao1(a)huawei.com> bpf: Check map->usercnt after timer->timer is assigned Shigeru Yoshida <syoshida(a)redhat.com> tipc: Change nla_policy for bearer-related names to NLA_NUL_STRING Dan Carpenter <dan.carpenter(a)linaro.org> hsr: Prevent use after free in prp_create_tagged_frame() Willem de Bruijn <willemb(a)google.com> llc: verify mac len before reading mac header Dan Carpenter <dan.carpenter(a)linaro.org> Input: synaptics-rmi4 - fix use after free in rmi_unregister_function() Florian Fainelli <florian.fainelli(a)broadcom.com> pwm: brcmstb: Utilize appropriate clock APIs in suspend/resume Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> pwm: sti: Reduce number of allocations and drop usage of chip_data Ben Wolsieffer <ben.wolsieffer(a)hefring.com> regmap: prevent noinc writes from clobbering cache Hans Verkuil <hverkuil-cisco(a)xs4all.nl> media: dvb-usb-v2: af9035: fix missing unlock Jernej Skrabec <jernej.skrabec(a)gmail.com> media: cedrus: Fix clock/reset sequence Jiasheng Jiang <jiasheng(a)iscas.ac.cn> media: vidtv: mux: Add check and kfree for kstrdup Jiasheng Jiang <jiasheng(a)iscas.ac.cn> media: vidtv: psi: Add check for kstrdup Katya Orlova <e.orlova(a)ispras.ru> media: s3c-camif: Avoid inappropriate kfree() Zheng Wang <zyytlz.wz(a)163.com> media: bttv: fix use after free error due to btv->timeout timer Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> media: i2c: max9286: Fix some redundant of_node_put() calls Yang Yingliang <yangyingliang(a)huawei.com> pcmcia: ds: fix possible name leak in error path in pcmcia_device_add() Yang Yingliang <yangyingliang(a)huawei.com> pcmcia: ds: fix refcount leak in pcmcia_device_add() Yang Yingliang <yangyingliang(a)huawei.com> pcmcia: cs: fix possible hung task and memory leak pccardd() Javier Carrasco <javier.carrasco.cruz(a)gmail.com> rtc: pcf85363: fix wrong mask/val parameters in regmap_update_bits call Dan Williams <dan.j.williams(a)intel.com> cxl/mem: Fix shutdown order Dinghao Liu <dinghao.liu(a)zju.edu.cn> i3c: Fix potential refcount leak in i3c_master_register_new_i3c_devs Hangyu Hua <hbh25y(a)gmail.com> 9p/net: fix possible memory leak in p9_check_errors() Ian Rogers <irogers(a)google.com> perf hist: Add missing puts to hist__account_cycles Ian Rogers <irogers(a)google.com> perf machine: Avoid out of bounds LBR memory read Sergey Shtylyov <s.shtylyov(a)omp.ru> usb: host: xhci-plat: fix possible kernel oops while resuming Basavaraj Natikar <Basavaraj.Natikar(a)amd.com> xhci: Loosen RPM as default policy to cover for AMD xHC 1.1 Wang Yufen <wangyufen(a)huawei.com> powerpc/pseries: fix potential memory leak in init_cpu_associativity() Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> powerpc/imc-pmu: Use the correct spinlock initializer. Benjamin Gray <bgray(a)linux.ibm.com> powerpc/xive: Fix endian conversion size Christophe Leroy <christophe.leroy(a)csgroup.eu> powerpc/40x: Remove stale PTE_ATOMIC_UPDATES macro Masahiro Yamada <masahiroy(a)kernel.org> modpost: fix tee MODULE_DEVICE_TABLE built on big-endian host Christophe Leroy <christophe.leroy(a)csgroup.eu> powerpc: Only define __parse_fpscr() when required Chao Yu <chao(a)kernel.org> f2fs: fix to initialize map.m_pblk in f2fs_precache_extents() Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> dmaengine: pxa_dma: Remove an erroneous BUG_ON() in pxad_free_desc() Jonas Blixt <jonas.blixt(a)actia.se> USB: usbip: fix stub_dev hub disconnect Matti Vaittinen <mazziesaccount(a)gmail.com> tools: iio: iio_generic_buffer ensure alignment Jinjie Ruan <ruanjinjie(a)huawei.com> misc: st_core: Do not call kfree_skb() under spin_lock_irqsave() Dan Carpenter <dan.carpenter(a)linaro.org> dmaengine: ti: edma: handle irq_of_parse_and_map() errors Michał Mirosław <mirq-linux(a)rere.qmqm.pl> usb: chipidea: Simplify Tegra DMA alignment code Michał Mirosław <mirq-linux(a)rere.qmqm.pl> usb: chipidea: Fix DMA overwrite for Tegra Jia-Ju Bai <baijiaju(a)buaa.edu.cn> usb: dwc2: fix possible NULL pointer dereference caused by driver concurrency Fenghua Yu <fenghua.yu(a)intel.com> dmaengine: idxd: Register dsa_bus_type before registering idxd sub-drivers Ian Rogers <irogers(a)google.com> perf evlist: Avoid frequency mode for the dummy event Namhyung Kim <namhyung(a)kernel.org> perf tools: Get rid of evlist__add_on_all_cpus() Adrian Hunter <adrian.hunter(a)intel.com> perf evlist: Add evlist__add_dummy_on_all_cpus() Zheng Yejian <zhengyejian1(a)huawei.com> livepatch: Fix missing newline character in klp_resolve_symbols() Yi Yang <yiyang13(a)huawei.com> tty: tty_jobctrl: fix pid memleak in disassociate_ctty() Chao Yu <chao(a)kernel.org> f2fs: compress: fix to avoid redundant compress extension Chao Yu <chao(a)kernel.org> f2fs: compress: fix to avoid use-after-free on dic Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> leds: trigger: ledtrig-cpu:: Fix 'output may be truncated' issue for 'cpu' Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> leds: pwm: Don't disable the PWM when the LED should be off Marek Behún <kabel(a)kernel.org> leds: turris-omnia: Do not use SMBUS calls Marek Behún <kabel(a)kernel.org> leds: turris-omnia: Drop unnecessary mutex locking Hans de Goede <hdegoede(a)redhat.com> mfd: arizona-spi: Set pdata.hpdet_channel for ACPI enumerated devs Dinghao Liu <dinghao.liu(a)zju.edu.cn> mfd: dln2: Fix double put in dln2_probe Herve Codina <herve.codina(a)bootlin.com> mfd: core: Ensure disabled devices are skipped without aborting Michał Mirosław <mirq-linux(a)rere.qmqm.pl> mfd: core: Un-constify mfd_cell.of_reg Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> ASoC: ams-delta.c: use component after check Giovanni Cabiddu <giovanni.cabiddu(a)intel.com> crypto: qat - fix deadlock in backlog processing WangJinchao <wangjinchao(a)xfusion.com> padata: Fix refcnt handling in padata_free_shell() Cezary Rojewski <cezary.rojewski(a)intel.com> ASoC: Intel: Skylake: Fix mem leak when parsing UUIDs fails Hans de Goede <hdegoede(a)redhat.com> HID: logitech-hidpp: Move get_wireless_feature_index() check to hidpp_connect_event() Hans de Goede <hdegoede(a)redhat.com> HID: logitech-hidpp: Revert "Don't restart communication if not necessary" Hans de Goede <hdegoede(a)redhat.com> HID: logitech-hidpp: Don't restart IO, instead defer hid_connect() only Bastien Nocera <hadess(a)hadess.net> HID: logitech-hidpp: Remove HIDPP_QUIRK_NO_HIDINPUT quirk Bastien Nocera <hadess(a)hadess.net> Revert "HID: logitech-hidpp: add a module parameter to keep firmware gestures" Geert Uytterhoeven <geert+renesas(a)glider.be> sh: bios: Revive earlyprintk support Danny Kaehn <danny.kaehn(a)plexus.com> hid: cp2112: Fix IRQ shutdown stopping polling for all IRQs on chip Leon Romanovsky <leon(a)kernel.org> RDMA/hfi1: Workaround truncation compilation error Daniel Mentz <danielmentz(a)google.com> scsi: ufs: core: Leave space for '\0' in utf8 desc string Zhang Shurong <zhang_shurong(a)foxmail.com> ASoC: fsl: Fix PM disable depth imbalance in fsl_easrc_probe Luoyouming <luoyouming(a)huawei.com> RDMA/hns: The UD mode can only be configured with DCQCN Chengchang Tang <tangchengchang(a)huawei.com> RDMA/hns: Fix signed-unsigned mixed comparisons Chengchang Tang <tangchengchang(a)huawei.com> RDMA/hns: Fix uninitialized ucmd in hns_roce_create_qp_common() Patrisious Haddad <phaddad(a)nvidia.com> IB/mlx5: Fix rdma counter binding for RAW QP Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> ASoC: fsl: mpc5200_dma.c: Fix warning of Function parameter or member not described Gou Hao <gouhao(a)uniontech.com> ext4: move 'ix' sanity check to corrent position Kursad Oney <kursad.oney(a)broadcom.com> ARM: 9321/1: memset: cast the constant byte to unsigned char Danny Kaehn <danny.kaehn(a)plexus.com> hid: cp2112: Fix duplicate workqueue initialization Giovanni Cabiddu <giovanni.cabiddu(a)intel.com> crypto: qat - increase size of buffers Gaurav Jain <gaurav.jain(a)nxp.com> crypto: caam/jr - fix Chacha20 + Poly1305 self test failure Gaurav Jain <gaurav.jain(a)nxp.com> crypto: caam/qi2 - fix Chacha20 + Poly1305 self test failure Tomas Glozar <tglozar(a)redhat.com> nd_btt: Make BTT lanes preemptible Chen Ni <nichen(a)iscas.ac.cn> libnvdimm/of_pmem: Use devm_kstrdup instead of kstrdup and check its return value Tyrel Datwyler <tyreld(a)linux.ibm.com> scsi: ibmvfc: Fix erroneous use of rtas_busy_delay with hcall return code Gustavo A. R. Silva <gustavoars(a)kernel.org> RDMA/core: Use size_{add,sub,mul}() in calls to struct_size() Jonas Gorski <jonas.gorski(a)gmail.com> hwrng: geode - fix accessing registers Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> crypto: hisilicon/hpre - Fix a erroneous check after snprintf() Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> selftests/resctrl: Ensure the benchmark commands fits to its array Maciej Wieczor-Retman <maciej.wieczor-retman(a)intel.com> selftests/pidfd: Fix ksft print formats Adam Ford <aford173(a)gmail.com> arm64: dts: imx8mn: Add sound-dai-cells to micfil node Adam Ford <aford173(a)gmail.com> arm64: dts: imx8mm: Add sound-dai-cells to micfil node Fabio Estevam <festevam(a)denx.de> arm64: dts: imx8qm-ss-img: Fix jpegenc compatible entry Sudeep Holla <sudeep.holla(a)arm.com> clk: scmi: Free scmi_clk allocated when the clocks with invalid info are skipped Sudeep Holla <sudeep.holla(a)arm.com> firmware: arm_ffa: Assign the missing IDR allocation ID to the FFA device Dhruva Gole <d-gole(a)ti.com> firmware: ti_sci: Mark driver as non removable Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> soc: qcom: llcc: Handle a second device without data corruption Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> ARM: dts: qcom: mdm9615: populate vsdcc fixed regulator Stephan Gerhold <stephan(a)gerhold.net> arm64: dts: qcom: apq8016-sbc: Add missing ADV7533 regulators Chris Packham <chris.packham(a)alliedtelesis.co.nz> ARM64: dts: marvell: cn9310: Use appropriate label for spi1 pins Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> arm64: dts: qcom: sdm845-mtp: fix WiFi configuration Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: sc7280: Add missing LMH interrupts Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> arm64: dts: qcom: msm8992-libra: drop duplicated reserved memory Gaurav Kohli <quic_gkohli(a)quicinc.com> arm64: dts: qcom: msm8916: Fix iommu local address range Geert Uytterhoeven <geert+renesas(a)glider.be> ARM: dts: renesas: blanche: Fix typo in GP_11_2 pin name Junhao He <hejunhao3(a)huawei.com> perf: hisi: Fix use-after-free when register pmu fails AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com> drm: mediatek: mtk_dsi: Fix NO_EOT_PACKET settings/handling Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> drm/msm/dsi: use msm_gem_kernel_put to free TX buffer Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> xen-pciback: Consider INTx disabled when MSI/MSI-X is enabled Dan Carpenter <dan.carpenter(a)linaro.org> drm/rockchip: Fix type promotion bug in rockchip_gem_iommu_map() Mark Rutland <mark.rutland(a)arm.com> arm64/arm: xen: enlighten: Fix KPTI checks Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> drm/bridge: lt9611uxc: fix the race in the error path Maxime Ripard <maxime(a)cerno.tech> drm/bridge: lt9611uxc: Register and attach our DSI device at probe Maxime Ripard <maxime(a)cerno.tech> drm/bridge: lt9611uxc: Switch to devm MIPI-DSI helpers Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> drm/rockchip: cdn-dp: Fix some error handling paths in cdn_dp_probe() Jason-JH.Lin <jason-jh.lin(a)mediatek.com> drm/mediatek: Fix iommu fault during crtc enabling Jason-JH.Lin <jason-jh.lin(a)mediatek.com> drm/mediatek: Fix iommu fault by swapping FBs after updating plane state Xiaogang Chen <xiaogang.chen(a)amd.com> drm/amdkfd: fix some race conditions in vram buffer alloc/free of svm code Tomi Valkeinen <tomi.valkeinen(a)ideasonboard.com> drm/bridge: tc358768: Fix bit updates Dmitry Osipenko <digetx(a)gmail.com> drm/bridge: tc358768: Disable non-continuous clock mode Tomi Valkeinen <tomi.valkeinen(a)ideasonboard.com> drm/bridge: tc358768: Fix use of uninitialized variable Tomi Valkeinen <tomi.valkeinen(a)ideasonboard.com> drm/bridge: lt8912b: Add missing drm_bridge_attach call Tomi Valkeinen <tomi.valkeinen(a)ideasonboard.com> drm/bridge: lt8912b: Manually disable HPD only if it was enabled Tomi Valkeinen <tomi.valkeinen(a)ideasonboard.com> drm/bridge: lt8912b: Fix crash on bridge detach Tomi Valkeinen <tomi.valkeinen(a)ideasonboard.com> drm/bridge: lt8912b: Fix bridge_detach Stefan Eichenberger <stefan.eichenberger(a)toradex.com> drm/bridge: lt8912b: Add hot plug detection Maxime Ripard <maxime(a)cerno.tech> drm/bridge: lt8912b: Register and attach our DSI device at probe Maxime Ripard <maxime(a)cerno.tech> drm/bridge: lt8912b: Switch to devm MIPI-DSI helpers Maxime Ripard <maxime(a)cerno.tech> drm/mipi-dsi: Create devm device attachment Maxime Ripard <maxime(a)cerno.tech> drm/mipi-dsi: Create devm device registration Konstantin Meskhidze <konstantin.meskhidze(a)huawei.com> drm/radeon: possible buffer overflow Jonas Karlman <jonas(a)kwiboo.se> drm/rockchip: vop: Fix call to crtc reset helper Jonas Karlman <jonas(a)kwiboo.se> drm/rockchip: vop: Fix reset of state in duplicate state crtc funcs Zhang Rui <rui.zhang(a)intel.com> hwmon: (coretemp) Fix potentially truncated sysfs attribute name Dragos Bogdan <dragos.bogdan(a)analog.com> hwmon: (axi-fan-control) Fix possible NULL pointer dereference Armin Wolf <W_Armin(a)gmx.de> platform/x86: wmi: Fix opening of char device Barnabás Pőcze <pobrn(a)protonmail.com> platform/x86: wmi: remove unnecessary initializations Armin Wolf <W_Armin(a)gmx.de> platform/x86: wmi: Fix probe failure when failing to register WMI devices Varadarajan Narayanan <quic_varada(a)quicinc.com> clk: qcom: config IPQ_APSS_6018 should depend on QCOM_SMEM Jiasheng Jiang <jiasheng(a)iscas.ac.cn> clk: mediatek: clk-mt2701: Add check for mtk_alloc_clk_data Jiasheng Jiang <jiasheng(a)iscas.ac.cn> clk: mediatek: clk-mt7629: Add check for mtk_alloc_clk_data Jiasheng Jiang <jiasheng(a)iscas.ac.cn> clk: mediatek: clk-mt7629-eth: Add check for mtk_alloc_clk_data Jiasheng Jiang <jiasheng(a)iscas.ac.cn> clk: mediatek: clk-mt6797: Add check for mtk_alloc_clk_data Jiasheng Jiang <jiasheng(a)iscas.ac.cn> clk: mediatek: clk-mt6779: Add check for mtk_alloc_clk_data Jiasheng Jiang <jiasheng(a)iscas.ac.cn> clk: mediatek: clk-mt6765: Add check for mtk_alloc_clk_data Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> clk: npcm7xx: Fix incorrect kfree Dan Carpenter <dan.carpenter(a)linaro.org> clk: ti: fix double free in of_ti_divider_clk_setup() Dario Binacchi <dario.binacchi(a)amarulasolutions.com> clk: ti: change ti_clk_register[_omap_hw]() API Tony Lindgren <tony(a)atomide.com> clk: ti: Update component clocks to use ti_dt_clk_name() Tony Lindgren <tony(a)atomide.com> clk: ti: Update pll and clockdomain clocks to use ti_dt_clk_name() Tony Lindgren <tony(a)atomide.com> clk: ti: Add ti_dt_clk_name() helper to use clock-output-names Dan Carpenter <dan.carpenter(a)linaro.org> clk: keystone: pll: fix a couple NULL vs IS_ERR() checks Han Xu <han.xu(a)nxp.com> spi: nxp-fspi: use the correct ioremap function Claudiu Beznea <claudiu.beznea.uj(a)bp.renesas.com> clk: renesas: rzg2l: Fix computation formula Claudiu Beznea <claudiu.beznea.uj(a)bp.renesas.com> clk: renesas: rzg2l: Use FIELD_GET() for PLL register fields Geert Uytterhoeven <geert+renesas(a)glider.be> clk: renesas: rzg2l: Simplify multiplication/shift logic Robert Chiras <robert.chiras(a)nxp.com> clk: imx: imx8qxp: Fix elcdif_pll clock Peng Fan <peng.fan(a)nxp.com> clk: imx: imx8mq: correct error handling path Abel Vesa <abel.vesa(a)linaro.org> clk: imx: Select MXC_CLK for CLK_IMX8QXP Danila Tikhonov <danila(a)jiaxyga.com> clk: qcom: gcc-sm8150: Fix gcc_sdcc2_apps_clk_src Konrad Dybcio <konrad.dybcio(a)linaro.org> clk: qcom: mmcc-msm8998: Fix the SMMU GDSC Konrad Dybcio <konrad.dybcio(a)linaro.org> clk: qcom: mmcc-msm8998: Don't check halt bit on some branch clks Devi Priya <quic_devipriy(a)quicinc.com> clk: qcom: clk-rcg2: Fix clock rate overflow for high parent frequencies Zhang Shurong <zhang_shurong(a)foxmail.com> spi: tegra: Fix missing IRQ check in tegra_slink_probe() Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> regmap: debugfs: Fix a erroneous check after snprintf() Eric Dumazet <edumazet(a)google.com> ipvlan: properly track tx_errors Eric Dumazet <edumazet(a)google.com> net: add DEV_STATS_READ() helper Yan Zhai <yan(a)cloudflare.com> ipv6: avoid atomic fragment on GSO packets Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> ACPI: sysfs: Fix create_pnp_modalias() and create_of_modalias() Miri Korenblit <miriam.rachel.korenblit(a)intel.com> wifi: iwlwifi: empty overflow queue during flush Johannes Berg <johannes.berg(a)intel.com> wifi: iwlwifi: pcie: synchronize IRQs before NAPI Gregory Greenman <gregory.greenman(a)intel.com> wifi: iwlwifi: call napi_synchronize() before freeing rx/tx queues Johannes Berg <johannes.berg(a)intel.com> iwlwifi: pcie: adjust to Bz completion descriptor Eric Dumazet <edumazet(a)google.com> tcp: fix cookie_init_timestamp() overflows Eric Dumazet <edumazet(a)google.com> chtls: fix tp->rcv_tstamp initialization Heiner Kallweit <hkallweit1(a)gmail.com> r8169: fix rare issue with broken rx after link-down on RTL8125 Juhee Kang <claudiajkang(a)gmail.com> r8169: use tp_to_dev instead of open code Dan Carpenter <dan.carpenter(a)linaro.org> thermal: core: prevent potential string overflow Phil Sutter <phil(a)nwl.cc> netfilter: nf_tables: Drop pointless memset when dumping rules Sascha Hauer <s.hauer(a)pengutronix.de> PM / devfreq: rockchip-dfi: Make pmu regmap mandatory Marc Kleine-Budde <mkl(a)pengutronix.de> can: dev: can_put_echo_skb(): don't crash kernel if can_priv::echo_skb is accessed out of bounds Marc Kleine-Budde <mkl(a)pengutronix.de> can: dev: can_restart(): fix race condition between controller restart and netif_carrier_on() Marc Kleine-Budde <mkl(a)pengutronix.de> can: dev: can_restart(): don't crash kernel if carrier is OK Dmitry Antipov <dmantipov(a)yandex.ru> wifi: rtlwifi: fix EDCA limit set by BT coexistence Eric Dumazet <edumazet(a)google.com> tcp_metrics: do not create an entry from tcp_init_metrics() Eric Dumazet <edumazet(a)google.com> tcp_metrics: properly set tp->snd_ssthresh in tcp_init_metrics() Eric Dumazet <edumazet(a)google.com> tcp_metrics: add missing barriers on delete Felix Fietkau <nbd(a)nbd.name> wifi: mt76: mt7603: improve stuck beacon handling Felix Fietkau <nbd(a)nbd.name> mt76: pass original queue id from __mt76_tx_queue_skb to the driver Felix Fietkau <nbd(a)nbd.name> mt76: add support for overriding the device used for DMA mapping Felix Fietkau <nbd(a)nbd.name> mt76: dma: use kzalloc instead of devm_kzalloc for txwi Felix Fietkau <nbd(a)nbd.name> wifi: mt76: mt7603: rework/fix rx pse hang check Jinjie Ruan <ruanjinjie(a)huawei.com> wifi: rtw88: debug: Fix the NULL vs IS_ERR() bug for debugfs_create_file() Gustavo A. R. Silva <gustavoars(a)kernel.org> net: spider_net: Use size_add() in call to struct_size() Gustavo A. R. Silva <gustavoars(a)kernel.org> tipc: Use size_add() in calls to struct_size() Gustavo A. R. Silva <gustavoars(a)kernel.org> mlxsw: Use size_mul() in call to struct_size() Gustavo A. R. Silva <gustavoars(a)kernel.org> gve: Use size_add() in call to struct_size() Aananth V <aananthv(a)google.com> tcp: call tcp_try_undo_recovery when an RTOd TFO SYNACK is ACKed Eric Dumazet <edumazet(a)google.com> udp: add missing WRITE_ONCE() around up->encap_rcv Miri Korenblit <miriam.rachel.korenblit(a)intel.com> wifi: iwlwifi: Use FW rate for non-data frames Leon Hwang <hffilwlqm(a)gmail.com> selftests/bpf: Correct map_fd to data_fd in tailcalls Jakub Sitnicki <jakub(a)cloudflare.com> selftests/bpf: Test tail call counting with bpf2bpf and data on stack Andrii Staikov <andrii.staikov(a)intel.com> i40e: fix potential memory leaks in i40e_remove() Chen Yu <yu.c.chen(a)intel.com> genirq/matrix: Exclude managed interrupts in irq_matrix_allocated() Jiasheng Jiang <jiasheng(a)iscas.ac.cn> pstore/platform: Add check for kstrdup Yuntao Wang <ytcoode(a)gmail.com> x86/boot: Fix incorrect startup_gdt_descr.size Adam Dunlap <acdunlap(a)google.com> x86/sev-es: Allow copy_from_kernel_nofault() in earlier boot Adrian Hunter <adrian.hunter(a)intel.com> x86: Share definition of __is_canonical_address() Ben Wolsieffer <ben.wolsieffer(a)hefring.com> futex: Don't include process MM in futex key on no-MMU Josh Poimboeuf <jpoimboe(a)kernel.org> x86/srso: Fix SBPB enablement for (possible) future fixed HW Jingbo Xu <jefflexu(a)linux.alibaba.com> writeback, cgroup: switch inodes with dirty timestamps to release dying cgwbs Reuben Hawkins <reubenhwk(a)gmail.com> vfs: fix readahead(2) on block devices Peter Zijlstra <peterz(a)infradead.org> sched: Fix stop_one_cpu_nowait() vs hotplug Qais Yousef <qyousef(a)layalina.io> sched/uclamp: Ignore (util == 0) optimization in feec() when p_util_max = 0 David Howells <dhowells(a)redhat.com> iov_iter, x86: Be consistent about the __user tag on copy_mc_to_user() ------------- Diffstat: Makefile | 4 +- arch/arm/boot/dts/qcom-mdm9615.dtsi | 14 +-- arch/arm/boot/dts/r8a7792-blanche.dts | 2 +- arch/arm/lib/memset.S | 1 + arch/arm/xen/enlighten.c | 25 ++-- arch/arm64/boot/dts/freescale/imx8mm.dtsi | 1 + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 1 + arch/arm64/boot/dts/freescale/imx8qm-ss-img.dtsi | 2 +- arch/arm64/boot/dts/marvell/cn9130-crb.dtsi | 4 +- arch/arm64/boot/dts/marvell/cn9130-db.dtsi | 4 +- arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 3 + arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts | 5 - arch/arm64/boot/dts/qcom/sc7280.dtsi | 8 ++ arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 2 + arch/powerpc/include/asm/nohash/32/pte-40x.h | 3 - arch/powerpc/kernel/traps.c | 2 + arch/powerpc/perf/imc-pmu.c | 2 +- arch/powerpc/platforms/pseries/lpar.c | 4 +- arch/powerpc/sysdev/xive/native.c | 2 +- arch/sh/Kconfig.debug | 11 ++ arch/x86/events/intel/pt.c | 14 +-- arch/x86/include/asm/page.h | 10 ++ arch/x86/include/asm/uaccess.h | 2 +- arch/x86/kernel/cpu/bugs.c | 2 +- arch/x86/kernel/head64.c | 2 +- arch/x86/kvm/emulate.c | 4 +- arch/x86/kvm/x86.c | 2 +- arch/x86/kvm/x86.h | 7 +- arch/x86/lib/copy_mc.c | 8 +- arch/x86/mm/maccess.c | 24 ++-- block/blk-core.c | 14 +-- drivers/acpi/device_sysfs.c | 10 +- drivers/base/regmap/regmap-debugfs.c | 2 +- drivers/base/regmap/regmap.c | 16 +-- drivers/char/hw_random/geode-rng.c | 6 +- drivers/clk/clk-npcm7xx.c | 2 +- drivers/clk/clk-scmi.c | 1 + drivers/clk/imx/Kconfig | 1 + drivers/clk/imx/clk-imx8mq.c | 17 +-- drivers/clk/imx/clk-imx8qxp.c | 2 +- drivers/clk/keystone/pll.c | 15 ++- drivers/clk/mediatek/clk-mt2701.c | 8 ++ drivers/clk/mediatek/clk-mt6765.c | 6 + drivers/clk/mediatek/clk-mt6779.c | 4 + drivers/clk/mediatek/clk-mt6797.c | 6 + drivers/clk/mediatek/clk-mt7629-eth.c | 4 + drivers/clk/mediatek/clk-mt7629.c | 6 + drivers/clk/qcom/Kconfig | 1 + drivers/clk/qcom/clk-rcg2.c | 14 +-- drivers/clk/qcom/gcc-sm8150.c | 2 +- drivers/clk/qcom/mmcc-msm8998.c | 7 +- drivers/clk/renesas/rzg2l-cpg.c | 20 ++-- drivers/clk/ti/apll.c | 13 +- drivers/clk/ti/autoidle.c | 2 +- drivers/clk/ti/clk-dra7-atl.c | 6 +- drivers/clk/ti/clk.c | 52 +++++--- drivers/clk/ti/clkctrl.c | 4 +- drivers/clk/ti/clock.h | 11 +- drivers/clk/ti/clockdomain.c | 2 +- drivers/clk/ti/composite.c | 6 +- drivers/clk/ti/divider.c | 12 +- drivers/clk/ti/dpll.c | 10 +- drivers/clk/ti/fapll.c | 11 +- drivers/clk/ti/fixed-factor.c | 4 +- drivers/clk/ti/gate.c | 8 +- drivers/clk/ti/interface.c | 9 +- drivers/clk/ti/mux.c | 8 +- drivers/crypto/caam/caamalg.c | 3 +- drivers/crypto/caam/caamalg_qi2.c | 3 +- drivers/crypto/hisilicon/hpre/hpre_main.c | 2 +- drivers/crypto/qat/qat_common/adf_accel_devices.h | 2 +- .../crypto/qat/qat_common/adf_transport_debug.c | 4 +- drivers/crypto/qat/qat_common/qat_algs_send.c | 46 +++---- drivers/cxl/core/memdev.c | 3 +- drivers/devfreq/event/rockchip-dfi.c | 15 +-- drivers/dma/idxd/Makefile | 6 +- drivers/dma/pxa_dma.c | 1 - drivers/dma/ti/edma.c | 4 +- drivers/firmware/arm_ffa/bus.c | 1 + drivers/firmware/ti_sci.c | 46 +------ drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 8 +- drivers/gpu/drm/bridge/lontium-lt8912b.c | 62 +++++----- drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 75 +++++------- drivers/gpu/drm/bridge/tc358768.c | 25 ++-- drivers/gpu/drm/drm_mipi_dsi.c | 81 +++++++++++++ drivers/gpu/drm/drm_syncobj.c | 3 +- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 3 + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 +- drivers/gpu/drm/mediatek/mtk_dsi.c | 4 +- drivers/gpu/drm/msm/dsi/dsi_host.c | 3 +- drivers/gpu/drm/radeon/evergreen.c | 7 +- drivers/gpu/drm/rockchip/cdn-dp-core.c | 15 ++- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 8 +- drivers/hid/hid-cp2112.c | 9 +- drivers/hid/hid-logitech-hidpp.c | 76 +++++------- drivers/hwmon/axi-fan-control.c | 29 +++-- drivers/hwmon/coretemp.c | 2 +- drivers/i2c/busses/i2c-bcm-iproc.c | 133 ++++++++++++--------- drivers/i3c/master.c | 4 +- drivers/infiniband/core/device.c | 2 +- drivers/infiniband/core/sa_query.c | 4 +- drivers/infiniband/core/sysfs.c | 10 +- drivers/infiniband/core/user_mad.c | 4 +- drivers/infiniband/hw/hfi1/efivar.c | 2 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 5 +- drivers/infiniband/hw/hns/hns_roce_qp.c | 2 +- drivers/infiniband/hw/mlx5/qp.c | 27 +++++ drivers/input/rmi4/rmi_bus.c | 2 +- drivers/leds/leds-pwm.c | 2 +- drivers/leds/leds-turris-omnia.c | 65 ++++++---- drivers/leds/trigger/ledtrig-cpu.c | 4 +- drivers/media/i2c/max9286.c | 2 - drivers/media/pci/bt8xx/bttv-driver.c | 1 + drivers/media/platform/s3c-camif/camif-capture.c | 6 +- drivers/media/test-drivers/vidtv/vidtv_mux.c | 7 +- drivers/media/test-drivers/vidtv/vidtv_psi.c | 45 ++++++- drivers/media/usb/dvb-usb-v2/af9035.c | 13 +- drivers/mfd/arizona-spi.c | 3 + drivers/mfd/dln2.c | 1 - drivers/mfd/mfd-core.c | 17 ++- drivers/misc/ti-st/st_core.c | 7 +- drivers/mmc/core/mmc.c | 2 +- drivers/net/can/dev/dev.c | 10 +- drivers/net/can/dev/skb.c | 6 +- drivers/net/ethernet/broadcom/tg3.c | 3 +- .../chelsio/inline_crypto/chtls/chtls_cm.c | 2 +- drivers/net/ethernet/google/gve/gve_main.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 10 +- .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 80 +++++++------ .../ethernet/marvell/octeontx2/nic/otx2_struct.h | 34 +++--- .../mellanox/mlxsw/spectrum_acl_bloom_filter.c | 2 +- drivers/net/ethernet/realtek/r8169_main.c | 15 ++- drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 2 +- .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 14 ++- drivers/net/ethernet/toshiba/spider_net.c | 2 +- drivers/net/ipvlan/ipvlan_core.c | 8 +- drivers/net/ipvlan/ipvlan_main.c | 1 + drivers/net/macsec.c | 6 +- drivers/net/wireless/intel/iwlwifi/dvm/tx.c | 5 +- drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 7 +- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 18 +-- drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 21 +++- drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 72 ++++++++--- .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 2 + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 2 + drivers/net/wireless/intel/iwlwifi/queue/tx.c | 9 +- drivers/net/wireless/intel/iwlwifi/queue/tx.h | 2 +- drivers/net/wireless/mediatek/mt76/dma.c | 46 +++---- drivers/net/wireless/mediatek/mt76/mac80211.c | 1 + drivers/net/wireless/mediatek/mt76/mt76.h | 5 +- drivers/net/wireless/mediatek/mt76/mt7603/beacon.c | 78 ++++++++---- drivers/net/wireless/mediatek/mt76/mt7603/core.c | 2 + drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 23 ++-- drivers/net/wireless/mediatek/mt76/mt7603/regs.h | 5 + drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 3 +- drivers/net/wireless/mediatek/mt76/sdio.c | 6 +- drivers/net/wireless/mediatek/mt76/testmode.c | 4 +- drivers/net/wireless/mediatek/mt76/tx.c | 2 +- drivers/net/wireless/mediatek/mt76/usb.c | 6 +- .../net/wireless/realtek/rtlwifi/rtl8188ee/dm.c | 2 +- .../wireless/realtek/rtlwifi/rtl8192c/dm_common.c | 2 +- .../net/wireless/realtek/rtlwifi/rtl8723ae/dm.c | 2 +- drivers/net/wireless/realtek/rtw88/debug.c | 4 +- drivers/nvdimm/of_pmem.c | 8 +- drivers/nvdimm/region_devs.c | 8 +- drivers/pcmcia/cs.c | 1 + drivers/pcmcia/ds.c | 14 ++- drivers/perf/hisilicon/hisi_uncore_pa_pmu.c | 4 +- drivers/perf/hisilicon/hisi_uncore_sllc_pmu.c | 4 +- drivers/platform/x86/wmi.c | 50 ++++---- drivers/pwm/pwm-brcmstb.c | 4 +- drivers/pwm/pwm-sti.c | 29 +++-- drivers/rtc/rtc-pcf85363.c | 2 +- drivers/scsi/ibmvscsi/ibmvfc.c | 3 +- drivers/scsi/ufs/ufshcd.c | 2 +- drivers/soc/qcom/llcc-qcom.c | 3 + drivers/spi/Kconfig | 1 + drivers/spi/spi-nxp-fspi.c | 2 +- drivers/spi/spi-tegra20-slink.c | 2 + drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 24 ++-- drivers/thermal/thermal_core.c | 6 +- drivers/tty/tty_jobctrl.c | 17 ++- drivers/usb/chipidea/host.c | 48 ++++---- drivers/usb/dwc2/hcd.c | 2 +- drivers/usb/host/xhci-pci.c | 2 + drivers/usb/host/xhci-plat.c | 23 +++- drivers/usb/usbip/stub_dev.c | 9 +- drivers/video/fbdev/fsl-diu-fb.c | 2 +- drivers/video/fbdev/imsttfb.c | 33 ++--- drivers/xen/xen-pciback/conf_space.c | 19 ++- drivers/xen/xen-pciback/conf_space_capability.c | 8 +- drivers/xen/xen-pciback/conf_space_header.c | 21 +--- fs/btrfs/ioctl.c | 10 +- fs/ext4/extents.c | 10 +- fs/f2fs/data.c | 4 +- fs/f2fs/file.c | 1 + fs/f2fs/super.c | 33 +++++ fs/fs-writeback.c | 41 +++++-- fs/pstore/platform.c | 9 +- include/drm/drm_mipi_dsi.h | 4 + include/linux/cpuhotplug.h | 1 + include/linux/idr.h | 6 +- include/linux/mfd/core.h | 2 +- include/linux/netdevice.h | 1 + include/net/flow.h | 2 +- include/net/netfilter/nf_nat_redirect.h | 3 +- include/net/tcp.h | 2 +- kernel/bpf/helpers.c | 25 ++-- kernel/futex/core.c | 12 +- kernel/irq/matrix.c | 6 +- kernel/livepatch/core.c | 2 +- kernel/padata.c | 6 +- kernel/sched/core.c | 10 +- kernel/sched/deadline.c | 2 + kernel/sched/fair.c | 22 +--- kernel/sched/rt.c | 4 + kernel/trace/trace_kprobe.c | 2 +- mm/readahead.c | 3 +- net/9p/client.c | 6 +- net/dccp/ipv4.c | 6 +- net/dccp/ipv6.c | 6 +- net/hsr/hsr_forward.c | 4 +- net/ipv4/syncookies.c | 20 ++-- net/ipv4/tcp_input.c | 9 +- net/ipv4/tcp_metrics.c | 15 ++- net/ipv4/udp.c | 6 +- net/ipv6/ip6_output.c | 8 +- net/ipv6/syncookies.c | 7 +- net/llc/llc_input.c | 10 +- net/llc/llc_s_ac.c | 3 + net/llc/llc_station.c | 3 + net/netfilter/nf_nat_redirect.c | 98 ++++++++------- net/netfilter/nf_tables_api.c | 4 - net/netfilter/nft_redir.c | 84 +++++-------- net/netfilter/xt_REDIRECT.c | 10 +- net/netfilter/xt_recent.c | 2 +- net/smc/af_smc.c | 4 +- net/smc/smc.h | 5 + net/smc/smc_cdc.c | 11 +- net/smc/smc_close.c | 5 +- net/tipc/link.c | 4 +- net/tipc/netlink.c | 4 +- scripts/mod/file2alias.c | 10 +- sound/soc/codecs/hdmi-codec.c | 27 +++-- sound/soc/fsl/fsl_easrc.c | 8 +- sound/soc/fsl/mpc5200_dma.c | 3 + sound/soc/intel/skylake/skl-sst-utils.c | 1 + sound/soc/ti/ams-delta.c | 4 +- tools/iio/iio_generic_buffer.c | 13 +- tools/perf/util/evlist.c | 21 ++++ tools/perf/util/evlist.h | 5 + tools/perf/util/hist.c | 10 +- tools/perf/util/machine.c | 22 ++-- tools/testing/selftests/bpf/prog_tests/tailcalls.c | 85 ++++++++++--- .../selftests/bpf/progs/tailcall_bpf2bpf6.c | 42 +++++++ tools/testing/selftests/net/pmtu.sh | 2 +- tools/testing/selftests/pidfd/pidfd_fdinfo_test.c | 2 +- tools/testing/selftests/pidfd/pidfd_test.c | 12 +- tools/testing/selftests/resctrl/resctrl_tests.c | 5 + 261 files changed, 1932 insertions(+), 1193 deletions(-)

1 year, 1 month

9
253
0 0

[net PATCH] net: phy: correctly check soft_reset ret ONLY if defined for PHY

by Christian Marangi

soft_reset call for phy_init_hw had multiple revision across the years and the implementation goes back to 2014. Originally was a simple call to write the generic PHY reset BIT, it was then moved to a dedicated function. It was then added the option for PHY driver to define their own special way to reset the PHY. Till this change, checking for ret was correct as it was always filled by either the generic reset or the custom implementation. This changed tho with commit 6e2d85ec0559 ("net: phy: Stop with excessive soft reset"), as the generic reset call to PHY was dropped but the ret check was never made entirely optional and dependent whether soft_reset was defined for the PHY driver or not. Luckly nothing was ever added before the soft_reset call so the ret check (in the case where a PHY didn't had soft_reset defined) although wrong, never caused problems as ret was init 0 at the start of phy_init_hw. To prevent any kind of problem and to make the function cleaner and more robust, correctly move the ret check if the soft_reset section making it optional and needed only with the function defined. Cc: stable(a)vger.kernel.org # v5.8+ Fixes: 6e2d85ec0559 ("net: phy: Stop with excessive soft reset") Signed-off-by: Christian Marangi <ansuelsmth(a)gmail.com> --- drivers/net/phy/phy_device.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 2ce74593d6e4..478126f6b5bc 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1235,14 +1235,13 @@ int phy_init_hw(struct phy_device *phydev) if (phydev->drv->soft_reset) { ret = phydev->drv->soft_reset(phydev); + if (ret < 0) + return ret; + /* see comment in genphy_soft_reset for an explanation */ - if (!ret) - phydev->suspended = 0; + phydev->suspended = 0; } - if (ret < 0) - return ret; - ret = phy_scan_fixups(phydev); if (ret < 0) return ret; -- 2.40.1

1 year, 1 month

2
3
0 0

[PATCH net,v5, 2/3] hv_netvsc: Fix race of register_netdevice_notifier and VF register

by Haiyang Zhang

If VF NIC is registered earlier, NETDEV_REGISTER event is replayed, but NETDEV_POST_INIT is not. Move register_netdevice_notifier() earlier, so the call back function is set before probing. Cc: stable(a)vger.kernel.org Fixes: e04e7a7bbd4b ("hv_netvsc: Fix a deadlock by getting rtnl lock earlier in netvsc_probe()") Reported-by: Dexuan Cui <decui(a)microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz(a)microsoft.com> Reviewed-by: Wojciech Drewek <wojciech.drewek(a)intel.com> Reviewed-by: Dexuan Cui <decui(a)microsoft.com> --- v5: Use a more idiomatic form for the error path, suggested by Simon Horman. v3: Divide it into two patches, suggested by Jakub Kicinski. v2: Fix rtnl_unlock() in error handling as found by Wojciech Drewek. --- drivers/net/hyperv/netvsc_drv.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index 5e528a76f5f5..b7dfd51f09e6 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -2793,12 +2793,17 @@ static int __init netvsc_drv_init(void) } netvsc_ring_bytes = ring_size * PAGE_SIZE; + register_netdevice_notifier(&netvsc_netdev_notifier); + ret = vmbus_driver_register(&netvsc_drv); if (ret) - return ret; + goto err_vmbus_reg; - register_netdevice_notifier(&netvsc_netdev_notifier); return 0; + +err_vmbus_reg: + unregister_netdevice_notifier(&netvsc_netdev_notifier); + return ret; } MODULE_LICENSE("GPL"); -- 2.34.1

1 year, 1 month

1
0
0 0

[PATCH net,v5, 1/3] hv_netvsc: fix race of netvsc and VF register_netdevice

by Haiyang Zhang

The rtnl lock also needs to be held before rndis_filter_device_add() which advertises nvsp_2_vsc_capability / sriov bit, and triggers VF NIC offering and registering. If VF NIC finished register_netdev() earlier it may cause name based config failure. To fix this issue, move the call to rtnl_lock() before rndis_filter_device_add(), so VF will be registered later than netvsc / synthetic NIC, and gets a name numbered (ethX) after netvsc. Cc: stable(a)vger.kernel.org Fixes: e04e7a7bbd4b ("hv_netvsc: Fix a deadlock by getting rtnl lock earlier in netvsc_probe()") Reported-by: Dexuan Cui <decui(a)microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz(a)microsoft.com> Reviewed-by: Wojciech Drewek <wojciech.drewek(a)intel.com> Reviewed-by: Simon Horman <horms(a)kernel.org> Reviewed-by: Dexuan Cui <decui(a)microsoft.com> --- v3: Divide it into two patches, suggested by Jakub Kicinski. v2: Fix rtnl_unlock() in error handling as found by Wojciech Drewek. --- drivers/net/hyperv/netvsc_drv.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index 3ba3c8fb28a5..5e528a76f5f5 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -2531,15 +2531,6 @@ static int netvsc_probe(struct hv_device *dev, goto devinfo_failed; } - nvdev = rndis_filter_device_add(dev, device_info); - if (IS_ERR(nvdev)) { - ret = PTR_ERR(nvdev); - netdev_err(net, "unable to add netvsc device (ret %d)\n", ret); - goto rndis_failed; - } - - eth_hw_addr_set(net, device_info->mac_adr); - /* We must get rtnl lock before scheduling nvdev->subchan_work, * otherwise netvsc_subchan_work() can get rtnl lock first and wait * all subchannels to show up, but that may not happen because @@ -2547,9 +2538,23 @@ static int netvsc_probe(struct hv_device *dev, * -> ... -> device_add() -> ... -> __device_attach() can't get * the device lock, so all the subchannels can't be processed -- * finally netvsc_subchan_work() hangs forever. + * + * The rtnl lock also needs to be held before rndis_filter_device_add() + * which advertises nvsp_2_vsc_capability / sriov bit, and triggers + * VF NIC offering and registering. If VF NIC finished register_netdev() + * earlier it may cause name based config failure. */ rtnl_lock(); + nvdev = rndis_filter_device_add(dev, device_info); + if (IS_ERR(nvdev)) { + ret = PTR_ERR(nvdev); + netdev_err(net, "unable to add netvsc device (ret %d)\n", ret); + goto rndis_failed; + } + + eth_hw_addr_set(net, device_info->mac_adr); + if (nvdev->num_chn > 1) schedule_work(&nvdev->subchan_work); @@ -2586,9 +2591,9 @@ static int netvsc_probe(struct hv_device *dev, return 0; register_failed: - rtnl_unlock(); rndis_filter_device_remove(dev, nvdev); rndis_failed: + rtnl_unlock(); netvsc_devinfo_put(device_info); devinfo_failed: free_percpu(net_device_ctx->vf_stats); -- 2.34.1

1 year, 1 month

1
0
0 0

[PATCH v2] rootfs: Fix support for rootfstype= when root= is given

by Stefan Berger

Documentation/filesystems/ramfs-rootfs-initramfs.rst states: If CONFIG_TMPFS is enabled, rootfs will use tmpfs instead of ramfs by default. To force ramfs, add "rootfstype=ramfs" to the kernel command line. This currently does not work when root= is provided since then saved_root_name contains a string and initfstype= is ignored. Therefore, ramfs is currently always chosen when root= is provided. The current behavior for rootfs's filesystem is: root= | initfstype= | chosen rootfs filesystem ------------+-------------+-------------------------- unspecified | unspecified | tmpfs unspecified | tmpfs | tmpfs unspecified | ramfs | ramfs provided | ignored | ramfs initfstype= should be respected regardless whether root= is given, as shown below: root= | initfstype= | chosen rootfs filesystem ------------+-------------+-------------------------- unspecified | unspecified | tmpfs (as before) unspecified | tmpfs | tmpfs (as before) unspecified | ramfs | ramfs (as before) provided | unspecified | ramfs (compatibility with before) provided | tmpfs | tmpfs (new) provided | ramfs | ramfs (new) This table represents the new behavior. Fixes: 6e19eded3684 ("initmpfs: use initramfs if rootfstype= or root= specified") Cc: <stable(a)vger.kernel.org> Reviewed-by: Stefan Berger <stefanb(a)linux.ibm.com> Signed-off-by: Rob Landley <rob(a)landley.net> Signed-off-by: Stefan Berger <stefanb(a)linux.ibm.com> --- init/do_mounts.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/init/do_mounts.c b/init/do_mounts.c index 5fdef94f0864..279ad28bf4fb 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -510,7 +510,10 @@ struct file_system_type rootfs_fs_type = { void __init init_rootfs(void) { - if (IS_ENABLED(CONFIG_TMPFS) && !saved_root_name[0] && - (!root_fs_names || strstr(root_fs_names, "tmpfs"))) - is_tmpfs = true; + if (IS_ENABLED(CONFIG_TMPFS)) { + if (!saved_root_name[0] && !root_fs_names) + is_tmpfs = true; + else if (root_fs_names && !!strstr(root_fs_names, "tmpfs")) + is_tmpfs = true; + } } -- 2.41.0

1 year, 1 month

3
2
0 0

[RESEND PATCH v4 7/7] serial: 8250_exar: Set missing rs485_supported flag

by Lino Sanfilippo

The UART supports an auto-RTS mode in which the RTS pin is automatically activated during transmission. So mark this mode as being supported even if RTS is not controlled by the driver but the UART. Also the serial core expects now at least one of both modes rts-on-send or rts-after-send to be supported. This is since during sanitization unsupported flags are deleted from a RS485 configuration set by userspace. However if the configuration ends up with both flags unset, the core prints a warning since it considers such a configuration invalid (see uart_sanitize_serial_rs485()). Cc: stable(a)vger.kernel.org Signed-off-by: Lino Sanfilippo <l.sanfilippo(a)kunbus.com> --- drivers/tty/serial/8250/8250_exar.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c index 6085d356ad86..23366f868ae3 100644 --- a/drivers/tty/serial/8250/8250_exar.c +++ b/drivers/tty/serial/8250/8250_exar.c @@ -480,7 +480,7 @@ static int sealevel_rs485_config(struct uart_port *port, struct ktermios *termio } static const struct serial_rs485 generic_rs485_supported = { - .flags = SER_RS485_ENABLED, + .flags = SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND, }; static const struct exar8250_platform exar8250_default_platform = { @@ -524,7 +524,8 @@ static int iot2040_rs485_config(struct uart_port *port, struct ktermios *termios } static const struct serial_rs485 iot2040_rs485_supported = { - .flags = SER_RS485_ENABLED | SER_RS485_RX_DURING_TX | SER_RS485_TERMINATE_BUS, + .flags = SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND | + SER_RS485_RX_DURING_TX | SER_RS485_TERMINATE_BUS, }; static const struct property_entry iot2040_gpio_properties[] = { -- 2.42.0

1 year, 1 month

1
0
0 0

[RESEND PATCH v4 6/7] serial: omap: do not override settings for RS485 support

by Lino Sanfilippo

In serial_omap_rs485() RS485 support may be deactivated due to a missing RTS GPIO. This is done by nullifying the ports rs485_supported struct. After that however the serial_omap_rs485_supported struct is assigned to the same structure unconditionally, which results in an unintended reactivation of RS485 support. Fix this by callling serial_omap_rs485() after the assignment of rs485_supported. Fixes: e2752ae3cfc9 ("serial: omap: Disallow RS-485 if rts-gpio is not specified") Cc: stable(a)vger.kernel.org Signed-off-by: Lino Sanfilippo <l.sanfilippo(a)kunbus.com> --- drivers/tty/serial/omap-serial.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index ad4c1c5d0a7f..d9b2936308c4 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -1604,10 +1604,6 @@ static int serial_omap_probe(struct platform_device *pdev) dev_info(up->port.dev, "no wakeirq for uart%d\n", up->port.line); - ret = serial_omap_probe_rs485(up, &pdev->dev); - if (ret < 0) - goto err_rs485; - sprintf(up->name, "OMAP UART%d", up->port.line); up->port.mapbase = mem->start; up->port.membase = base; @@ -1622,6 +1618,10 @@ static int serial_omap_probe(struct platform_device *pdev) DEFAULT_CLK_SPEED); } + ret = serial_omap_probe_rs485(up, &pdev->dev); + if (ret < 0) + goto err_rs485; + up->latency = PM_QOS_CPU_LATENCY_DEFAULT_VALUE; up->calc_latency = PM_QOS_CPU_LATENCY_DEFAULT_VALUE; cpu_latency_qos_add_request(&up->pm_qos_request, up->latency); -- 2.42.0

1 year, 1 month

1
0
0 0

[RESEND PATCH v4 5/7] serial: core, imx: do not set RS485 enabled if it is not supported

by Lino Sanfilippo

If the imx driver cannot support RS485 it sets the ports rs485_supported structure to NULL. But it still calls uart_get_rs485_mode() which may set the RS485_ENABLED flag nevertheless. This may lead to an attempt to configure RS485 even if it is not supported when the flag is evaluated in uart_configure_port() at port startup. Avoid this by bailing out of uart_get_rs485_mode() if the RS485_ENABLED flag is not supported by the caller. With this fix a check for RTS availability is now obsolete in the imx driver, since it can not evaluate to true any more. Remove this check, too. Fixes: 00d7a00e2a6f ("serial: imx: Fill in rs485_supported") Cc: Shawn Guo <shawnguo(a)kernel.org> Cc: Sascha Hauer <s.hauer(a)pengutronix.de> Cc: stable(a)vger.kernel.org Suggested-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> Signed-off-by: Lino Sanfilippo <l.sanfilippo(a)kunbus.com> --- drivers/tty/serial/imx.c | 4 ---- drivers/tty/serial/serial_core.c | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index 9cffeb23112b..98b78d360a74 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -2328,10 +2328,6 @@ static int imx_uart_probe(struct platform_device *pdev) return ret; } - if (sport->port.rs485.flags & SER_RS485_ENABLED && - (!sport->have_rtscts && !sport->have_rtsgpio)) - dev_err(&pdev->dev, "no RTS control, disabling rs485\n"); - /* * If using the i.MX UART RTS/CTS control then the RTS (CTS_B) * signal cannot be set low during transmission in case the diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index b636e2ce6e8b..518e19036983 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -3588,6 +3588,9 @@ int uart_get_rs485_mode(struct uart_port *port) u32 rs485_delay[2]; int ret; + if (!(port->rs485_supported.flags & SER_RS485_ENABLED)) + return 0; + ret = device_property_read_u32_array(dev, "rs485-rts-delay", rs485_delay, 2); if (!ret) { -- 2.42.0

1 year, 1 month

1
0
0 0

[RESEND PATCH v4 4/7] serial: core: make sure RS485 cannot be enabled when it is not supported

by Lino Sanfilippo

Some uart drivers specify a rs485_config() function and then decide later to disable RS485 support for some reason (e.g. imx and ar933). In these cases userspace may be able to activate RS485 via TIOCSRS485 nevertheless, since in uart_set_rs485_config() an existing rs485_config() function indicates that RS485 is supported. Make sure that this is not longer possible by checking the uarts rs485_supported.flags instead and bailing out if SER_RS485_ENABLED is not set. Furthermore instead of returning an empty structure return -ENOTTY if the RS485 configuration is requested via TIOCGRS485 but RS485 is not supported. This has a small impact on userspace visibility but it is consistent with the -ENOTTY error for TIOCGRS485. Fixes: e849145e1fdd ("serial: ar933x: Fill in rs485_supported") Fixes: 55e18c6b6d42 ("serial: imx: Remove serial_rs485 sanitization") Cc: Shawn Guo <shawnguo(a)kernel.org> Cc: Sascha Hauer <s.hauer(a)pengutronix.de> Cc: stable(a)vger.kernel.org Signed-off-by: Lino Sanfilippo <l.sanfilippo(a)kunbus.com> --- drivers/tty/serial/serial_core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index b96fc2ba8596..b636e2ce6e8b 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -1444,6 +1444,9 @@ static int uart_get_rs485_config(struct uart_port *port, unsigned long flags; struct serial_rs485 aux; + if (!(port->rs485_supported.flags & SER_RS485_ENABLED)) + return -ENOTTY; + uart_port_lock_irqsave(port, &flags); aux = port->rs485; uart_port_unlock_irqrestore(port, flags); @@ -1461,7 +1464,7 @@ static int uart_set_rs485_config(struct tty_struct *tty, struct uart_port *port, int ret; unsigned long flags; - if (!port->rs485_config) + if (!(port->rs485_supported.flags & SER_RS485_ENABLED)) return -ENOTTY; if (copy_from_user(&rs485, rs485_user, sizeof(*rs485_user))) -- 2.42.0

1 year, 1 month

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror November 2023