5.10.113-rc1 review
Subsystems (6)
Greg Kroah-Hartman
maintainercover 5.10.113-rc1 review
This is the start of the stable review cycle for the 5.10.113 release. There are 86 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 Thu, 28 Apr 2022 08:17:22 +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.10.113-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.10.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.10.113-rc1
Marek Vasut <[email protected]>
Revert "net: micrel: fix KS8851_MLL Kconfig"
Khazhismel Kumykov <[email protected]>
block/compat_ioctl: fix range check in BLKGETSIZE
Lee Jones <[email protected]>
staging: ion: Prevent incorrect reference counting behavour
Tudor Ambarus <[email protected]>
spi: atmel-quadspi: Fix the buswidth adjustment between spi-mem and controller
Ye Bin <[email protected]>
jbd2: fix a potential race while discarding reserved buffers after an abort
Oliver Hartkopp <[email protected]>
can: isotp: stop timeout monitoring when no first frame was sent
Theodore Ts'o <[email protected]>
ext4: force overhead calculation if the s_overhead_cluster makes no sense
Theodore Ts'o <[email protected]>
ext4: fix overhead calculation to account for the reserved gdt blocks
wangjianjian (C) <[email protected]>
ext4, doc: fix incorrect h_reserved size
Tadeusz Struk <[email protected]>
ext4: limit length to bitmap_maxbytes - blocksize in punch_hole
Ye Bin <[email protected]>
ext4: fix use-after-free in ext4_search_dir
Ye Bin <[email protected]>
ext4: fix symlink file size not match to file content
Darrick J. Wong <[email protected]>
ext4: fix fallocate to use file_modified to update permissions consistently
Leo Yan <[email protected]>
perf report: Set PERF_SAMPLE_DATA_SRC bit for Arm SPE event
Athira Rajeev <[email protected]>
powerpc/perf: Fix power9 event alternatives
Miaoqian Lin <[email protected]>
drm/vc4: Use pm_runtime_resume_and_get to fix pm_runtime_get_sync() usage
Alexey Kardashevskiy <[email protected]>
KVM: PPC: Fix TCE handling for VFIO
Dave Stevenson <[email protected]>
drm/panel/raspberrypi-touchscreen: Initialise the bridge in prepare
Dave Stevenson <[email protected]>
drm/panel/raspberrypi-touchscreen: Avoid NULL deref if not initialised
Zhipeng Xie <[email protected]>
perf/core: Fix perf_mmap fail when CONFIG_PERF_USE_VMALLOC enabled
kuyo chang <[email protected]>
sched/pelt: Fix attach_entity_load_avg() corner case
Rob Herring <[email protected]>
arm_pmu: Validate single/group leader events
Sergey Matyukevich <[email protected]>
ARC: entry: fix syscall_trace_exit argument
Sasha Neftin <[email protected]>
e1000e: Fix possible overflow in LTR decoding
Xiaomeng Tong <[email protected]>
ASoC: soc-dapm: fix two incorrect uses of list iterator
Mario Limonciello <[email protected]>
gpio: Request interrupts after IRQ is initialized
Paolo Valerio <[email protected]>
openvswitch: fix OOB access in reserve_sfa_size()
Max Filippov <[email protected]>
xtensa: fix a7 clobbering in coprocessor context load/store
Guo Ren <[email protected]>
xtensa: patch_text: Fixup last cpu should be master
Manuel Ullmann <[email protected]>
net: atlantic: invert deep par in pm functions, preventing null derefs
Xiaomeng Tong <[email protected]>
dma: at_xdmac: fix a missing check on list iterator
Zheyu Ma <[email protected]>
ata: pata_marvell: Check the 'bmdma_addr' beforing reading
Alistair Popple <[email protected]>
mm/mmu_notifier.c: fix race in mmu_interval_notifier_remove()
Nico Pache <[email protected]>
oom_kill.c: futex: delay the OOM reaper to allow time for proper futex cleanup
Christophe Leroy <[email protected]>
mm, hugetlb: allow for "high" userspace addresses
Shubhrajyoti Datta <[email protected]>
EDAC/synopsys: Read the error count from the correct register
Christoph Hellwig <[email protected]>
nvme-pci: disable namespace identifiers for Qemu controllers
Christoph Hellwig <[email protected]>
nvme: add a quirk to disable namespace identifiers
Mikulas Patocka <[email protected]>
stat: fix inconsistency between struct stat and struct compat_stat
Mike Christie <[email protected]>
scsi: qedi: Fix failed disconnect handling
Tomas Melin <[email protected]>
net: macb: Restart tx only if queue pointer is lagging
Xiaoke Wang <[email protected]>
drm/msm/mdp5: check the return of kzalloc()
Lv Ruyi <[email protected]>
dpaa_eth: Fix missing of_node_put in dpaa_get_ts_info()
Borislav Petkov <[email protected]>
brcmfmac: sdio: Fix undefined behavior due to shift overflowing the constant
Borislav Petkov <[email protected]>
mt76: Fix undefined behavior due to shift overflowing the constant
Kai-Heng Feng <[email protected]>
net: atlantic: Avoid out-of-bounds indexing
David Howells <[email protected]>
cifs: Check the IOCB_DIRECT flag, not O_DIRECT
Hongbin Wang <[email protected]>
vxlan: fix error return code in vxlan_fdb_append
Rob Herring <[email protected]>
arm64: dts: imx: Fix imx8*-var-som touchscreen property sizes
Borislav Petkov <[email protected]>
ALSA: usb-audio: Fix undefined behavior due to shift overflowing the constant
Jiapeng Chong <[email protected]>
platform/x86: samsung-laptop: Fix an unsigned comparison which can never be negative
Sameer Pujar <[email protected]>
reset: tegra-bpmp: Restore Handle errors in BPMP response
Kees Cook <[email protected]>
ARM: vexpress/spc: Avoid negative array index when !SMP
Muchun Song <[email protected]>
arm64: mm: fix p?d_leaf()
Anshuman Khandual <[email protected]>
arm64/mm: Remove [PUD|PMD]_TABLE_BIT from [pud|pmd]_bad()
Ido Schimmel <[email protected]>
selftests: mlxsw: vxlan_flooding: Prevent flooding of unwanted packets
Dave Jiang <[email protected]>
dmaengine: idxd: add RO check for wq max_transfer_size write
Dave Jiang <[email protected]>
dmaengine: idxd: add RO check for wq max_batch_size write
Kevin Hao <[email protected]>
net: stmmac: Use readl_poll_timeout_atomic() in atomic state
Eric Dumazet <[email protected]>
netlink: reset network and mac headers in netlink_dump()
Eric Dumazet <[email protected]>
ipv6: make ip6_rt_gc_expire an atomic_t
David Ahern <[email protected]>
l3mdev: l3mdev_master_upper_ifindex_by_index_rcu should be using netdev_master_upper_dev_get_rcu
Eric Dumazet <[email protected]>
net/sched: cls_u32: fix possible leak in u32_init_knode()
Peilin Ye <[email protected]>
ip6_gre: Fix skb_under_panic in __gre6_xmit()
Peilin Ye <[email protected]>
ip6_gre: Avoid updating tunnel->tun_hlen in __gre6_xmit()
Hangbin Liu <[email protected]>
net/packet: fix packet_sock xmit return value checking
Tony Lu <[email protected]>
net/smc: Fix sock leak when release after smc_shutdown()
David Howells <[email protected]>
rxrpc: Restore removed timer deletion
Sasha Neftin <[email protected]>
igc: Fix BUG: scheduling while atomic
Sasha Neftin <[email protected]>
igc: Fix infinite loop in release_swfw_sync
Sabrina Dubroca <[email protected]>
esp: limit skb_page_frag_refill use to a single page
Allen-KH Cheng <[email protected]>
spi: spi-mtk-nor: initialize spi controller after resume
zhangqilong <[email protected]>
dmaengine: mediatek:Fix PM usage reference leak of mtk_uart_apdma_alloc_chan_resources
Miaoqian Lin <[email protected]>
dmaengine: imx-sdma: Fix error checking in sdma_event_remap
Srinivas Kandagatla <[email protected]>
ASoC: codecs: wcd934x: do not switch off SIDO Buck when codec is in use
Miaoqian Lin <[email protected]>
ASoC: msm8916-wcd-digital: Check failure for devm_snd_soc_register_component
Mark Brown <[email protected]>
ASoC: atmel: Remove system clock tree configuration for at91sam9g20ek
Jiazi Li <[email protected]>
dm: fix mempool NULL pointer race when completing IO
Tim Crawford <[email protected]>
ALSA: hda/realtek: Add quirk for Clevo NP70PNP
Takashi Iwai <[email protected]>
ALSA: usb-audio: Clear MIDI port active flag after draining
Eric Dumazet <[email protected]>
net/sched: cls_u32: fix netns refcount changes in u32_change()
Bob Peterson <[email protected]>
gfs2: assign rgrp glock before compute_bitstructs
Adrian Hunter <[email protected]>
perf tools: Fix segfault accessing sample_id xyarray
Daniel Bristot de Oliveira <[email protected]>
tracing: Dump stacktrace trigger to the corresponding instance
Xiongwei Song <[email protected]>
mm: page_alloc: fix building error on -Werror=array-compare
Kees Cook <[email protected]>
etherdevice: Adjust ether_addr* prototypes to silence -Wstringop-overead
-------------
Diffstat:
Documentation/filesystems/ext4/attributes.rst | 2 +- Makefile | 4 +- arch/arc/kernel/entry.S | 1 + arch/arm/mach-vexpress/spc.c | 2 +- arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi | 8 +-- arch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi | 8 +-- arch/arm64/include/asm/pgtable.h | 9 ++- arch/powerpc/kvm/book3s_64_vio.c | 45 +++++++------- arch/powerpc/kvm/book3s_64_vio_hv.c | 44 +++++++------- arch/powerpc/perf/power9-pmu.c | 8 +-- arch/x86/include/asm/compat.h | 6 +- arch/xtensa/kernel/coprocessor.S | 4 +- arch/xtensa/kernel/jump_label.c | 2 +- block/ioctl.c | 2 +- drivers/ata/pata_marvell.c | 2 + drivers/dma/at_xdmac.c | 12 ++-- drivers/dma/idxd/sysfs.c | 6 ++ drivers/dma/imx-sdma.c | 4 +- drivers/dma/mediatek/mtk-uart-apdma.c | 9 ++- drivers/edac/synopsys_edac.c | 16 +++-- drivers/gpio/gpiolib.c | 4 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 3 + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 13 +++- drivers/gpu/drm/vc4/vc4_dsi.c | 2 +- drivers/md/dm.c | 17 +++--- drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 8 +-- .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 8 +-- drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 24 ++++---- drivers/net/ethernet/cadence/macb_main.c | 8 +++ drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 8 ++- drivers/net/ethernet/intel/e1000e/ich8lan.c | 4 +- drivers/net/ethernet/intel/igc/igc_i225.c | 11 +++- drivers/net/ethernet/intel/igc/igc_phy.c | 4 +- drivers/net/ethernet/micrel/Kconfig | 1 - .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 4 +- drivers/net/vxlan.c | 4 +- .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76x2/pci.c | 2 +- drivers/nvme/host/core.c | 24 ++++++-- drivers/nvme/host/nvme.h | 5 ++ drivers/nvme/host/pci.c | 5 +- drivers/perf/arm_pmu.c | 10 ++-- drivers/platform/x86/samsung-laptop.c | 2 - drivers/reset/tegra/reset-bpmp.c | 9 ++- drivers/scsi/qedi/qedi_iscsi.c | 69 +++++++++++----------- drivers/spi/atmel-quadspi.c | 3 + drivers/spi/spi-mtk-nor.c | 12 +++- drivers/staging/android/ion/ion.c | 3 + fs/cifs/cifsfs.c | 2 +- fs/ext4/ext4.h | 6 +- fs/ext4/extents.c | 32 +++++++--- fs/ext4/inode.c | 18 +++++- fs/ext4/namei.c | 4 +- fs/ext4/page-io.c | 4 +- fs/ext4/super.c | 19 ++++-- fs/gfs2/rgrp.c | 9 +-- fs/hugetlbfs/inode.c | 9 +-- fs/jbd2/commit.c | 4 +- fs/stat.c | 19 +++--- include/linux/etherdevice.h | 5 +- include/linux/sched.h | 1 + include/linux/sched/mm.h | 8 +++ include/net/esp.h | 2 - include/net/netns/ipv6.h | 4 +- kernel/events/core.c | 2 +- kernel/events/internal.h | 5 ++ kernel/events/ring_buffer.c | 5 -- kernel/sched/fair.c | 10 ++-- kernel/trace/trace_events_trigger.c | 9 ++- mm/mmap.c | 8 --- mm/mmu_notifier.c | 14 ++++- mm/oom_kill.c | 54 ++++++++++++----- mm/page_alloc.c | 2 +- net/can/isotp.c | 10 +++- net/ipv4/esp4.c | 5 +- net/ipv6/esp6.c | 5 +- net/ipv6/ip6_gre.c | 14 +++-- net/ipv6/route.c | 11 ++-- net/l3mdev/l3mdev.c | 2 +- net/netlink/af_netlink.c | 7 +++ net/openvswitch/flow_netlink.c | 2 +- net/packet/af_packet.c | 13 ++-- net/rxrpc/net_ns.c | 2 + net/sched/cls_u32.c | 24 ++++---- net/smc/af_smc.c | 4 +- sound/pci/hda/patch_realtek.c | 1 + sound/soc/atmel/sam9g20_wm8731.c | 61 ------------------- sound/soc/codecs/msm8916-wcd-digital.c | 9 ++- sound/soc/codecs/wcd934x.c | 26 +------- sound/soc/soc-dapm.c | 6 +- sound/usb/midi.c | 1 + sound/usb/usbaudio.h | 2 +- tools/lib/perf/evlist.c | 3 +- tools/perf/builtin-report.c | 14 +++++ .../selftests/drivers/net/mlxsw/vxlan_flooding.sh | 17 ++++++ 95 files changed, 562 insertions(+), 395 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/86 etherdevice: Adjust ether_addr* prototypes to silence -Wstringop-overead
From: Kees Cook <[email protected]>
commit 2618a0dae09ef37728dab89ff60418cbe25ae6bd upstream.
With GCC 12, -Wstringop-overread was warning about an implicit cast from char[6] to char[8]. However, the extra 2 bytes are always thrown away, alignment doesn't matter, and the risk of hitting the edge of unallocated memory has been accepted, so this prototype can just be converted to a regular char *. Silences:
net/core/dev.c: In function ‘bpf_prog_run_generic_xdp’: net/core/dev.c:4618:21: warning: ‘ether_addr_equal_64bits’ reading 8 bytes from a region of size 6 [-Wstringop-overread]
4618 | orig_host = ether_addr_equal_64bits(eth->h_dest, > skb->dev->dev_addr);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~net/core/dev.c:4618:21: note: referencing argument 1 of type ‘const u8[8]’ {aka ‘const unsigned char[8]’} net/core/dev.c:4618:21: note: referencing argument 2 of type ‘const u8[8]’ {aka ‘const unsigned char[8]’}
In file included from net/core/dev.c:91: include/linux/etherdevice.h:375:20: note: in a call to function ‘ether_addr_equal_64bits’
375 | static inline bool ether_addr_equal_64bits(const u8 addr1[6+2],
| ^~~~~~~~~~~~~~~~~~~~~~~
--- include/linux/etherdevice.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
include/linux/etherdevice.h +2 -3
@@ -127,7 +127,7 @@ static inline bool is_multicast_ether_ad#endif } -static inline bool is_multicast_ether_addr_64bits (const u8 addr[6 +2 ]) +static inline bool is_multicast_ether_addr_64bits (const u8 *addr) {#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS ) &&BITS_PER_LONG ==64 #ifdef __BIG_ENDIAN
@@ -352,8 +352,7 @@ static inline bool ether_addr_equal(cons* Please note that alignment of addr1 & addr2 are only guaranteed to be 16 bits. */ -static inline bool ether_addr_equal_64bits (const u8 addr1[6 +2 ], -const u8 addr2[6 +2 ]) +static inline bool ether_addr_equal_64bits (const u8 *addr1,const u8 *addr2) {#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS ) &&BITS_PER_LONG ==64 u64 fold = (*(const u64 *)addr1) ^ (*(const u64 *)addr2);
Greg Kroah-Hartman
maintainerPATCH 2/86 mm: page_alloc: fix building error on -Werror=array-compare
In reply to Greg Kroah-HartmanFrom: Xiongwei Song <[email protected]>
commit ca831f29f8f25c97182e726429b38c0802200c8f upstream.
Arthur Marsh reported we would hit the error below when building kernel with gcc-12:
CC mm/page_alloc.o
mm/page_alloc.c: In function `mem_init_print_info':
mm/page_alloc.c:8173:27: error: comparison between two arrays [-Werror=array-compare]
8173 | if (start <= pos && pos < end && size > adj) \
|In C++20, the comparision between arrays should be warned.
--- mm/page_alloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/page_alloc.c +1 -1
@@ -7678,7 +7678,7 @@ void __init mem_init_print_info(const ch*/ #define adj_init_size (start, end, size, pos, adj) \ do { \ - if (start <= pos && pos < end && size > adj) \ + if (&start[0] <= &pos[0] && &pos[0] < &end[0] && size > adj) \ size -= adj; \ } while (0)
Greg Kroah-Hartman
maintainerPATCH 3/86 tracing: Dump stacktrace trigger to the corresponding instance
In reply to Greg Kroah-HartmanFrom: Daniel Bristot de Oliveira <[email protected]>
commit ce33c845b030c9cf768370c951bc699470b09fa7 upstream.
The stacktrace event trigger is not dumping the stacktrace to the instance where it was enabled, but to the global "instance."
Use the private_data, pointing to the trigger file, to figure out the corresponding trace instance, and use it in the trigger action, like snapshot_trigger does.
--- kernel/trace/trace_events_trigger.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
kernel/trace/trace_events_trigger.c +8 -1
@@ -1219,7 +1219,14 @@ static void stacktrace_trigger(struct event_trigger_data *data, void *rec, struct ring_buffer_event *event) { -trace_dump_stack (STACK_SKIP); + struct trace_event_file *file = data->private_data; +unsigned long flags; + +if (file) { +local_save_flags (flags); +__trace_stack (file->tr, flags,STACK_SKIP ,preempt_count ()); + }else +trace_dump_stack (STACK_SKIP ); } static void
Greg Kroah-Hartman
maintainerPATCH 4/86 perf tools: Fix segfault accessing sample_id xyarray
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
commit a668cc07f990d2ed19424d5c1a529521a9d1cee1 upstream.
perf_evsel::sample_id is an xyarray which can cause a segfault when accessed beyond its size. e.g.
# perf record -e intel_pt// -C 1 sleep 1 Segmentation fault (core dumped) #
That is happening because a dummy event is opened to capture text poke events accross all CPUs, however the mmap logic is allocating according to the number of user_requested_cpus.
In general, perf sometimes uses the evsel cpus to open events, and sometimes the evlist user_requested_cpus. However, it is not necessary to determine which case is which because the opened event file descriptors are also in an xyarray, the size of whch can be used to correctly allocate the size of the sample_id xyarray, because there is one ID per file descriptor.
Note, in the affected code path, perf_evsel fd array is subsequently used to get the file descriptor for the mmap, so it makes sense for the xyarrays to be the same size there.
--- tools/lib/perf/evlist.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
tools/lib/perf/evlist.c +1 -2
@@ -571,7 +571,6 @@ int perf_evlist__mmap_ops(struct perf_ev {struct perf_evsel *evsel;const struct perf_cpu_map *cpus = evlist->cpus; -const struct perf_thread_map *threads = evlist->threads;if (!ops || !ops->get || !ops->mmap)return -EINVAL ;
@@ -583,7 +582,7 @@ int perf_evlist__mmap_ops(struct perf_evperf_evlist__for_each_entry (evlist, evsel) {if ((evsel->attr.read_format &PERF_FORMAT_ID ) && evsel->sample_id ==NULL && -perf_evsel__alloc_id (evsel,perf_cpu_map__nr (cpus), threads->nr) <0 ) +perf_evsel__alloc_id (evsel, evsel->fd->max_x, evsel->fd->max_y) <0 )return -ENOMEM ; }
Greg Kroah-Hartman
maintainerPATCH 5/86 gfs2: assign rgrp glock before compute_bitstructs
In reply to Greg Kroah-HartmanFrom: Bob Peterson <[email protected]>
commit 428f651cb80b227af47fc302e4931791f2fb4741 upstream.
Before this patch, function read_rindex_entry called compute_bitstructs before it allocated a glock for the rgrp. But if compute_bitstructs found a problem with the rgrp, it called gfs2_consist_rgrpd, and that called gfs2_dump_glock for rgd->rd_gl which had not yet been assigned.
read_rindex_entry
compute_bitstructs
gfs2_consist_rgrpd
gfs2_dump_glock <---------rgd->rd_gl was not set.This patch changes read_rindex_entry so it assigns an rgrp glock before calling compute_bitstructs so gfs2_dump_glock does not reference an unassigned pointer. If an error is discovered, the glock must also be put, so a new goto and label were added.
--- fs/gfs2/rgrp.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
fs/gfs2/rgrp.c +5 -4
@@ -906,15 +906,15 @@ static int read_rindex_entry(struct gfs2 rgd->rd_bitbytes =be32_to_cpu (buf.ri_bitbytes);spin_lock_init (&rgd->rd_rsspin); - error =compute_bitstructs (rgd); -if (error) - goto fail; - error =gfs2_glock_get (sdp, rgd->rd_addr, &gfs2_rgrp_glops,CREATE , &rgd->rd_gl);if (error) goto fail; + error =compute_bitstructs (rgd); +if (error) + goto fail_glock; + rgd->rd_rgl = (struct gfs2_rgrp_lvb *)rgd->rd_gl->gl_lksb.sb_lvbptr; rgd->rd_flags &= ~(GFS2_RDF_UPTODATE |GFS2_RDF_PREFERRED );if (rgd->rd_data > sdp->sd_max_rg_data)
@@ -928,6 +928,7 @@ static int read_rindex_entry(struct gfs2 } error =0 ;/* someone else read in the rgrp; free it and ignore it */ +fail_glock:gfs2_glock_put (rgd->rd_gl); fail:
Greg Kroah-Hartman
maintainerPATCH 6/86 net/sched: cls_u32: fix netns refcount changes in u32_change()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
commit 3db09e762dc79584a69c10d74a6b98f89a9979f8 upstream.
We are now able to detect extra put_net() at the moment they happen, instead of much later in correct code paths.
u32_init_knode() / tcf_exts_init() populates the ->exts.net pointer, but as mentioned in tcf_exts_init(),
the refcount on netns has not been elevated yet.
The refcount is taken only once tcf_exts_get_net() is called.
So the two u32_destroy_key() calls from u32_change() are attempting to release an invalid reference on the netns.
syzbot report:
refcount_t: decrement hit 0; leaking memory.
WARNING: CPU: 0 PID: 21708 at lib/refcount.c:31 refcount_warn_saturate+0xbf/0x1e0 lib/refcount.c:31 Modules linked in: CPU: 0 PID: 21708 Comm: syz-executor.5 Not tainted 5.18.0-rc2-next-20220412-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:refcount_warn_saturate+0xbf/0x1e0 lib/refcount.c:31 Code: 1d 14 b6 b2 09 31 ff 89 de e8 6d e9 89 fd 84 db 75 e0 e8 84 e5 89 fd 48 c7 c7 40 aa 26 8a c6 05 f4 b5 b2 09 01 e8 e5 81 2e 05 <0f> 0b eb c4 e8 68 e5 89 fd 0f b6 1d e3 b5 b2 09 31 ff 89 de e8 38 RSP: 0018:ffffc900051af1b0 EFLAGS: 00010286 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 RDX: 0000000000040000 RSI: ffffffff8160a0c8 RDI: fffff52000a35e28 RBP: 0000000000000004 R08: 0000000000000000 R09: 0000000000000000 R10: ffffffff81604a9e R11: 0000000000000000 R12: 1ffff92000a35e3b R13: 00000000ffffffef R14: ffff8880211a0194 R15: ffff8880577d0a00 FS: 00007f25d183e700(0000) GS:ffff8880b9c00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f19c859c028 CR3: 0000000051009000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> __refcount_dec include/linux/refcount.h:344 [inline] refcount_dec include/linux/refcount.h:359 [inline] ref_tracker_free+0x535/0x6b0 lib/ref_tracker.c:118 netns_tracker_free include/net/net_namespace.h:327 [inline] put_net_track include/net/net_namespace.h:341 [inline] tcf_exts_put_net include/net/pkt_cls.h:255 [inline] u32_destroy_key.isra.0+0xa7/0x2b0 net/sched/cls_u32.c:394 u32_change+0xe01/0x3140 net/sched/cls_u32.c:909 tc_new_tfilter+0x98d/0x2200 net/sched/cls_api.c:2148 rtnetlink_rcv_msg+0x80d/0xb80 net/core/rtnetlink.c:6016 netlink_rcv_skb+0x153/0x420 net/netlink/af_netlink.c:2495 netlink_unicast_kernel net/netlink/af_netlink.c:1319 [inline] netlink_unicast+0x543/0x7f0 net/netlink/af_netlink.c:1345 netlink_sendmsg+0x904/0xe00 net/netlink/af_netlink.c:1921 sock_sendmsg_nosec net/socket.c:705 [inline] sock_sendmsg+0xcf/0x120 net/socket.c:725 ____sys_sendmsg+0x6e2/0x800 net/socket.c:2413 ___sys_sendmsg+0xf3/0x170 net/socket.c:2467 __sys_sendmsg+0xe5/0x1b0 net/socket.c:2496 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae RIP: 0033:0x7f25d0689049 Code: ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b8 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007f25d183e168 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 00007f25d079c030 RCX: 00007f25d0689049 RDX: 0000000000000000 RSI: 0000000020000340 RDI: 0000000000000005 RBP: 00007f25d06e308d R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 00007ffd0b752e3f R14: 00007f25d183e300 R15: 0000000000022000 </TASK>
--- net/sched/cls_u32.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
net/sched/cls_u32.c +10 -6
@@ -386,14 +386,19 @@ static int u32_init(struct tcf_proto *tpreturn 0 ; } -static int u32_destroy_key (struct tc_u_knode *n,bool free_pf) +static void __u32_destroy_key (struct tc_u_knode *n) {struct tc_u_hnode *ht =rtnl_dereference (n->ht_down);tcf_exts_destroy (&n->exts); -tcf_exts_put_net (&n->exts);if (ht && --ht->refcnt ==0 )kfree (ht); +kfree (n); +} + +static void u32_destroy_key (struct tc_u_knode *n,bool free_pf) +{ +tcf_exts_put_net (&n->exts);#ifdef CONFIG_CLS_U32_PERF if (free_pf)free_percpu (n->pf);
@@ -402,8 +407,7 @@ static int u32_destroy_key(struct tc_u_kif (free_pf)free_percpu (n->pcpu_success);#endif -kfree (n); -return 0 ; +__u32_destroy_key (n); }/* u32_delete_key_rcu should be called when free'ing a copied
@@ -898,13 +902,13 @@ static int u32_change(struct net *net, s tca[TCA_RATE], ovr, extack);if (err) { -u32_destroy_key (new, false); +__u32_destroy_key (new);return err; } err =u32_replace_hw_knode (tp, new, flags, extack);if (err) { -u32_destroy_key (new, false); +__u32_destroy_key (new);return err; }
Greg Kroah-Hartman
maintainerPATCH 7/86 ALSA: usb-audio: Clear MIDI port active flag after draining
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 0665886ad1392e6b5bae85d7a6ccbed48dca1522 upstream.
When a rawmidi output stream is closed, it calls the drain at first, then does trigger-off only when the drain returns -ERESTARTSYS as a fallback. It implies that each driver should turn off the stream properly after the drain. Meanwhile, USB-audio MIDI interface didn't change the port->active flag after the drain. This may leave the output work picking up the port that is closed right now, which eventually leads to a use-after-free for the already released rawmidi object.
This patch fixes the bug by properly clearing the port->active flag after the output drain.
--- sound/usb/midi.c | 1 + 1 file changed, 1 insertion(+)
sound/usb/midi.c +1 -0
@@ -1210,6 +1210,7 @@ static void snd_usbmidi_output_drain(str }while (drain_urbs && timeout);finish_wait (&ep->drain_wait, &wait); } + port->active =0 ;spin_unlock_irq (&ep->buffer_lock); }
Greg Kroah-Hartman
maintainerPATCH 8/86 ALSA: hda/realtek: Add quirk for Clevo NP70PNP
In reply to Greg Kroah-HartmanFrom: Tim Crawford <[email protected]>
commit 86222af07abf1f5f07a5873cc399c29ab8a9b8b8 upstream.
Fixes headset detection on Clevo NP70PNP.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -8897,6 +8897,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1558 ,0x8562 ,"Clevo NH[5|7][0-9]RZ[Q]" ,ALC269_FIXUP_DMIC ),SND_PCI_QUIRK (0x1558 ,0x8668 ,"Clevo NP50B[BE]" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x866d ,"Clevo NP5[05]PN[HJK]" ,ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE ), +SND_PCI_QUIRK (0x1558 ,0x867c ,"Clevo NP7[01]PNP" ,ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x867d ,"Clevo NP7[01]PN[HJK]" ,ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x8680 ,"Clevo NJ50LU" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x1558, 0x8686, "Clevo NH50[CZ]U", ALC256_FIXUP_MIC_NO_PRESENCE_AND_RESUME),
Greg Kroah-Hartman
maintainerPATCH 9/86 dm: fix mempool NULL pointer race when completing IO
In reply to Greg Kroah-HartmanFrom: Jiazi Li <[email protected]>
commit d208b89401e073de986dc891037c5a668f5d5d95 upstream.
dm_io_dec_pending() calls end_io_acct() first and will then dec md in-flight pending count. But if a task is swapping DM table at same time this can result in a crash due to mempool->elements being NULL:
task1 task2do_resume
->do_suspend
->dm_wait_for_completion
bio_endio
->clone_endio
->dm_io_dec_pending
->end_io_acct
->wakeup task1
->dm_swap_table
->__bind
->__bind_mempools
->bioset_exit
->mempool_exit
->free_io[ 67.330330] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000 ...... [ 67.330494] pstate: 80400085 (Nzcv daIf +PAN -UAO) [ 67.330510] pc : mempool_free+0x70/0xa0 [ 67.330515] lr : mempool_free+0x4c/0xa0 [ 67.330520] sp : ffffff8008013b20 [ 67.330524] x29: ffffff8008013b20 x28: 0000000000000004 [ 67.330530] x27: ffffffa8c2ff40a0 x26: 00000000ffff1cc8 [ 67.330535] x25: 0000000000000000 x24: ffffffdada34c800 [ 67.330541] x23: 0000000000000000 x22: ffffffdada34c800 [ 67.330547] x21: 00000000ffff1cc8 x20: ffffffd9a1304d80 [ 67.330552] x19: ffffffdada34c970 x18: 000000b312625d9c [ 67.330558] x17: 00000000002dcfbf x16: 00000000000006dd [ 67.330563] x15: 000000000093b41e x14: 0000000000000010 [ 67.330569] x13: 0000000000007f7a x12: 0000000034155555 [ 67.330574] x11: 0000000000000001 x10: 0000000000000001 [ 67.330579] x9 : 0000000000000000 x8 : 0000000000000000 [ 67.330585] x7 : 0000000000000000 x6 : ffffff80148b5c1a [ 67.330590] x5 : ffffff8008013ae0 x4 : 0000000000000001 [ 67.330596] x3 : ffffff80080139c8 x2 : ffffff801083bab8 [ 67.330601] x1 : 0000000000000000 x0 : ffffffdada34c970 [ 67.330609] Call trace: [ 67.330616] mempool_free+0x70/0xa0 [ 67.330627] bio_put+0xf8/0x110 [ 67.330638] dec_pending+0x13c/0x230 [ 67.330644] clone_endio+0x90/0x180 [ 67.330649] bio_endio+0x198/0x1b8 [ 67.330655] dec_pending+0x190/0x230 [ 67.330660] clone_endio+0x90/0x180 [ 67.330665] bio_endio+0x198/0x1b8 [ 67.330673] blk_update_request+0x214/0x428 [ 67.330683] scsi_end_request+0x2c/0x300 [ 67.330688] scsi_io_completion+0xa0/0x710 [ 67.330695] scsi_finish_command+0xd8/0x110 [ 67.330700] scsi_softirq_done+0x114/0x148 [ 67.330708] blk_done_softirq+0x74/0xd0 [ 67.330716] __do_softirq+0x18c/0x374 [ 67.330724] irq_exit+0xb4/0xb8 [ 67.330732] __handle_domain_irq+0x84/0xc0 [ 67.330737] gic_handle_irq+0x148/0x1b0 [ 67.330744] el1_irq+0xe8/0x190 [ 67.330753] lpm_cpuidle_enter+0x4f8/0x538 [ 67.330759] cpuidle_enter_state+0x1fc/0x398 [ 67.330764] cpuidle_enter+0x18/0x20 [ 67.330772] do_idle+0x1b4/0x290 [ 67.330778] cpu_startup_entry+0x20/0x28 [ 67.330786] secondary_start_kernel+0x160/0x170
Fix this by:
1) Establishing pointers to 'struct dm_io' members in dm_io_dec_pending() so that they may be passed into end_io_acct() _after_ free_io() is called.
2) Moving end_io_acct() after free_io().
--- drivers/md/dm.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
drivers/md/dm.c +10 -7
@@ -607,18 +607,17 @@ static void start_io_acct(struct dm_io * false, 0, &io->stats_aux); } -static void end_io_acct (struct dm_io *io) +static void end_io_acct (struct mapped_device *md,struct bio *bio, +unsigned long start_time,struct dm_stats_aux *stats_aux) { -struct mapped_device *md = io->md; -struct bio *bio = io->orig_bio; -unsigned long duration = jiffies - io->start_time; +unsigned long duration = jiffies - start_time; -bio_end_io_acct (bio, io->start_time); +bio_end_io_acct (bio, start_time);if (unlikely (dm_stats_used (&md->stats)))dm_stats_account_io (&md->stats,bio_data_dir (bio), bio->bi_iter.bi_sector,bio_sectors (bio), - true, duration, &io->stats_aux); + true, duration, stats_aux);/* nudge anyone waiting on suspend queue */ if (unlikely (wq_has_sleeper (&md->wait)))
@@ -903,6 +902,8 @@ static void dec_pending(struct dm_io *ioblk_status_t io_error;struct bio *bio;struct mapped_device *md = io->md; +unsigned long start_time =0 ; +struct dm_stats_aux stats_aux;/* Push-back supersedes any I/O errors */ if (unlikely (error)) {
@@ -929,8 +930,10 @@ static void dec_pending(struct dm_io *io io_error = io->status; bio = io->orig_bio; -end_io_acct (io); + start_time = io->start_time; + stats_aux = io->stats_aux;free_io (md, io); +end_io_acct (md, bio, start_time, &stats_aux);if (io_error ==BLK_STS_DM_REQUEUE )return ;
Greg Kroah-Hartman
maintainerPATCH 10/86 ASoC: atmel: Remove system clock tree configuration for at91sam9g20ek
In reply to Greg Kroah-HartmanFrom: Mark Brown <[email protected]>
[ Upstream commit c775cbf62ed4911e4f0f23880f01815753123690 ]
The MCLK of the WM8731 on the AT91SAM9G20-EK board is connected to the PCK0 output of the SoC, intended in the reference software to be supplied using PLLB and programmed to 12MHz. As originally written for use with a board file the audio driver was responsible for configuring the entire tree but in the conversion to the common clock framework the registration of the named pck0 and pllb clocks was removed so the driver has failed to instantiate ever since.
Since the WM8731 driver has had support for managing a MCLK provided via the common clock framework for some time we can simply drop all the clock management code from the machine driver other than configuration of the sysclk rate, the CODEC driver still respects that configuration from the machine driver.
--- sound/soc/atmel/sam9g20_wm8731.c | 61 -------------------------------- 1 file changed, 61 deletions(-)
sound/soc/atmel/sam9g20_wm8731.c +0 -61
@@ -46,35 +46,6 @@*/ #undef ENABLE_MIC_INPUT -static struct clk *mclk; - -static int at91sam9g20ek_set_bias_level (struct snd_soc_card *card, -struct snd_soc_dapm_context *dapm, -enum snd_soc_bias_level level) -{ -static int mclk_on; -int ret =0 ; - -switch (level) { -case SND_SOC_BIAS_ON : -case SND_SOC_BIAS_PREPARE : -if (!mclk_on) - ret =clk_enable (mclk); -if (ret ==0 ) - mclk_on =1 ; -break ; - -case SND_SOC_BIAS_OFF : -case SND_SOC_BIAS_STANDBY : -if (mclk_on) -clk_disable (mclk); - mclk_on =0 ; -break ; - } - -return ret; -} -static const struct snd_soc_dapm_widget at91sam9g20ek_dapm_widgets[] = {SND_SOC_DAPM_MIC ("Int Mic" ,NULL ),SND_SOC_DAPM_SPK ("Ext Spk" ,NULL ),
@@ -135,7 +106,6 @@ static struct snd_soc_card snd_soc_at91sam9g20ek = { .owner = THIS_MODULE, .dai_link = &at91sam9g20ek_dai, .num_links = 1, - .set_bias_level = at91sam9g20ek_set_bias_level, .dapm_widgets = at91sam9g20ek_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(at91sam9g20ek_dapm_widgets),
@@ -148,7 +118,6 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev) {struct device_node *np = pdev->dev.of_node;struct device_node *codec_np, *cpu_np; -struct clk *pllb;struct snd_soc_card *card = &snd_soc_at91sam9g20ek;int ret;
@@ -162,31 +131,6 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev)return -EINVAL ; } -/* -* Codec MCLK is supplied by PCK0 - set it up. -*/ - mclk =clk_get (NULL ,"pck0" ); -if (IS_ERR (mclk)) { -dev_err (&pdev->dev,"Failed to get MCLK\n" ); - ret =PTR_ERR (mclk); - goto err; - } - - pllb =clk_get (NULL ,"pllb" ); -if (IS_ERR (pllb)) { -dev_err (&pdev->dev,"Failed to get PLLB\n" ); - ret =PTR_ERR (pllb); - goto err_mclk; - } - ret =clk_set_parent (mclk, pllb); -clk_put (pllb); -if (ret !=0 ) { -dev_err (&pdev->dev,"Failed to set MCLK parent\n" ); - goto err_mclk; - } - -clk_set_rate (mclk,MCLK_RATE ); - card->dev = &pdev->dev;/* Parse device node info */
@@ -230,9 +174,6 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev)return ret; -err_mclk: -clk_put (mclk); - mclk =NULL ; err:atmel_ssc_put_audio (0 );return ret;
@@ -242,8 +183,6 @@ static int at91sam9g20ek_audio_remove(struct platform_device *pdev) {struct snd_soc_card *card =platform_get_drvdata (pdev); -clk_disable (mclk); - mclk =NULL ;snd_soc_unregister_card (card);atmel_ssc_put_audio (0 );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 11/86 ASoC: msm8916-wcd-digital: Check failure for devm_snd_soc_register_component
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit e927b05f3cc20de87f6b7d912a5bbe556931caca ]
devm_snd_soc_register_component() may fails, we should check the error and do the corresponding error handling.
--- sound/soc/codecs/msm8916-wcd-digital.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
sound/soc/codecs/msm8916-wcd-digital.c +8 -1
@@ -1206,9 +1206,16 @@ static int msm8916_wcd_digital_probe(struct platform_device *pdev)dev_set_drvdata (dev, priv); -return devm_snd_soc_register_component (dev, &msm8916_wcd_digital, + ret =devm_snd_soc_register_component (dev, &msm8916_wcd_digital, msm8916_wcd_digital_dai,ARRAY_SIZE (msm8916_wcd_digital_dai)); +if (ret) + goto err_mclk; + +return 0 ; + +err_mclk: +clk_disable_unprepare (priv->mclk); err_clk:clk_disable_unprepare (priv->ahbclk);return ret;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 12/86 ASoC: codecs: wcd934x: do not switch off SIDO Buck when codec is in use
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit db6dd1bee63d1d88fbddfe07af800af5948ac28e ]
SIDO(Single-Inductor Dual-Ouput) Buck powers up both analog and digital circuits along with internal memory, powering off this is the last thing that codec should do when going to very low power.
Current code was powering off this Buck if there are no users of sysclk, which is not correct. Powering off this buck will result in no register access. This code path was never tested until recently after adding pm support in SoundWire controller. Fix this by removing the buck poweroff when the codec is active and also the code that is not used.
Without this patch all the read/write transactions will never complete and results in SLIMBus Errors like:
qcom,slim-ngd qcom,slim-ngd.1: Tx:MT:0x0, MC:0x60, LA:0xcf failed:-110 wcd934x-codec wcd934x-codec.1.auto: ASoC: error at soc_component_read_no_lock
on wcd934x-codec.1.auto for register: [0x00000d05] -110
qcom,slim-ngd-ctrl 171c0000.slim: Error Interrupt received 0x82000000
--- sound/soc/codecs/wcd934x.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-)
sound/soc/codecs/wcd934x.c +1 -25
@@ -1188,29 +1188,7 @@ static int wcd934x_set_sido_input_src(struct wcd934x_codec *wcd, int sido_src)if (sido_src == wcd->sido_input_src)return 0 ; -if (sido_src ==SIDO_SOURCE_INTERNAL ) { -regmap_update_bits (wcd->regmap,WCD934X_ANA_BUCK_CTL , -WCD934X_ANA_BUCK_HI_ACCU_EN_MASK ,0 ); -usleep_range (100 ,110 ); -regmap_update_bits (wcd->regmap,WCD934X_ANA_BUCK_CTL , -WCD934X_ANA_BUCK_HI_ACCU_PRE_ENX_MASK ,0x0 ); -usleep_range (100 ,110 ); -regmap_update_bits (wcd->regmap,WCD934X_ANA_RCO , -WCD934X_ANA_RCO_BG_EN_MASK ,0 ); -usleep_range (100 ,110 ); -regmap_update_bits (wcd->regmap,WCD934X_ANA_BUCK_CTL , -WCD934X_ANA_BUCK_PRE_EN1_MASK , -WCD934X_ANA_BUCK_PRE_EN1_ENABLE ); -usleep_range (100 ,110 ); -regmap_update_bits (wcd->regmap,WCD934X_ANA_BUCK_CTL , -WCD934X_ANA_BUCK_PRE_EN2_MASK , -WCD934X_ANA_BUCK_PRE_EN2_ENABLE ); -usleep_range (100 ,110 ); -regmap_update_bits (wcd->regmap,WCD934X_ANA_BUCK_CTL , -WCD934X_ANA_BUCK_HI_ACCU_EN_MASK , -WCD934X_ANA_BUCK_HI_ACCU_ENABLE ); -usleep_range (100 ,110 ); - }else if (sido_src ==SIDO_SOURCE_RCO_BG ) { +if (sido_src ==SIDO_SOURCE_RCO_BG ) {regmap_update_bits (wcd->regmap,WCD934X_ANA_RCO ,WCD934X_ANA_RCO_BG_EN_MASK ,WCD934X_ANA_RCO_BG_ENABLE );
@@ -1296,8 +1274,6 @@ static int wcd934x_disable_ana_bias_and_syclk(struct wcd934x_codec *wcd)regmap_update_bits (wcd->regmap,WCD934X_CLK_SYS_MCLK_PRG ,WCD934X_EXT_CLK_BUF_EN_MASK |WCD934X_MCLK_EN_MASK ,0x0 ); -wcd934x_set_sido_input_src (wcd,SIDO_SOURCE_INTERNAL ); -regmap_update_bits (wcd->regmap,WCD934X_ANA_BIAS ,WCD934X_ANA_BIAS_EN_MASK ,0 ); regmap_update_bits(wcd->regmap, WCD934X_ANA_BIAS,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 13/86 dmaengine: imx-sdma: Fix error checking in sdma_event_remap
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 7104b9cb35a33ad803a1adbbfa50569b008faf15 ]
of_parse_phandle() returns NULL on errors, rather than error pointers. Using NULL check on grp_np to fix this.
--- drivers/dma/imx-sdma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/dma/imx-sdma.c +2 -2
@@ -1789,7 +1789,7 @@ static int sdma_event_remap(struct sdma_engine *sdma)u32 reg, val, shift, num_map, i;int ret =0 ; -if (IS_ERR (np) ||IS_ERR (gpr_np)) +if (IS_ERR (np) || !gpr_np) goto out; event_remap =of_find_property (np, propname,NULL );
@@ -1837,7 +1837,7 @@ static int sdma_event_remap(struct sdma_engine *sdma) } out: -if (!IS_ERR (gpr_np)) +if (gpr_np)of_node_put (gpr_np);return ret;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 14/86 dmaengine: mediatek:Fix PM usage reference leak of mtk_uart_apdma_alloc_chan_resources
In reply to Greg Kroah-HartmanFrom: zhangqilong <[email protected]>
[ Upstream commit 545b2baac89b859180e51215468c05d85ea8465a ]
pm_runtime_get_sync will increment pm usage counter even it failed. Forgetting to putting operation will result in reference leak here. We fix it:
1) Replacing it with pm_runtime_resume_and_get to keep usage counter balanced.
2) Add putting operation before returning error.
--- drivers/dma/mediatek/mtk-uart-apdma.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/dma/mediatek/mtk-uart-apdma.c +6 -3
@@ -274,7 +274,7 @@ static int mtk_uart_apdma_alloc_chan_resources(struct dma_chan *chan)unsigned int status;int ret; - ret =pm_runtime_get_sync (mtkd->ddev.dev); + ret =pm_runtime_resume_and_get (mtkd->ddev.dev);if (ret <0 ) {pm_runtime_put_noidle (chan->device->dev);return ret;
@@ -288,18 +288,21 @@ static int mtk_uart_apdma_alloc_chan_resources(struct dma_chan *chan) ret =readx_poll_timeout (readl, c->base +VFF_EN , status, !status,10 ,100 );if (ret) -return ret; + goto err_pm; ret =request_irq (c->irq, mtk_uart_apdma_irq_handler,IRQF_TRIGGER_NONE ,KBUILD_MODNAME , chan);if (ret <0 ) {dev_err (chan->device->dev,"Can't request dma IRQ\n" ); -return -EINVAL ; + ret = -EINVAL ; + goto err_pm; }if (mtkd->support_33bits)mtk_uart_apdma_write (c,VFF_4G_SUPPORT ,VFF_4G_SUPPORT_CLR_B ); +err_pm: +pm_runtime_put_noidle (mtkd->ddev.dev);return ret; }
Signature · 1 line
2.35.1
Re: [PATCH 5.10 14/86] dmaengine: mediatek:Fix PM usage reference leak of mtk_uart_apdma_alloc_chan_resources
Hi!
Quoted 5 lines
pm_runtime_get_syncwill increment pm usage counter even it failed. Forgetting to putting operation will result in reference leak here. We fix it:
1) Replacing it withpm_runtime_resume_and_getto keep usage counter balanced.
Suspect.
Quoted 1 line
2) Add putting operation before returning error.
Yes but you also put in success case, which is likely wrong. mtk_uart_apdma_free_chan_resources() does second put.
drivers/dma/mediatek/mtk-uart-apdma.c static int mtk_uart_apdma_alloc_chan_resources(struct dma_chan *chan) · line 280
Quoted 10 lines
+++
b/drivers/dma/mediatek/mtk-uart-apdma.cdrivers/dma/mediatek/mtk-uart-apdma.c +1
-1@@ -274,7 +274,7 @@ static int mtk_uart_apdma_alloc_chan_resources(struct dma_chan *chan)unsigned int status;int ret; - ret =pm_runtime_get_sync (mtkd->ddev.dev); + ret =pm_runtime_resume_and_get (mtkd->ddev.dev);if (ret <0 ) {pm_runtime_put_noidle (chan->device->dev);return ret;
This is suspect, too. What is the put_noidle doing there? Seems like it was meant to undo the get_sync operation, but uses different argument?
drivers/dma/mediatek/mtk-uart-apdma.c static int mtk_uart_apdma_alloc_chan_resources(struct dma_chan *chan) · line 295
Quoted 9 lines
drivers/dma/mediatek/mtk-uart-apdma.c +2
-0@@ -288,18 +288,21 @@ static int mtk_uart_apdma_alloc_chan_resources(struct dma_chan *chan)if (mtkd->support_33bits)mtk_uart_apdma_write (c,VFF_4G_SUPPORT ,VFF_4G_SUPPORT_CLR_B ); +err_pm: +pm_runtime_put_noidle (mtkd->ddev.dev);return ret; }
This should only be done in error case.
Best regards,
Pavel
Signature · 1 line
People of Russia, stop Putin before his war on Ukraine escalates.
Re: [PATCH 5.10 14/86] dmaengine: mediatek:Fix PM usage reference leak of mtk_uart_apdma_alloc_chan_resources
Hi!
Quoted 6 lines
Quoted 5 lines
pm_runtime_get_syncwill increment pm usage counter even it failed. Forgetting to putting operation will result in reference leak here. We fix it:
1) Replacing it withpm_runtime_resume_and_getto keep usage counter balanced.
Quoted 6 lines
Suspect.
Quoted 1 line
2) Add putting operation before returning error.
Yes but you also put in success case, which is likely wrong.
mtk_uart_apdma_free_chan_resources()does second put.
This is possible fix for the second problem:
drivers/dma/mediatek/mtk-uart-apdma.c +2 -1
@@ -300,7 +300,8 @@ static int mtk_uart_apdma_alloc_chan_resources(struct dma_chan *chan)if (mtkd->support_33bits)mtk_uart_apdma_write (c,VFF_4G_SUPPORT ,VFF_4G_SUPPORT_CLR_B ); - +return 0 ; + err_pm:pm_runtime_put_noidle (mtkd->ddev.dev);return ret;
Best regards,
Pavel
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Greg Kroah-Hartman
maintainerPATCH 15/86 spi: spi-mtk-nor: initialize spi controller after resume
In reply to Greg Kroah-HartmanFrom: Allen-KH Cheng <[email protected]>
[ Upstream commit 317c2045618cc1f8d38beb8c93a7bdb6ad8638c6 ]
After system resumes, the registers of nor controller are initialized with default values. The nor controller will not function properly.
To handle both issues above, we add mtk_nor_init() in mtk_nor_resume after pm_runtime_force_resume().
--- drivers/spi/spi-mtk-nor.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/spi/spi-mtk-nor.c +11 -1
@@ -895,7 +895,17 @@ static int __maybe_unused mtk_nor_suspend(struct device *dev)static int __maybe_unused mtk_nor_resume (struct device *dev) { -return pm_runtime_force_resume (dev); +struct spi_controller *ctlr =dev_get_drvdata (dev); +struct mtk_nor *sp =spi_controller_get_devdata (ctlr); +int ret; + + ret =pm_runtime_force_resume (dev); +if (ret) +return ret; + +mtk_nor_init (sp); + +return 0 ; }static const struct dev_pm_ops mtk_nor_pm_ops = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 16/86 esp: limit skb_page_frag_refill use to a single page
In reply to Greg Kroah-HartmanFrom: Sabrina Dubroca <[email protected]>
[ Upstream commit 5bd8baab087dff657e05387aee802e70304cc813 ]
Commit ebe48d368e97 ("esp: Fix possible buffer overflow in ESP transformation") tried to fix skb_page_frag_refill usage in ESP by capping allocsize to 32k, but that doesn't completely solve the issue, as skb_page_frag_refill may return a single page. If that happens, we will write out of bounds, despite the check introduced in the previous patch.
This patch forces COW in cases where we would end up calling skb_page_frag_refill with a size larger than a page (first in esp_output_head with tailen, then in esp_output_tail with skb->data_len).
--- include/net/esp.h | 2 -- net/ipv4/esp4.c | 5 ++--- net/ipv6/esp6.c | 5 ++--- 3 files changed, 4 insertions(+), 8 deletions(-)
include/net/esp.h +0 -2
@@ -4,8 +4,6 @@#include <linux/skbuff.h> -#define ESP_SKB_FRAG_MAXSIZE (PAGE_SIZE << SKB_FRAG_PAGE_ORDER) -struct ip_esp_hdr ;static inline struct ip_esp_hdr *ip_esp_hdr (const struct sk_buff *skb)
net/ipv4/esp4.c +2 -3
@@ -448,7 +448,6 @@ int esp_output_head(struct xfrm_state *x, struct sk_buff *skb, struct esp_info *struct page *page;struct sk_buff *trailer;int tailen = esp->tailen; -unsigned int allocsz;/* this is non-NULL only with TCP/UDP Encapsulation */ if (x->encap) {
@@ -458,8 +457,8 @@ int esp_output_head(struct xfrm_state *x, struct sk_buff *skb, struct esp_info *return err; } - allocsz =ALIGN (skb->data_len + tailen,L1_CACHE_BYTES ); -if (allocsz >ESP_SKB_FRAG_MAXSIZE ) +if (ALIGN (tailen,L1_CACHE_BYTES ) >PAGE_SIZE || +ALIGN (skb->data_len,L1_CACHE_BYTES ) >PAGE_SIZE ) goto cow;if (!skb_cloned (skb)) {
net/ipv6/esp6.c +2 -3
@@ -483,7 +483,6 @@ int esp6_output_head(struct xfrm_state *x, struct sk_buff *skb, struct esp_infostruct page *page;struct sk_buff *trailer;int tailen = esp->tailen; -unsigned int allocsz;if (x->encap) {int err =esp6_output_encap (x, skb, esp);
@@ -492,8 +491,8 @@ int esp6_output_head(struct xfrm_state *x, struct sk_buff *skb, struct esp_inforeturn err; } - allocsz =ALIGN (skb->data_len + tailen,L1_CACHE_BYTES ); -if (allocsz >ESP_SKB_FRAG_MAXSIZE ) +if (ALIGN (tailen,L1_CACHE_BYTES ) >PAGE_SIZE || +ALIGN (skb->data_len,L1_CACHE_BYTES ) >PAGE_SIZE ) goto cow;if (!skb_cloned (skb)) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 17/86 igc: Fix infinite loop in release_swfw_sync
In reply to Greg Kroah-HartmanFrom: Sasha Neftin <[email protected]>
[ Upstream commit 907862e9aef75bf89e2b265efcc58870be06081e ]
An infinite loop may occur if we fail to acquire the HW semaphore, which is needed for resource release.
This will typically happen if the hardware is surprise-removed. At this stage there is nothing to do, except log an error and quit.
--- drivers/net/ethernet/intel/igc/igc_i225.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/igc/igc_i225.c +9 -2
@@ -156,8 +156,15 @@ void igc_release_swfw_sync_i225(struct igc_hw *hw, u16 mask) {u32 swfw_sync; -while (igc_get_hw_semaphore_i225 (hw)) - ;/* Empty */ +/* Releasing the resource requires first getting the HW semaphore. +* If we fail to get the semaphore, there is nothing we can do, +* except log an error and quit. We are not allowed to hang here +* indefinitely, as it may cause denial of service or system crash. +*/ +if (igc_get_hw_semaphore_i225 (hw)) { +hw_dbg ("Failed to release SW_FW_SYNC.\n" ); +return ; + } swfw_sync =rd32 (IGC_SW_FW_SYNC ); swfw_sync &= ~mask;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 18/86 igc: Fix BUG: scheduling while atomic
In reply to Greg Kroah-HartmanFrom: Sasha Neftin <[email protected]>
[ Upstream commit c80a29f0fe9b6f5457e0788e27d1110577eba99b ]
Replace usleep_range() method with udelay() method to allow atomic contexts in low-level MDIO access functions.
The following issue can be seen by doing the following:
$ modprobe -r bonding $ modprobe -v bonding max_bonds=1 mode=1 miimon=100 use_carrier=0 $ ip link set bond0 up $ ifenslave bond0 eth0 eth1
[ 982.357308] BUG: scheduling while atomic: kworker/u64:0/9/0x00000002 [ 982.364431] INFO: lockdep is turned off. [ 982.368824] Modules linked in: bonding sctp ip6_udp_tunnel udp_tunnel mlx4_ib ib_uverbs ib_core mlx4_en mlx4_core nfp tls sunrpc intel_rapl_msr iTCO_wdt iTCO_vendor_support mxm_wmi dcdbas intel_rapl_common sb_edac x86_pkg_temp_thermal intel_powerclamp coretemp kvm_intel kvm irqbypass crct10dif_pclmul crc32_pclmul ghash_clmulni_intel rapl intel_cstate intel_uncore pcspkr lpc_ich mei_me ipmi_ssif mei ipmi_si ipmi_devintf ipmi_msghandler wmi acpi_power_meter xfs libcrc32c sr_mod cdrom sd_mod t10_pi sg mgag200 drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops drm ahci libahci crc32c_intel libata i2c_algo_bit tg3 megaraid_sas igc dm_mirror dm_region_hash dm_log dm_mod [last unloaded: bonding] [ 982.437941] CPU: 25 PID: 9 Comm: kworker/u64:0 Kdump: loaded Tainted: G W --------- - - 4.18.0-348.el8.x86_64+debug #1 [ 982.451333] Hardware name: Dell Inc. PowerEdge R730/0H21J3, BIOS 2.7.0 12/005/2017 [ 982.459791] Workqueue: bond0 bond_mii_monitor [bonding] [ 982.465622] Call Trace: [ 982.468355] dump_stack+0x8e/0xd0 [ 982.472056] __schedule_bug.cold.60+0x3a/0x60 [ 982.476919] __schedule+0x147b/0x1bc0 [ 982.481007] ? firmware_map_remove+0x16b/0x16b [ 982.485967] ? hrtimer_fixup_init+0x40/0x40 [ 982.490625] schedule+0xd9/0x250 [ 982.494227] schedule_hrtimeout_range_clock+0x10d/0x2c0 [ 982.500058] ? hrtimer_nanosleep_restart+0x130/0x130 [ 982.505598] ? hrtimer_init_sleeper_on_stack+0x90/0x90 [ 982.511332] ? usleep_range+0x88/0x130 [ 982.515514] ? recalibrate_cpu_khz+0x10/0x10 [ 982.520279] ? ktime_get+0xab/0x1c0 [ 982.524175] ? usleep_range+0x88/0x130 [ 982.528355] usleep_range+0xdd/0x130 [ 982.532344] ? console_conditional_schedule+0x30/0x30 [ 982.537987] ? igc_put_hw_semaphore+0x17/0x60 [igc] [ 982.543432] igc_read_phy_reg_gpy+0x111/0x2b0 [igc] [ 982.548887] igc_phy_has_link+0xfa/0x260 [igc] [ 982.553847] ? igc_get_phy_id+0x210/0x210 [igc] [ 982.558894] ? lock_acquire+0x34d/0x890 [ 982.563187] ? lock_downgrade+0x710/0x710 [ 982.567659] ? rcu_read_unlock+0x50/0x50 [ 982.572039] igc_check_for_copper_link+0x106/0x210 [igc] [ 982.577970] ? igc_config_fc_after_link_up+0x840/0x840 [igc] [ 982.584286] ? rcu_read_unlock+0x50/0x50 [ 982.588661] ? lock_release+0x591/0xb80 [ 982.592939] ? lock_release+0x591/0xb80 [ 982.597220] igc_has_link+0x113/0x330 [igc] [ 982.601887] ? lock_downgrade+0x710/0x710 [ 982.606362] igc_ethtool_get_link+0x6d/0x90 [igc] [ 982.611614] bond_check_dev_link+0x131/0x2c0 [bonding] [ 982.617350] ? bond_time_in_interval+0xd0/0xd0 [bonding] [ 982.623277] ? rcu_read_lock_held+0x62/0xc0 [ 982.627944] ? rcu_read_lock_sched_held+0xe0/0xe0 [ 982.633198] bond_mii_monitor+0x314/0x2500 [bonding] [ 982.638738] ? lock_contended+0x880/0x880 [ 982.643214] ? bond_miimon_link_change+0xa0/0xa0 [bonding] [ 982.649336] ? lock_acquire+0x34d/0x890 [ 982.653615] ? lock_downgrade+0x710/0x710 [ 982.658089] ? debug_object_deactivate+0x221/0x340 [ 982.663436] ? rcu_read_unlock+0x50/0x50 [ 982.667811] ? debug_print_object+0x2b0/0x2b0 [ 982.672672] ? __switch_to_asm+0x41/0x70 [ 982.677049] ? __switch_to_asm+0x35/0x70 [ 982.681426] ? _raw_spin_unlock_irq+0x24/0x40 [ 982.686288] ? trace_hardirqs_on+0x20/0x195 [ 982.690956] ? _raw_spin_unlock_irq+0x24/0x40 [ 982.695818] process_one_work+0x8f0/0x1770 [ 982.700390] ? pwq_dec_nr_in_flight+0x320/0x320 [ 982.705443] ? debug_show_held_locks+0x50/0x50 [ 982.710403] worker_thread+0x87/0xb40 [ 982.714489] ? process_one_work+0x1770/0x1770 [ 982.719349] kthread+0x344/0x410 [ 982.722950] ? kthread_insert_work_sanity_check+0xd0/0xd0 [ 982.728975] ret_from_fork+0x3a/0x50
--- drivers/net/ethernet/intel/igc/igc_phy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/igc/igc_phy.c +2 -2
@@ -583,7 +583,7 @@ static s32 igc_read_phy_reg_mdic(struct igc_hw *hw, u32 offset, u16 *data)* the lower time out */ for (i =0 ; i <IGC_GEN_POLL_TIMEOUT ; i++) { -usleep_range (500 ,1000 ); +udelay (50 ); mdic =rd32 (IGC_MDIC );if (mdic &IGC_MDIC_READY )break ;
@@ -640,7 +640,7 @@ static s32 igc_write_phy_reg_mdic(struct igc_hw *hw, u32 offset, u16 data)* the lower time out */ for (i =0 ; i <IGC_GEN_POLL_TIMEOUT ; i++) { -usleep_range (500 ,1000 ); +udelay (50 ); mdic =rd32 (IGC_MDIC );if (mdic &IGC_MDIC_READY )break ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 19/86 rxrpc: Restore removed timer deletion
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit ee3b0826b4764f6c13ad6db67495c5a1c38e9025 ]
A recent patch[1] from Eric Dumazet flipped the order in which the keepalive timer and the keepalive worker were cancelled in order to fix a syzbot reported issue[2]. Unfortunately, this enables the mirror image bug whereby the timer races with rxrpc_exit_net(), restarting the worker after it has been cancelled:
CPU 1 CPU 2 =============== ===================== if (rxnet->live) <INTERRUPT> rxnet->live = false; cancel_work_sync(&rxnet->peer_keepalive_work); rxrpc_queue_work(&rxnet->peer_keepalive_work); del_timer_sync(&rxnet->peer_keepalive_timer);
Fix this by restoring the removed del_timer_sync() so that we try to remove the timer twice. If the timer runs again, it should see ->live == false and not restart the worker.
--- net/rxrpc/net_ns.c | 2 ++ 1 file changed, 2 insertions(+)
net/rxrpc/net_ns.c +2 -0
@@ -113,7 +113,9 @@ static __net_exit void rxrpc_exit_net(struct net *net)struct rxrpc_net *rxnet =rxrpc_net (net); rxnet->live = false; +del_timer_sync (&rxnet->peer_keepalive_timer);cancel_work_sync (&rxnet->peer_keepalive_work); +/* Remove the timer again as the worker may have restarted it. */ del_timer_sync (&rxnet->peer_keepalive_timer);rxrpc_destroy_all_calls (rxnet);rxrpc_destroy_all_connections (rxnet);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 20/86 net/smc: Fix sock leak when release after smc_shutdown()
In reply to Greg Kroah-HartmanFrom: Tony Lu <[email protected]>
[ Upstream commit 1a74e99323746353bba11562a2f2d0aa8102f402 ]
Since commit e5d5aadcf3cd ("net/smc: fix sk_refcnt underflow on linkdown and fallback"), for a fallback connection, __smc_release() does not call sock_put() if its state is already SMC_CLOSED.
When calling smc_shutdown() after falling back, its state is set to SMC_CLOSED but does not call sock_put(), so this patch calls it.
--- net/smc/af_smc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/smc/af_smc.c +3 -1
@@ -2144,8 +2144,10 @@ static int smc_shutdown(struct socket *sock, int how)if (smc->use_fallback) { rc =kernel_sock_shutdown (smc->clcsock, how); sk->sk_shutdown = smc->clcsock->sk->sk_shutdown; -if (sk->sk_shutdown ==SHUTDOWN_MASK ) +if (sk->sk_shutdown ==SHUTDOWN_MASK ) { sk->sk_state =SMC_CLOSED ; +sock_put (sk); + } goto out; }switch (how) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 21/86 net/packet: fix packet_sock xmit return value checking
In reply to Greg Kroah-HartmanFrom: Hangbin Liu <[email protected]>
[ Upstream commit 29e8e659f984be00d75ec5fef4e37c88def72712 ]
packet_sock xmit could be dev_queue_xmit, which also returns negative errors. So only checking positive errors is not enough, or userspace sendmsg may return success while packet is not send out.
Move the net_xmit_errno() assignment in the braces as checkpatch.pl said do not use assignment in if condition.
--- net/packet/af_packet.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
net/packet/af_packet.c +9 -4
@@ -2817,8 +2817,9 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) status =TP_STATUS_SEND_REQUEST ; err = po->xmit (skb); -if (unlikely (err >0 )) { - err =net_xmit_errno (err); +if (unlikely (err !=0 )) { +if (err >0 ) + err =net_xmit_errno (err);if (err &&__packet_get_status (po, ph) ==TP_STATUS_AVAILABLE ) {/* skb was destructed already */
@@ -3019,8 +3020,12 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) skb->no_fcs =1 ; err = po->xmit (skb); -if (err >0 && (err =net_xmit_errno (err)) !=0 ) - goto out_unlock; +if (unlikely (err !=0 )) { +if (err >0 ) + err =net_xmit_errno (err); +if (err) + goto out_unlock; + }dev_put (dev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 22/86 ip6_gre: Avoid updating tunnel->tun_hlen in __gre6_xmit()
In reply to Greg Kroah-HartmanFrom: Peilin Ye <[email protected]>
[ Upstream commit f40c064e933d7787ca7411b699504d7a2664c1f5 ]
Do not update tunnel->tun_hlen in data plane code. Use a local variable instead, just like "tunnel_hlen" in net/ipv4/ip_gre.c:gre_fb_xmit().
--- net/ipv6/ip6_gre.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/ipv6/ip6_gre.c +3 -2
@@ -743,6 +743,7 @@ static netdev_tx_t __gre6_xmit(struct sk_buff *skb,struct ip_tunnel_info *tun_info;const struct ip_tunnel_key *key;__be16 flags; +int tun_hlen; tun_info =skb_tunnel_info_txcheck (skb); if (IS_ERR(tun_info) ||
@@ -760,9 +761,9 @@ static netdev_tx_t __gre6_xmit(struct sk_buff *skb, dsfield = key->tos; flags = key->tun_flags & (TUNNEL_CSUM |TUNNEL_KEY |TUNNEL_SEQ ); - tunnel->tun_hlen =gre_calc_hlen (flags); + tun_hlen =gre_calc_hlen (flags); - gre_build_header(skb, tunnel->tun_hlen, + gre_build_header(skb, tun_hlen, flags, protocol, tunnel_id_to_key32(tun_info->key.tun_id), (flags & TUNNEL_SEQ) ? htonl(tunnel->o_seqno++)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 23/86 ip6_gre: Fix skb_under_panic in __gre6_xmit()
In reply to Greg Kroah-HartmanFrom: Peilin Ye <[email protected]>
[ Upstream commit ab198e1d0dd8dc4bc7575fb50758e2cbd51e14e1 ]
Feng reported an skb_under_panic BUG triggered by running test_ip6gretap() in tools/testing/selftests/bpf/test_tunnel.sh:
[ 82.492551] skbuff: skb_under_panic: text:ffffffffb268bb8e len:403 put:12 head:ffff9997c5480000 data:ffff9997c547fff8 tail:0x18b end:0x2c0 dev:ip6gretap11 <...> [ 82.607380] Call Trace: [ 82.609389] <TASK> [ 82.611136] skb_push.cold.109+0x10/0x10 [ 82.614289] __gre6_xmit+0x41e/0x590 [ 82.617169] ip6gre_tunnel_xmit+0x344/0x3f0 [ 82.620526] dev_hard_start_xmit+0xf1/0x330 [ 82.623882] sch_direct_xmit+0xe4/0x250 [ 82.626961] __dev_queue_xmit+0x720/0xfe0 <...> [ 82.633431] packet_sendmsg+0x96a/0x1cb0 [ 82.636568] sock_sendmsg+0x30/0x40
<...>
The following sequence of events caused the BUG:
1. During ip6gretap device initialization, tunnel->tun_hlen (e.g. 4) is calculated based on old flags (see ip6gre_calc_hlen());
2. packet_snd() reserves header room for skb A, assuming tunnel->tun_hlen is 4;
3. Later (in clsact Qdisc), the eBPF program sets a new tunnel key for skb A using bpf_skb_set_tunnel_key() (see _ip6gretap_set_tunnel());
4. __gre6_xmit() detects the new tunnel key, and recalculates "tun_hlen" (e.g. 12) based on new flags (e.g. TUNNEL_KEY and TUNNEL_SEQ);
5. gre_build_header() calls skb_push() with insufficient reserved header room, triggering the BUG.
As sugguested by Cong, fix it by moving the call to skb_cow_head() after the recalculation of tun_hlen.
Reproducer:
OBJ=$LINUX/tools/testing/selftests/bpf/test_tunnel_kern.o
ip netns add at_ns0
ip link add veth0 type veth peer name veth1
ip link set veth0 netns at_ns0
ip netns exec at_ns0 ip addr add 172.16.1.100/24 dev veth0 ip netns exec at_ns0 ip link set dev veth0 up
ip link set dev veth1 up mtu 1500
ip addr add dev veth1 172.16.1.200/24
ip netns exec at_ns0 ip addr add ::11/96 dev veth0 ip netns exec at_ns0 ip link set dev veth0 up ip addr add dev veth1 ::22/96
ip link set dev veth1 up
ip netns exec at_ns0 \ ip link add dev ip6gretap00 type ip6gretap seq flowlabel 0xbcdef key 2 \ local ::11 remote ::22
ip netns exec at_ns0 ip addr add dev ip6gretap00 10.1.1.100/24 ip netns exec at_ns0 ip addr add dev ip6gretap00 fc80::100/96 ip netns exec at_ns0 ip link set dev ip6gretap00 up
ip link add dev ip6gretap11 type ip6gretap external ip addr add dev ip6gretap11 10.1.1.200/24 ip addr add dev ip6gretap11 fc80::200/24
ip link set dev ip6gretap11 up
tc qdisc add dev ip6gretap11 clsact
tc filter add dev ip6gretap11 egress bpf da obj $OBJ sec ip6gretap_set_tunnel tc filter add dev ip6gretap11 ingress bpf da obj $OBJ sec ip6gretap_get_tunnel
ping6 -c 3 -w 10 -q ::11
--- net/ipv6/ip6_gre.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
net/ipv6/ip6_gre.c +6 -3
@@ -733,9 +733,6 @@ static netdev_tx_t __gre6_xmit(struct sk_buff *skb,else fl6->daddr = tunnel->parms.raddr; -if (skb_cow_head (skb, dev->needed_headroom ?: tunnel->hlen)) -return -ENOMEM ; -/* Push GRE header. */ protocol = (dev->type ==ARPHRD_ETHER ) ?htons (ETH_P_TEB ) : proto;
@@ -763,6 +760,9 @@ static netdev_tx_t __gre6_xmit(struct sk_buff *skb, (TUNNEL_CSUM |TUNNEL_KEY |TUNNEL_SEQ ); tun_hlen =gre_calc_hlen (flags); +if (skb_cow_head (skb, dev->needed_headroom ?: tun_hlen + tunnel->encap_hlen)) +return -ENOMEM ; + gre_build_header(skb, tun_hlen, flags, protocol, tunnel_id_to_key32(tun_info->key.tun_id),
@@ -773,6 +773,9 @@ static netdev_tx_t __gre6_xmit(struct sk_buff *skb,if (tunnel->parms.o_flags &TUNNEL_SEQ ) tunnel->o_seqno++; +if (skb_cow_head (skb, dev->needed_headroom ?: tunnel->hlen)) +return -ENOMEM ; +gre_build_header (skb, tunnel->tun_hlen, tunnel->parms.o_flags, protocol, tunnel->parms.o_key,htonl (tunnel->o_seqno));
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 24/86 net/sched: cls_u32: fix possible leak in u32_init_knode()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit ec5b0f605b105457f257f2870acad4a5d463984b ]
While investigating a related syzbot report, I found that whenever call to tcf_exts_init() from u32_init_knode() is failing, we end up with an elevated refcount on ht->refcnt
To avoid that, only increase the refcount after all possible errors have been evaluated.
--- net/sched/cls_u32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/sched/cls_u32.c +4 -4
@@ -814,10 +814,6 @@ static struct tc_u_knode *u32_init_knode(struct net *net, struct tcf_proto *tp, new->flags = n->flags;RCU_INIT_POINTER (new->ht_down, ht); -/* bump reference count as long as we hold pointer to structure */ -if (ht) - ht->refcnt++; -#ifdef CONFIG_CLS_U32_PERF /* Statistics may be incremented by readers during update * so we must keep them in tact. When the node is later destroyed
@@ -839,6 +835,10 @@ static struct tc_u_knode *u32_init_knode(struct net *net, struct tcf_proto *tp,return NULL ; } +/* bump reference count as long as we hold pointer to structure */ +if (ht) + ht->refcnt++; +return new; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 25/86 l3mdev: l3mdev_master_upper_ifindex_by_index_rcu should be using netdev_master_upper_dev_get_rcu
In reply to Greg Kroah-HartmanFrom: David Ahern <[email protected]>
[ Upstream commit 83daab06252ee5d0e1f4373ff28b79304945fc19 ]
Next patch uses l3mdev_master_upper_ifindex_by_index_rcu which throws a splat with debug kernels:
[13783.087570] ------------[ cut here ]------------ [13783.093974] RTNL: assertion failed at net/core/dev.c (6702) [13783.100761] WARNING: CPU: 3 PID: 51132 at net/core/dev.c:6702 netdev_master_upper_dev_get+0x16a/0x1a0
[13783.184226] CPU: 3 PID: 51132 Comm: kworker/3:3 Not tainted 5.17.0-custom-100090-g6f963aafb1cc #682 [13783.194788] Hardware name: Mellanox Technologies Ltd. MSN2010/SA002610, BIOS 5.6.5 08/24/2017 [13783.204755] Workqueue: mld mld_ifc_work [ipv6] [13783.210338] RIP: 0010:netdev_master_upper_dev_get+0x16a/0x1a0 [13783.217209] Code: 0f 85 e3 fe ff ff e8 65 ac ec fe ba 2e 1a 00 00 48 c7 c6 60 6f 38 83 48 c7 c7 c0 70 38 83 c6 05 5e b5 d7 01 01 e8 c6 29 52 00 <0f> 0b e9 b8 fe ff ff e8 5a 6c 35 ff e9 1c ff ff ff 48 89 ef e8 7d [13783.238659] RSP: 0018:ffffc9000b37f5a8 EFLAGS: 00010286 [13783.244995] RAX: 0000000000000000 RBX: ffff88812ee5c000 RCX: 0000000000000000 [13783.253379] RDX: ffff88811ce09d40 RSI: ffffffff812d0fcd RDI: fffff5200166fea7 [13783.261769] RBP: 0000000000000000 R08: 0000000000000001 R09: ffff8882375f4287 [13783.270138] R10: ffffed1046ebe850 R11: 0000000000000001 R12: dffffc0000000000 [13783.278510] R13: 0000000000000275 R14: ffffc9000b37f688 R15: ffff8881273b4af8 [13783.286870] FS: 0000000000000000(0000) GS:ffff888237400000(0000) knlGS:0000000000000000 [13783.296352] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [13783.303177] CR2: 00007ff25fc9b2e8 CR3: 0000000174d23000 CR4: 00000000001006e0 [13783.311546] Call Trace: [13783.314660] <TASK> [13783.317553] l3mdev_master_upper_ifindex_by_index_rcu+0x43/0xe0
...
Change l3mdev_master_upper_ifindex_by_index_rcu to use netdev_master_upper_dev_get_rcu.
--- net/l3mdev/l3mdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/l3mdev/l3mdev.c +1 -1
@@ -147,7 +147,7 @@ int l3mdev_master_upper_ifindex_by_index_rcu(struct net *net, int ifindex) dev =dev_get_by_index_rcu (net, ifindex);while (dev && !netif_is_l3_master (dev)) - dev =netdev_master_upper_dev_get (dev); + dev =netdev_master_upper_dev_get_rcu (dev);return dev ? dev->ifindex :0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 26/86 ipv6: make ip6_rt_gc_expire an atomic_t
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 9cb7c013420f98fa6fd12fc6a5dc055170c108db ]
Reads and Writes to ip6_rt_gc_expire always have been racy, as syzbot reported lately [1]
There is a possible risk of under-flow, leading
to unexpected high value passed to fib6_run_gc(),
although I have not observed this in the field.
Hosts hitting ip6_dst_gc() very hard are under pretty bad state anyway.
[1]
BUG: KCSAN: data-race in ip6_dst_gc / ip6_dst_gc
read-write to 0xffff888102110744 of 4 bytes by task 13165 on cpu 1:
ip6_dst_gc+0x1f3/0x220 net/ipv6/route.c:3311 dst_alloc+0x9b/0x160 net/core/dst.c:86 ip6_dst_alloc net/ipv6/route.c:344 [inline] icmp6_dst_alloc+0xb2/0x360 net/ipv6/route.c:3261 mld_sendpack+0x2b9/0x580 net/ipv6/mcast.c:1807 mld_send_cr net/ipv6/mcast.c:2119 [inline] mld_ifc_work+0x576/0x800 net/ipv6/mcast.c:2651 process_one_work+0x3d3/0x720 kernel/workqueue.c:2289 worker_thread+0x618/0xa70 kernel/workqueue.c:2436 kthread+0x1a9/0x1e0 kernel/kthread.c:376 ret_from_fork+0x1f/0x30
read-write to 0xffff888102110744 of 4 bytes by task 11607 on cpu 0:
ip6_dst_gc+0x1f3/0x220 net/ipv6/route.c:3311 dst_alloc+0x9b/0x160 net/core/dst.c:86 ip6_dst_alloc net/ipv6/route.c:344 [inline] icmp6_dst_alloc+0xb2/0x360 net/ipv6/route.c:3261 mld_sendpack+0x2b9/0x580 net/ipv6/mcast.c:1807 mld_send_cr net/ipv6/mcast.c:2119 [inline] mld_ifc_work+0x576/0x800 net/ipv6/mcast.c:2651 process_one_work+0x3d3/0x720 kernel/workqueue.c:2289 worker_thread+0x618/0xa70 kernel/workqueue.c:2436 kthread+0x1a9/0x1e0 kernel/kthread.c:376 ret_from_fork+0x1f/0x30
value changed: 0x00000bb3 -> 0x00000ba9
Reported by Kernel Concurrency Sanitizer on:
CPU: 0 PID: 11607 Comm: kworker/0:21 Not tainted 5.18.0-rc1-syzkaller-00037-g42e7a03d3bad-dirty #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Workqueue: mld mld_ifc_work
--- include/net/netns/ipv6.h | 4 ++-- net/ipv6/route.c | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-)
include/net/netns/ipv6.h +2 -2
@@ -78,8 +78,8 @@ struct netns_ipv6 {struct dst_ops ip6_dst_ops;rwlock_t fib6_walker_lock;spinlock_t fib6_gc_lock; -unsigned int ip6_rt_gc_expire; -unsigned long ip6_rt_last_gc; +atomic_t ip6_rt_gc_expire; +unsigned long ip6_rt_last_gc;unsigned char flowlabel_has_excl;#ifdef CONFIG_IPV6_MULTIPLE_TABLES bool fib6_has_custom_rules;
net/ipv6/route.c +6 -5
@@ -3192,6 +3192,7 @@ static int ip6_dst_gc(struct dst_ops *ops)int rt_elasticity = net->ipv6.sysctl.ip6_rt_gc_elasticity;int rt_gc_timeout = net->ipv6.sysctl.ip6_rt_gc_timeout;unsigned long rt_last_gc = net->ipv6.ip6_rt_last_gc; +unsigned int val;int entries; entries =dst_entries_get_fast (ops);
@@ -3202,13 +3203,13 @@ static int ip6_dst_gc(struct dst_ops *ops) entries <= rt_max_size) goto out; - net->ipv6.ip6_rt_gc_expire++; -fib6_run_gc (net->ipv6.ip6_rt_gc_expire, net, true); +fib6_run_gc (atomic_inc_return (&net->ipv6.ip6_rt_gc_expire), net, true); entries =dst_entries_get_slow (ops);if (entries < ops->gc_thresh) - net->ipv6.ip6_rt_gc_expire = rt_gc_timeout>>1 ; +atomic_set (&net->ipv6.ip6_rt_gc_expire, rt_gc_timeout >>1 ); out: - net->ipv6.ip6_rt_gc_expire -= net->ipv6.ip6_rt_gc_expire>>rt_elasticity; + val =atomic_read (&net->ipv6.ip6_rt_gc_expire); +atomic_set (&net->ipv6.ip6_rt_gc_expire, val - (val >> rt_elasticity));return entries > rt_max_size; }
@@ -6363,7 +6364,7 @@ static int __net_init ip6_route_net_init(struct net *net) net->ipv6.sysctl.ip6_rt_min_advmss =IPV6_MIN_MTU -20 -40 ; net->ipv6.sysctl.skip_notify_on_dev_down =0 ; - net->ipv6.ip6_rt_gc_expire =30 *HZ ; +atomic_set (&net->ipv6.ip6_rt_gc_expire,30 *HZ ); ret =0 ; out:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 27/86 netlink: reset network and mac headers in netlink_dump()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 99c07327ae11e24886d552dddbe4537bfca2765d ]
netlink_dump() is allocating an skb, reserves space in it but forgets to reset network header.
This allows a BPF program, invoked later from sk_filter() to access uninitialized kernel memory from the reserved space.
Theorically mac header reset could be omitted, because
it is set to a special initial value. bpf_internal_load_pointer_neg_helper calls skb_mac_header() without checking skb_mac_header_was_set().
Relying on skb->len not being too big seems fragile.
We also could add a sanity check in bpf_internal_load_pointer_neg_helper() to avoid surprises in the future.
syzbot report was:
BUG: KMSAN: uninit-value in ___bpf_prog_run+0xa22b/0xb420 kernel/bpf/core.c:1637 ___bpf_prog_run+0xa22b/0xb420 kernel/bpf/core.c:1637 __bpf_prog_run32+0x121/0x180 kernel/bpf/core.c:1796 bpf_dispatcher_nop_func include/linux/bpf.h:784 [inline] __bpf_prog_run include/linux/filter.h:626 [inline] bpf_prog_run include/linux/filter.h:633 [inline] __bpf_prog_run_save_cb+0x168/0x580 include/linux/filter.h:756 bpf_prog_run_save_cb include/linux/filter.h:770 [inline] sk_filter_trim_cap+0x3bc/0x8c0 net/core/filter.c:150 sk_filter include/linux/filter.h:905 [inline] netlink_dump+0xe0c/0x16c0 net/netlink/af_netlink.c:2276 netlink_recvmsg+0x1129/0x1c80 net/netlink/af_netlink.c:2002 sock_recvmsg_nosec net/socket.c:948 [inline] sock_recvmsg net/socket.c:966 [inline] sock_read_iter+0x5a9/0x630 net/socket.c:1039 do_iter_readv_writev+0xa7f/0xc70 do_iter_read+0x52c/0x14c0 fs/read_write.c:786 vfs_readv fs/read_write.c:906 [inline] do_readv+0x432/0x800 fs/read_write.c:943 __do_sys_readv fs/read_write.c:1034 [inline] __se_sys_readv fs/read_write.c:1031 [inline] __x64_sys_readv+0xe5/0x120 fs/read_write.c:1031 do_syscall_x64 arch/x86/entry/common.c:51 [inline] do_syscall_64+0x54/0xd0 arch/x86/entry/common.c:81 entry_SYSCALL_64_after_hwframe+0x44/0xae
Uninit was stored to memory at:
___bpf_prog_run+0x96c/0xb420 kernel/bpf/core.c:1558 __bpf_prog_run32+0x121/0x180 kernel/bpf/core.c:1796 bpf_dispatcher_nop_func include/linux/bpf.h:784 [inline] __bpf_prog_run include/linux/filter.h:626 [inline] bpf_prog_run include/linux/filter.h:633 [inline] __bpf_prog_run_save_cb+0x168/0x580 include/linux/filter.h:756 bpf_prog_run_save_cb include/linux/filter.h:770 [inline] sk_filter_trim_cap+0x3bc/0x8c0 net/core/filter.c:150 sk_filter include/linux/filter.h:905 [inline] netlink_dump+0xe0c/0x16c0 net/netlink/af_netlink.c:2276 netlink_recvmsg+0x1129/0x1c80 net/netlink/af_netlink.c:2002 sock_recvmsg_nosec net/socket.c:948 [inline] sock_recvmsg net/socket.c:966 [inline] sock_read_iter+0x5a9/0x630 net/socket.c:1039 do_iter_readv_writev+0xa7f/0xc70 do_iter_read+0x52c/0x14c0 fs/read_write.c:786 vfs_readv fs/read_write.c:906 [inline] do_readv+0x432/0x800 fs/read_write.c:943 __do_sys_readv fs/read_write.c:1034 [inline] __se_sys_readv fs/read_write.c:1031 [inline] __x64_sys_readv+0xe5/0x120 fs/read_write.c:1031 do_syscall_x64 arch/x86/entry/common.c:51 [inline] do_syscall_64+0x54/0xd0 arch/x86/entry/common.c:81 entry_SYSCALL_64_after_hwframe+0x44/0xae
Uninit was created at:
slab_post_alloc_hook mm/slab.h:737 [inline] slab_alloc_node mm/slub.c:3244 [inline] __kmalloc_node_track_caller+0xde3/0x14f0 mm/slub.c:4972 kmalloc_reserve net/core/skbuff.c:354 [inline] __alloc_skb+0x545/0xf90 net/core/skbuff.c:426 alloc_skb include/linux/skbuff.h:1158 [inline] netlink_dump+0x30f/0x16c0 net/netlink/af_netlink.c:2242 netlink_recvmsg+0x1129/0x1c80 net/netlink/af_netlink.c:2002 sock_recvmsg_nosec net/socket.c:948 [inline] sock_recvmsg net/socket.c:966 [inline] sock_read_iter+0x5a9/0x630 net/socket.c:1039 do_iter_readv_writev+0xa7f/0xc70 do_iter_read+0x52c/0x14c0 fs/read_write.c:786 vfs_readv fs/read_write.c:906 [inline] do_readv+0x432/0x800 fs/read_write.c:943 __do_sys_readv fs/read_write.c:1034 [inline] __se_sys_readv fs/read_write.c:1031 [inline] __x64_sys_readv+0xe5/0x120 fs/read_write.c:1031 do_syscall_x64 arch/x86/entry/common.c:51 [inline] do_syscall_64+0x54/0xd0 arch/x86/entry/common.c:81 entry_SYSCALL_64_after_hwframe+0x44/0xae CPU: 0 PID: 3470 Comm: syz-executor751 Not tainted 5.17.0-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
--- net/netlink/af_netlink.c | 7 +++++++ 1 file changed, 7 insertions(+)
net/netlink/af_netlink.c +7 -0
@@ -2276,6 +2276,13 @@ static int netlink_dump(struct sock *sk)* single netdev. The outcome is MSG_TRUNC error. */ skb_reserve (skb,skb_tailroom (skb) - alloc_size); + +/* Make sure malicious BPF programs can not read unitialized memory +* from skb->head -> skb->data +*/ +skb_reset_network_header (skb); +skb_reset_mac_header (skb); +netlink_skb_set_owner_r (skb, sk);if (nlk->dump_done_errno >0 ) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 28/86 net: stmmac: Use readl_poll_timeout_atomic() in atomic state
In reply to Greg Kroah-HartmanFrom: Kevin Hao <[email protected]>
[ Upstream commit 234901de2bc6847eaa0aeb4aba62c31ffb8d3ad6 ]
The init_systime() may be invoked in atomic state. We have observed the following call trace when running "phc_ctl /dev/ptp0 set" on a Intel Agilex board.
BUG: sleeping function called from invalid context at drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c:74 in_atomic(): 1, irqs_disabled(): 128, non_block: 0, pid: 381, name: phc_ctl preempt_count: 1, expected: 0 RCU nest depth: 0, expected: 0 Preemption disabled at: [<ffff80000892ef78>] stmmac_set_time+0x34/0x8c CPU: 2 PID: 381 Comm: phc_ctl Not tainted 5.18.0-rc2-next-20220414-yocto-standard+ #567 Hardware name: SoCFPGA Agilex SoCDK (DT) Call trace: dump_backtrace.part.0+0xc4/0xd0 show_stack+0x24/0x40 dump_stack_lvl+0x7c/0xa0 dump_stack+0x18/0x34 __might_resched+0x154/0x1c0 __might_sleep+0x58/0x90 init_systime+0x78/0x120 stmmac_set_time+0x64/0x8c ptp_clock_settime+0x60/0x9c pc_clock_settime+0x6c/0xc0 __arm64_sys_clock_settime+0x88/0xf0 invoke_syscall+0x5c/0x130 el0_svc_common.constprop.0+0x4c/0x100 do_el0_svc+0x7c/0xa0 el0_svc+0x58/0xcc el0t_64_sync_handler+0xa4/0x130 el0t_64_sync+0x18c/0x190
So we should use readl_poll_timeout_atomic() here instead of readl_poll_timeout().
Also adjust the delay time to 10us to fix a "__bad_udelay" build error reported by "kernel test robot <[email protected]>". I have tested this on Intel Agilex and NXP S32G boards, there is no delay needed at all. So the 10us delay should be long enough for most cases.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c +2 -2
@@ -68,9 +68,9 @@ static int init_systime(void __iomem *ioaddr, u32 sec, u32 nsec)writel (value, ioaddr +PTP_TCR );/* wait for present system time initialize to complete */ -return readl_poll_timeout (ioaddr +PTP_TCR , value, +return readl_poll_timeout_atomic (ioaddr +PTP_TCR , value, !(value &PTP_TCR_TSINIT ), -10000 ,100000 ); +10 ,100000 ); }static int config_addend (void __iomem *ioaddr,u32 addend)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 29/86 dmaengine: idxd: add RO check for wq max_batch_size write
In reply to Greg Kroah-HartmanFrom: Dave Jiang <[email protected]>
[ Upstream commit 66903461ffed0b66fc3e0200082d4e09365aacdc ]
Block wq_max_batch_size_store() when the device is configured as read-only and not configurable.
--- drivers/dma/idxd/sysfs.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/dma/idxd/sysfs.c +3 -0
@@ -1132,6 +1132,9 @@ static ssize_t wq_max_batch_size_store(struct device *dev, struct device_attribuu64 batch_size;int rc; +if (!test_bit (IDXD_FLAG_CONFIGURABLE , &idxd->flags)) +return -EPERM ; +if (wq->state !=IDXD_WQ_DISABLED )return -EPERM ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 30/86 dmaengine: idxd: add RO check for wq max_transfer_size write
In reply to Greg Kroah-HartmanFrom: Dave Jiang <[email protected]>
[ Upstream commit 505a2d1032ae656b0a8c736be110255503941cde ]
Block wq_max_transfer_size_store() when the device is configured as read-only and not configurable.
--- drivers/dma/idxd/sysfs.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/dma/idxd/sysfs.c +3 -0
@@ -1098,6 +1098,9 @@ static ssize_t wq_max_transfer_size_store(struct device *dev, struct device_attru64 xfer_size;int rc; +if (!test_bit (IDXD_FLAG_CONFIGURABLE , &idxd->flags)) +return -EPERM ; +if (wq->state !=IDXD_WQ_DISABLED )return -EPERM ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 31/86 selftests: mlxsw: vxlan_flooding: Prevent flooding of unwanted packets
In reply to Greg Kroah-HartmanFrom: Ido Schimmel <[email protected]>
[ Upstream commit 044011fdf162c5dd61c02841930c8f438a9adadb ]
The test verifies that packets are correctly flooded by the bridge and the VXLAN device by matching on the encapsulated packets at the other end. However, if packets other than those generated by the test also ingress the bridge (e.g., MLD packets), they will be flooded as well and interfere with the expected count.
Make the test more robust by making sure that only the packets generated by the test can ingress the bridge. Drop all the rest using tc filters on the egress of 'br0' and 'h1'.
In the software data path, the problem can be solved by matching on the inner destination MAC or dropping unwanted packets at the egress of the VXLAN device, but this is not currently supported by mlxsw.
--- .../drivers/net/mlxsw/vxlan_flooding.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
tools/testing/selftests/drivers/net/mlxsw/vxlan_flooding.sh +17 -0
@@ -172,6 +172,17 @@ flooding_filters_add() local lsb local i + # Prevent unwanted packets from entering the bridge and interfering + # with the test. + tc qdisc add dev br0 clsact + tc filter add dev br0 egress protocol all pref 1 handle 1 \ + matchall skip_hw action drop + tc qdisc add dev $h1 clsact + tc filter add dev $h1 egress protocol all pref 1 handle 1 \ + flower skip_hw dst_mac de:ad:be:ef:13:37 action pass + tc filter add dev $h1 egress protocol all pref 2 handle 2 \ + matchall skip_hw action drop + tc qdisc add dev $rp2 clsact for i in $(eval echo {1..$num_remotes}); do
@@ -194,6 +205,12 @@ flooding_filters_del() done tc qdisc del dev $rp2 clsact + + tc filter del dev $h1 egress protocol all pref 2 handle 2 matchall + tc filter del dev $h1 egress protocol all pref 1 handle 1 flower + tc qdisc del dev $h1 clsact + tc filter del dev br0 egress protocol all pref 1 handle 1 matchall + tc qdisc del dev br0 clsact } flooding_check_packets()
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 32/86 arm64/mm: Remove [PUD|PMD]_TABLE_BIT from [pud|pmd]_bad()
In reply to Greg Kroah-HartmanFrom: Anshuman Khandual <[email protected]>
[ Upstream commit e377ab82311af95c99648c6424a6b888a0ccb102 ]
Semantics wise, [pud|pmd]_bad() have always implied that a given [PUD|PMD] entry does not have a pointer to the next level page table. This had been made clear in the commit a1c76574f345 ("arm64: mm: use *_sect to check for section maps"). Hence explicitly check for a table entry rather than just testing a single bit. This basically redefines [pud|pmd]_bad() in terms of [pud|pmd]_table() making the semantics clear.
--- arch/arm64/include/asm/pgtable.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/arm64/include/asm/pgtable.h +2 -3
@@ -512,13 +512,12 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,#define pmd_none (pmd) (!pmd_val(pmd)) -#define pmd_bad (pmd) (!(pmd_val(pmd) & PMD_TABLE_BIT)) -#define pmd_table (pmd) ((pmd_val(pmd) & PMD_TYPE_MASK) == \ PMD_TYPE_TABLE)#define pmd_sect (pmd) ((pmd_val(pmd) & PMD_TYPE_MASK) == \ PMD_TYPE_SECT)#define pmd_leaf (pmd) pmd_sect(pmd) +#define pmd_bad (pmd) (!pmd_table(pmd))#if defined(CONFIG_ARM64_64K_PAGES ) ||CONFIG_PGTABLE_LEVELS <3 static inline bool pud_sect (pud_t pud) {return false; }
@@ -602,7 +601,7 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd) pr_err("%s:%d: bad pmd %016llx.\n", __FILE__, __LINE__, pmd_val(e))#define pud_none (pud) (!pud_val(pud)) -#define pud_bad (pud) (!(pud_val(pud) & PUD_TABLE_BIT)) +#define pud_bad (pud) (!pud_table(pud))#define pud_present (pud) pte_present(pud_pte(pud))#define pud_leaf (pud) pud_sect(pud)#define pud_valid (pud) pte_valid(pud_pte(pud))
Signature · 9 lines
2.35.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Greg Kroah-Hartman
maintainerPATCH 33/86 arm64: mm: fix p?d_leaf()
In reply to Greg Kroah-HartmanFrom: Muchun Song <[email protected]>
[ Upstream commit 23bc8f69f0eceecbb87c3801d2e48827d2dca92b ]
The pmd_leaf() is used to test a leaf mapped PMD, however, it misses the PROT_NONE mapped PMD on arm64. Fix it. A real world issue [1] caused by this was reported by Qian Cai. Also fix pud_leaf().
--- arch/arm64/include/asm/pgtable.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/include/asm/pgtable.h +2 -2
@@ -516,7 +516,7 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, PMD_TYPE_TABLE)#define pmd_sect (pmd) ((pmd_val(pmd) & PMD_TYPE_MASK) == \ PMD_TYPE_SECT) -#define pmd_leaf (pmd) pmd_sect(pmd) +#define pmd_leaf (pmd) (pmd_present(pmd) && !pmd_table(pmd))#define pmd_bad (pmd) (!pmd_table(pmd))#if defined(CONFIG_ARM64_64K_PAGES ) ||CONFIG_PGTABLE_LEVELS <3
@@ -603,7 +603,7 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd)#define pud_none (pud) (!pud_val(pud))#define pud_bad (pud) (!pud_table(pud))#define pud_present (pud) pte_present(pud_pte(pud)) -#define pud_leaf (pud) pud_sect(pud) +#define pud_leaf (pud) (pud_present(pud) && !pud_table(pud))#define pud_valid (pud) pte_valid(pud_pte(pud))static inline void set_pud (pud_t *pudp,pud_t pud)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 34/86 ARM: vexpress/spc: Avoid negative array index when !SMP
In reply to Greg Kroah-HartmanFrom: Kees Cook <[email protected]>
[ Upstream commit b3f1dd52c991d79118f35e6d1bf4d7cb09882e38 ]
When building multi_v7_defconfig+CONFIG_SMP=n, -Warray-bounds exposes a couple negative array index accesses:
arch/arm/mach-vexpress/spc.c: In function 've_spc_clk_init':arch/arm/mach-vexpress/spc.c:583:21: warning: array subscript -1 is below array bounds of 'bool[2]' {aka '_Bool[2]'} [-Warray-bounds]
583 | if (init_opp_table[cluster])
| ~~~~~~~~~~~~~~^~~~~~~~~
arch/arm/mach-vexpress/spc.c:556:7: note: while referencing 'init_opp_table'
556 | bool init_opp_table[MAX_CLUSTERS] = { false };
| ^~~~~~~~~~~~~~
arch/arm/mach-vexpress/spc.c:592:18: warning: array subscript -1 is below array bounds of 'bool[2]' {aka '_Bool[2]'} [-Warray-bounds]
592 | init_opp_table[cluster] = true;
| ~~~~~~~~~~~~~~^~~~~~~~~
arch/arm/mach-vexpress/spc.c:556:7: note: while referencing 'init_opp_table'
556 | bool init_opp_table[MAX_CLUSTERS] = { false };
| ^~~~~~~~~~~~~~Skip this logic when built !SMP.
--- arch/arm/mach-vexpress/spc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-vexpress/spc.c +1 -1
@@ -580,7 +580,7 @@ static int __init ve_spc_clk_init(void) } cluster =topology_physical_package_id (cpu_dev->id); -if (init_opp_table[cluster]) +if (cluster <0 || init_opp_table[cluster])continue ;if (ve_init_opp_table (cpu_dev))
Signature · 9 lines
2.35.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Greg Kroah-Hartman
maintainerPATCH 35/86 reset: tegra-bpmp: Restore Handle errors in BPMP response
In reply to Greg Kroah-HartmanFrom: Sameer Pujar <[email protected]>
[ Upstream commit d1da1052ffad63aa5181b69f20a6952e31f339c2 ]
This reverts following commit 69125b4b9440 ("reset: tegra-bpmp: Revert Handle errors in BPMP response").
The Tegra194 HDA reset failure is fixed by commit d278dc9151a0 ("ALSA:
hda/tegra: Fix Tegra194 HDA reset failure"). The temporary revert of original commit c045ceb5a145 ("reset: tegra-bpmp: Handle errors in BPMP response") can be removed now.
--- drivers/reset/tegra/reset-bpmp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/reset/tegra/reset-bpmp.c +8 -1
@@ -20,6 +20,7 @@ static int tegra_bpmp_reset_common(struct reset_controller_dev *rstc,struct tegra_bpmp *bpmp =to_tegra_bpmp (rstc);struct mrq_reset_request request;struct tegra_bpmp_message msg; +int err;memset (&request,0 ,sizeof (request)); request.cmd = command;
@@ -30,7 +31,13 @@ static int tegra_bpmp_reset_common(struct reset_controller_dev *rstc, msg.tx.data = &request; msg.tx.size =sizeof (request); -return tegra_bpmp_transfer (bpmp, &msg); + err =tegra_bpmp_transfer (bpmp, &msg); +if (err) +return err; +if (msg.rx.ret) +return -EINVAL ; + +return 0 ; } static int tegra_bpmp_reset_module(struct reset_controller_dev *rstc,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 36/86 platform/x86: samsung-laptop: Fix an unsigned comparison which can never be negative
In reply to Greg Kroah-HartmanFrom: Jiapeng Chong <[email protected]>
[ Upstream commit 0284d4d1be753f648f28b77bdfbe6a959212af5c ]
Eliminate the follow smatch warnings:
drivers/platform/x86/samsung-laptop.c:1124 kbd_led_set() warn: unsigned 'value' is never less than zero.
--- drivers/platform/x86/samsung-laptop.c | 2 -- 1 file changed, 2 deletions(-)
drivers/platform/x86/samsung-laptop.c +0 -2
@@ -1121,8 +1121,6 @@ static void kbd_led_set(struct led_classdev *led_cdev,if (value > samsung->kbd_led.max_brightness) value = samsung->kbd_led.max_brightness; -else if (value <0 ) - value =0 ; samsung->kbd_led_wk = value;queue_work (samsung->led_workqueue, &samsung->kbd_led_work);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 37/86 ALSA: usb-audio: Fix undefined behavior due to shift overflowing the constant
In reply to Greg Kroah-HartmanFrom: Borislav Petkov <[email protected]>
[ Upstream commit 1ef8715975de8bd481abbd0839ed4f49d9e5b0ff ]
Fix:
sound/usb/midi.c: In function ‘snd_usbmidi_out_endpoint_create’:
sound/usb/midi.c:1389:2: error: case label does not reduce to an integer constant
case USB_ID(0xfc08, 0x0101): /* Unknown vendor Cable */
^~~~See https://lore.kernel.org/r/YkwQ6%[email protected] for the gory details as to why it triggers with older gccs only.
[ A slight correction with parentheses around the argument by tiwai ]
--- sound/usb/usbaudio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/usbaudio.h +1 -1
@@ -8,7 +8,7 @@*/ /* handling of USB vendor/product ID pairs as 32-bit numbers */ -#define USB_ID (vendor, product) (((vendor) << 16) | (product)) +#define USB_ID (vendor, product) (((unsigned int)(vendor) << 16) | (product))#define USB_ID_VENDOR (id) ((id) >> 16)#define USB_ID_PRODUCT (id) ((u16)(id))
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 38/86 arm64: dts: imx: Fix imx8*-var-som touchscreen property sizes
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit 1bc12d301594eafde0a8529d28d459af81053b3a ]
The common touchscreen properties are all 32-bit, not 16-bit. These properties must not be too important as they are all ignored in case of an error reading them.
--- arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi | 8 ++++---- arch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)
arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi +4 -4
@@ -89,12 +89,12 @@ pendown-gpio = <&gpio1 3 GPIO_ACTIVE_LOW>; ti,x-min = /bits/ 16 <125>; - touchscreen-size-x = /bits/ 16 <4008>; + touchscreen-size-x = <4008>; ti,y-min = /bits/ 16 <282>; - touchscreen-size-y = /bits/ 16 <3864>; + touchscreen-size-y = <3864>; ti,x-plate-ohms = /bits/ 16 <180>; - touchscreen-max-pressure = /bits/ 16 <255>; - touchscreen-average-samples = /bits/ 16 <10>; + touchscreen-max-pressure = <255>; + touchscreen-average-samples = <10>; ti,debounce-tol = /bits/ 16 <3>; ti,debounce-rep = /bits/ 16 <1>; ti,settle-delay-usec = /bits/ 16 <150>;
arch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi +4 -4
@@ -70,12 +70,12 @@ pendown-gpio = <&gpio1 3 GPIO_ACTIVE_LOW>; ti,x-min = /bits/ 16 <125>; - touchscreen-size-x = /bits/ 16 <4008>; + touchscreen-size-x = <4008>; ti,y-min = /bits/ 16 <282>; - touchscreen-size-y = /bits/ 16 <3864>; + touchscreen-size-y = <3864>; ti,x-plate-ohms = /bits/ 16 <180>; - touchscreen-max-pressure = /bits/ 16 <255>; - touchscreen-average-samples = /bits/ 16 <10>; + touchscreen-max-pressure = <255>; + touchscreen-average-samples = <10>; ti,debounce-tol = /bits/ 16 <3>; ti,debounce-rep = /bits/ 16 <1>; ti,settle-delay-usec = /bits/ 16 <150>;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 39/86 vxlan: fix error return code in vxlan_fdb_append
In reply to Greg Kroah-HartmanFrom: Hongbin Wang <[email protected]>
[ Upstream commit 7cea5560bf656b84f9ed01c0cc829d4eecd0640b ]
When kmalloc and dst_cache_init failed, should return ENOMEM rather than ENOBUFS.
--- drivers/net/vxlan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/vxlan.c +2 -2
@@ -710,11 +710,11 @@ static int vxlan_fdb_append(struct vxlan_fdb *f, rd =kmalloc (sizeof (*rd),GFP_ATOMIC );if (rd ==NULL ) -return -ENOBUFS ; +return -ENOMEM ;if (dst_cache_init (&rd->dst_cache,GFP_ATOMIC )) {kfree (rd); -return -ENOBUFS ; +return -ENOMEM ; } rd->remote_ip = *ip;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 40/86 cifs: Check the IOCB_DIRECT flag, not O_DIRECT
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit 994fd530a512597ffcd713b0f6d5bc916c5698f0 ]
Use the IOCB_DIRECT indicator flag on the I/O context rather than checking to see if the file was opened O_DIRECT.
--- fs/cifs/cifsfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cifs/cifsfs.c +1 -1
@@ -898,7 +898,7 @@ cifs_loose_read_iter(struct kiocb *iocb, struct iov_iter *iter)ssize_t rc;struct inode *inode =file_inode (iocb->ki_filp); -if (iocb->ki_filp->f_flags &O_DIRECT ) +if (iocb->ki_flags &IOCB_DIRECT )return cifs_user_readv (iocb, iter); rc =cifs_revalidate_mapping (inode);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 41/86 net: atlantic: Avoid out-of-bounds indexing
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
[ Upstream commit 8d3a6c37d50d5a0504c126c932cc749e6dd9c78f ]
UBSAN warnings are observed on atlantic driver:
[ 294.432996] UBSAN: array-index-out-of-bounds in /build/linux-Qow4fL/linux-5.15.0/drivers/net/ethernet/aquantia/atlantic/aq_nic.c:484:48 [ 294.433695] index 8 is out of range for type 'aq_vec_s *[8]'
The ring is dereferenced right before breaking out the loop, to prevent that from happening, only use the index in the loop to fix the issue.
--- .../net/ethernet/aquantia/atlantic/aq_nic.c | 8 +++---- .../net/ethernet/aquantia/atlantic/aq_vec.c | 24 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +4 -4
@@ -480,8 +480,8 @@ int aq_nic_start(struct aq_nic_s *self)if (err <0 ) goto err_exit; -for (i =0U , aq_vec = self->aq_vec[0 ]; - self->aq_vecs > i; ++i, aq_vec = self->aq_vec[i]) { +for (i =0U ; self->aq_vecs > i; ++i) { + aq_vec = self->aq_vec[i]; err =aq_vec_start (aq_vec);if (err <0 ) goto err_exit;
@@ -511,8 +511,8 @@ int aq_nic_start(struct aq_nic_s *self)mod_timer (&self->polling_timer, jiffies +AQ_CFG_POLLING_TIMER_INTERVAL ); }else { -for (i =0U , aq_vec = self->aq_vec[0 ]; - self->aq_vecs > i; ++i, aq_vec = self->aq_vec[i]) { +for (i =0U ; self->aq_vecs > i; ++i) { + aq_vec = self->aq_vec[i]; err =aq_pci_func_alloc_irq (self, i, self->ndev->name, aq_vec_isr, aq_vec,aq_vec_get_affinity_mask (aq_vec));
drivers/net/ethernet/aquantia/atlantic/aq_vec.c +12 -12
@@ -43,8 +43,8 @@ static int aq_vec_poll(struct napi_struct *napi, int budget)if (!self) { err = -EINVAL ; }else { -for (i =0U , ring = self->ring[0 ]; - self->tx_rings > i; ++i, ring = self->ring[i]) { +for (i =0U ; self->tx_rings > i; ++i) { + ring = self->ring[i];u64_stats_update_begin (&ring[AQ_VEC_RX_ID ].stats.rx.syncp); ring[AQ_VEC_RX_ID ].stats.rx.polls++;u64_stats_update_end (&ring[AQ_VEC_RX_ID ].stats.rx.syncp);
@@ -182,8 +182,8 @@ int aq_vec_init(struct aq_vec_s *self, const struct aq_hw_ops *aq_hw_ops, self->aq_hw_ops = aq_hw_ops; self->aq_hw = aq_hw; -for (i =0U , ring = self->ring[0 ]; - self->tx_rings > i; ++i, ring = self->ring[i]) { +for (i =0U ; self->tx_rings > i; ++i) { + ring = self->ring[i]; err =aq_ring_init (&ring[AQ_VEC_TX_ID ],ATL_RING_TX );if (err <0 ) goto err_exit;
@@ -224,8 +224,8 @@ int aq_vec_start(struct aq_vec_s *self)unsigned int i =0U ;int err =0 ; -for (i =0U , ring = self->ring[0 ]; - self->tx_rings > i; ++i, ring = self->ring[i]) { +for (i =0U ; self->tx_rings > i; ++i) { + ring = self->ring[i]; err = self->aq_hw_ops->hw_ring_tx_start (self->aq_hw, &ring[AQ_VEC_TX_ID ]);if (err <0 )
@@ -248,8 +248,8 @@ void aq_vec_stop(struct aq_vec_s *self)struct aq_ring_s *ring =NULL ;unsigned int i =0U ; -for (i =0U , ring = self->ring[0 ]; - self->tx_rings > i; ++i, ring = self->ring[i]) { +for (i =0U ; self->tx_rings > i; ++i) { + ring = self->ring[i]; self->aq_hw_ops->hw_ring_tx_stop (self->aq_hw, &ring[AQ_VEC_TX_ID ]);
@@ -268,8 +268,8 @@ void aq_vec_deinit(struct aq_vec_s *self)if (!self) goto err_exit; -for (i =0U , ring = self->ring[0 ]; - self->tx_rings > i; ++i, ring = self->ring[i]) { +for (i =0U ; self->tx_rings > i; ++i) { + ring = self->ring[i];aq_ring_tx_clean (&ring[AQ_VEC_TX_ID ]);aq_ring_rx_deinit (&ring[AQ_VEC_RX_ID ]); }
@@ -297,8 +297,8 @@ void aq_vec_ring_free(struct aq_vec_s *self)if (!self) goto err_exit; -for (i =0U , ring = self->ring[0 ]; - self->tx_rings > i; ++i, ring = self->ring[i]) { +for (i =0U ; self->tx_rings > i; ++i) { + ring = self->ring[i];aq_ring_free (&ring[AQ_VEC_TX_ID ]);if (i < self->rx_rings)aq_ring_free (&ring[AQ_VEC_RX_ID ]);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 42/86 mt76: Fix undefined behavior due to shift overflowing the constant
In reply to Greg Kroah-HartmanFrom: Borislav Petkov <[email protected]>
[ Upstream commit dbc2b1764734857d68425468ffa8486e97ab89df ]
Fix:
drivers/net/wireless/mediatek/mt76/mt76x2/pci.c: In function ‘mt76x2e_probe’:
././include/linux/compiler_types.h:352:38: error: call to ‘__compiletime_assert_946’ \
declared with attribute error: FIELD_PREP: mask is not constant
_compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
See https://lore.kernel.org/r/YkwQ6%[email protected] for the gory details as to why it triggers with older gccs only.
--- drivers/net/wireless/mediatek/mt76/mt76x2/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt76x2/pci.c +1 -1
@@ -80,7 +80,7 @@ mt76x2e_probe(struct pci_dev *pdev, const struct pci_device_id *id)mt76_rmw_field (dev,0x15a10 ,0x1f <<16 ,0x9 );/* RG_SSUSB_G1_CDR_BIC_LTR = 0xf */ -mt76_rmw_field (dev,0x15a0c ,0xf <<28 ,0xf ); +mt76_rmw_field (dev,0x15a0c ,0xfU <<28 ,0xf );/* RG_SSUSB_CDR_BR_PE1D = 0x3 */ mt76_rmw_field (dev,0x15c58 ,0x3 <<6 ,0x3 );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 43/86 brcmfmac: sdio: Fix undefined behavior due to shift overflowing the constant
In reply to Greg Kroah-HartmanFrom: Borislav Petkov <[email protected]>
[ Upstream commit 6fb3a5868b2117611f41e421e10e6a8c2a13039a ]
Fix:
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c: In function ‘brcmf_sdio_drivestrengthinit’:
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c:3798:2: error: case label does not reduce to an integer constant
case SDIOD_DRVSTR_KEY(BRCM_CC_43143_CHIP_ID, 17):
^~~~
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c:3809:2: error: case label does not reduce to an integer constant
case SDIOD_DRVSTR_KEY(BRCM_CC_43362_CHIP_ID, 13):
^~~~See https://lore.kernel.org/r/YkwQ6%[email protected] for the gory details as to why it triggers with older gccs only.
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +1 -1
@@ -557,7 +557,7 @@ enum brcmf_sdio_frmtype { BRCMF_SDIO_FT_SUB, }; -#define SDIOD_DRVSTR_KEY (chip, pmu) (((chip) << 16) | (pmu)) +#define SDIOD_DRVSTR_KEY (chip, pmu) (((unsigned int)(chip) << 16) | (pmu))/* SDIO Pad drive strength to select value mappings */ struct sdiod_drive_str {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 44/86 dpaa_eth: Fix missing of_node_put in dpaa_get_ts_info()
In reply to Greg Kroah-HartmanFrom: Lv Ruyi <[email protected]>
[ Upstream commit 1a7eb80d170c28be2928433702256fe2a0bd1e0f ]
Both of of_get_parent() and of_parse_phandle() return node pointer with refcount incremented, use of_node_put() on it to decrease refcount when done.
--- drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c +6 -2
@@ -489,11 +489,15 @@ static int dpaa_get_ts_info(struct net_device *net_dev, info->phc_index =-1 ; fman_node =of_get_parent (mac_node); -if (fman_node) +if (fman_node) { ptp_node =of_parse_phandle (fman_node,"ptimer-handle" ,0 ); +of_node_put (fman_node); + } -if (ptp_node) +if (ptp_node) { ptp_dev =of_find_device_by_node (ptp_node); +of_node_put (ptp_node); + }if (ptp_dev) ptp =platform_get_drvdata (ptp_dev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 45/86 drm/msm/mdp5: check the return of kzalloc()
In reply to Greg Kroah-HartmanFrom: Xiaoke Wang <[email protected]>
[ Upstream commit 047ae665577776b7feb11bd4f81f46627cff95e7 ]
kzalloc() is a memory allocation function which can return NULL when some internal memory errors happen. So it is better to check it to prevent potential wrong memory access.
Besides, since mdp5_plane_reset() is void type, so we should better set plane-state to NULL after releasing it.
Patchwork: https://patchwork.freedesktop.org/patch/481055/
--- drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +3 -0
@@ -179,7 +179,10 @@ static void mdp5_plane_reset(struct drm_plane *plane)drm_framebuffer_put (plane->state->fb);kfree (to_mdp5_plane_state (plane->state)); + plane->state =NULL ; mdp5_state =kzalloc (sizeof (*mdp5_state),GFP_KERNEL ); +if (!mdp5_state) +return ;/* assign default blend parameters */ mdp5_state->alpha =255 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 46/86 net: macb: Restart tx only if queue pointer is lagging
In reply to Greg Kroah-HartmanFrom: Tomas Melin <[email protected]>
[ Upstream commit 5ad7f18cd82cee8e773d40cc7a1465a526f2615c ]
commit 4298388574da ("net: macb: restart tx after tx used bit read") added support for restarting transmission. Restarting tx does not work in case controller asserts TXUBR interrupt and TQBP is already at the end of the tx queue. In that situation, restarting tx will immediately cause assertion of another TXUBR interrupt. The driver will end up in an infinite interrupt loop which it cannot break out of.
For cases where TQBP is at the end of the tx queue, instead only clear TX_USED interrupt. As more data gets pushed to the queue, transmission will resume.
This issue was observed on a Xilinx Zynq-7000 based board. During stress test of the network interface,
driver would get stuck on interrupt loop within seconds or minutes causing CPU to stall.
--- drivers/net/ethernet/cadence/macb_main.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/ethernet/cadence/macb_main.c +8 -0
@@ -1531,6 +1531,7 @@ static void macb_tx_restart(struct macb_queue *queue)unsigned int head = queue->tx_head;unsigned int tail = queue->tx_tail;struct macb *bp = queue->bp; +unsigned int head_idx, tbqp;if (bp->caps &MACB_CAPS_ISR_CLEAR_ON_WRITE )queue_writel (queue,ISR ,MACB_BIT (TXUBR ));
@@ -1538,6 +1539,13 @@ static void macb_tx_restart(struct macb_queue *queue)if (head == tail)return ; + tbqp =queue_readl (queue,TBQP ) /macb_dma_desc_get_size (bp); + tbqp =macb_adj_dma_desc_idx (bp,macb_tx_ring_wrap (bp, tbqp)); + head_idx =macb_adj_dma_desc_idx (bp,macb_tx_ring_wrap (bp, head)); + +if (tbqp == head_idx) +return ; +macb_writel (bp,NCR ,macb_readl (bp,NCR ) |MACB_BIT (TSTART )); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 47/86 scsi: qedi: Fix failed disconnect handling
In reply to Greg Kroah-HartmanFrom: Mike Christie <[email protected]>
[ Upstream commit 857b06527f707f5df634b854898a191b5c1d0272 ]
We set the qedi_ep state to EP_STATE_OFLDCONN_START when the ep is created. Then in qedi_set_path we kick off the offload work. If userspace times out the connection and calls ep_disconnect, qedi will only flush the offload work if the qedi_ep state has transitioned away from EP_STATE_OFLDCONN_START. If we can't connect we will not have transitioned state and will leave the offload work running, and we will free the qedi_ep from under it.
This patch just has us init the work when we create the ep, then always flush it.
--- drivers/scsi/qedi/qedi_iscsi.c | 69 +++++++++++++++++----------------- 1 file changed, 34 insertions(+), 35 deletions(-)
drivers/scsi/qedi/qedi_iscsi.c +34 -35
@@ -828,6 +828,37 @@ static int qedi_task_xmit(struct iscsi_task *task)return qedi_iscsi_send_ioreq (task); } +static void qedi_offload_work (struct work_struct *work) +{ +struct qedi_endpoint *qedi_ep = + container_of(work, struct qedi_endpoint, offload_work); +struct qedi_ctx *qedi; +int wait_delay =5 *HZ ; +int ret; + + qedi = qedi_ep->qedi; + + ret =qedi_iscsi_offload_conn (qedi_ep); +if (ret) { +QEDI_ERR (&qedi->dbg_ctx, +"offload error: iscsi_cid=%u, qedi_ep=%p, ret=%d\n" , + qedi_ep->iscsi_cid, qedi_ep, ret); + qedi_ep->state =EP_STATE_OFLDCONN_FAILED ; +return ; + } + + ret =wait_event_interruptible_timeout (qedi_ep->tcp_ofld_wait, + (qedi_ep->state == +EP_STATE_OFLDCONN_COMPL ), + wait_delay); +if (ret <=0 || qedi_ep->state !=EP_STATE_OFLDCONN_COMPL ) { + qedi_ep->state =EP_STATE_OFLDCONN_FAILED ; +QEDI_ERR (&qedi->dbg_ctx, +"Offload conn TIMEOUT iscsi_cid=%u, qedi_ep=%p\n" , + qedi_ep->iscsi_cid, qedi_ep); + } +} +static struct iscsi_endpoint *qedi_ep_connect (struct Scsi_Host *shost,struct sockaddr *dst_addr,int non_blocking)
@@ -876,6 +907,7 @@ qedi_ep_connect(struct Scsi_Host *shost, struct sockaddr *dst_addr, } qedi_ep = ep->dd_data;memset (qedi_ep,0 ,sizeof (struct qedi_endpoint )); +INIT_WORK (&qedi_ep->offload_work, qedi_offload_work); qedi_ep->state =EP_STATE_IDLE ; qedi_ep->iscsi_cid = (u32)-1 ; qedi_ep->qedi = qedi;
@@ -1026,12 +1058,11 @@ static void qedi_ep_disconnect(struct iscsi_endpoint *ep) qedi_ep = ep->dd_data; qedi = qedi_ep->qedi; +flush_work (&qedi_ep->offload_work); +if (qedi_ep->state ==EP_STATE_OFLDCONN_START ) goto ep_exit_recover; -if (qedi_ep->state !=EP_STATE_OFLDCONN_NONE ) -flush_work (&qedi_ep->offload_work); -if (qedi_ep->conn) { qedi_conn = qedi_ep->conn; conn = qedi_conn->cls_conn->dd_data;
@@ -1196,37 +1227,6 @@ static int qedi_data_avail(struct qedi_ctx *qedi, u16 vlanid)return rc; } -static void qedi_offload_work (struct work_struct *work) -{ -struct qedi_endpoint *qedi_ep = - container_of(work, struct qedi_endpoint, offload_work); -struct qedi_ctx *qedi; -int wait_delay =5 *HZ ; -int ret; - - qedi = qedi_ep->qedi; - - ret =qedi_iscsi_offload_conn (qedi_ep); -if (ret) { -QEDI_ERR (&qedi->dbg_ctx, -"offload error: iscsi_cid=%u, qedi_ep=%p, ret=%d\n" , - qedi_ep->iscsi_cid, qedi_ep, ret); - qedi_ep->state =EP_STATE_OFLDCONN_FAILED ; -return ; - } - - ret =wait_event_interruptible_timeout (qedi_ep->tcp_ofld_wait, - (qedi_ep->state == -EP_STATE_OFLDCONN_COMPL ), - wait_delay); -if ((ret <=0 ) || (qedi_ep->state !=EP_STATE_OFLDCONN_COMPL )) { - qedi_ep->state =EP_STATE_OFLDCONN_FAILED ; -QEDI_ERR (&qedi->dbg_ctx, -"Offload conn TIMEOUT iscsi_cid=%u, qedi_ep=%p\n" , - qedi_ep->iscsi_cid, qedi_ep); - } -} -static int qedi_set_path (struct Scsi_Host *shost,struct iscsi_path *path_data) {struct qedi_ctx *qedi;
@@ -1342,7 +1342,6 @@ static int qedi_set_path(struct Scsi_Host *shost, struct iscsi_path *path_data) qedi_ep->dst_addr, qedi_ep->dst_port); } -INIT_WORK (&qedi_ep->offload_work, qedi_offload_work);queue_work (qedi->offload_thread, &qedi_ep->offload_work); ret =0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 48/86 stat: fix inconsistency between struct stat and struct compat_stat
In reply to Greg Kroah-HartmanFrom: Mikulas Patocka <[email protected]>
[ Upstream commit 932aba1e169090357a77af18850a10c256b50819 ]
struct stat (defined in arch/x86/include/uapi/asm/stat.h) has 32-bit st_dev and st_rdev; struct compat_stat (defined in arch/x86/include/asm/compat.h) has 16-bit st_dev and st_rdev followed by a 16-bit padding.
This patch fixes struct compat_stat to match struct stat.
[ Historical note: the old x86 'struct stat' did have that 16-bit field
that the compat layer had kept around, but it was changes back in 2003 by "struct stat - support larger dev_t":
https://git.kernel.org/pub/scm/linux/kernel/git/tglx/history.git/commit/?id=e95b2065677fe32512a597a79db94b77b90c968d
and back in those days, the x86_64 port was still new, and separate from the i386 code, and had already picked up the old version with a 16-bit st_dev field ]
Note that we can't change compat_dev_t because it is used by compat_loop_info.
Also, if the st_dev and st_rdev values are 32-bit, we don't have to use old_valid_dev to test if the value fits into them. This fixes -EOVERFLOW on filesystems that are on NVMe because NVMe uses the major number 259.
--- arch/x86/include/asm/compat.h | 6 ++---- fs/stat.c | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 13 deletions(-)
arch/x86/include/asm/compat.h +2 -4
@@ -29,15 +29,13 @@ typedef u32 compat_caddr_t;typedef __kernel_fsid_t compat_fsid_t ;struct compat_stat { -compat_dev_t st_dev; -u16 __pad1; +u32 st_dev;compat_ino_t st_ino;compat_mode_t st_mode;compat_nlink_t st_nlink;__compat_uid_t st_uid;__compat_gid_t st_gid; -compat_dev_t st_rdev; -u16 __pad2; +u32 st_rdev;u32 st_size;u32 st_blksize;u32 st_blocks;
fs/stat.c +10 -9
@@ -306,9 +306,6 @@ SYSCALL_DEFINE2(fstat, unsigned int, fd, struct __old_kernel_stat __user *, stat# define choose_32_64 (a,b) b#endif -#define valid_dev (x) choose_32_64(old_valid_dev(x),true) -#define encode_dev (x) choose_32_64(old_encode_dev,new_encode_dev)(x) -#ifndef INIT_STRUCT_STAT_PADDING # define INIT_STRUCT_STAT_PADDING (st) memset(&st, 0, sizeof(st))#endif
@@ -317,7 +314,9 @@ static int cp_new_stat(struct kstat *stat, struct stat __user *statbuf) {struct stat tmp; -if (!valid_dev (stat->dev) || !valid_dev (stat->rdev)) +if (sizeof (tmp.st_dev) <4 && !old_valid_dev (stat->dev)) +return -EOVERFLOW ; +if (sizeof (tmp.st_rdev) <4 && !old_valid_dev (stat->rdev))return -EOVERFLOW ;#if BITS_PER_LONG ==32 if (stat->size >MAX_NON_LFS )
@@ -325,7 +324,7 @@ static int cp_new_stat(struct kstat *stat, struct stat __user *statbuf)#endif INIT_STRUCT_STAT_PADDING (tmp); - tmp.st_dev =encode_dev (stat->dev); + tmp.st_dev =new_encode_dev (stat->dev); tmp.st_ino = stat->ino;if (sizeof (tmp.st_ino) <sizeof (stat->ino) && tmp.st_ino != stat->ino)return -EOVERFLOW ;
@@ -335,7 +334,7 @@ static int cp_new_stat(struct kstat *stat, struct stat __user *statbuf)return -EOVERFLOW ;SET_UID (tmp.st_uid,from_kuid_munged (current_user_ns (), stat->uid));SET_GID (tmp.st_gid,from_kgid_munged (current_user_ns (), stat->gid)); - tmp.st_rdev =encode_dev (stat->rdev); + tmp.st_rdev =new_encode_dev (stat->rdev); tmp.st_size = stat->size; tmp.st_atime = stat->atime.tv_sec; tmp.st_mtime = stat->mtime.tv_sec;
@@ -616,11 +615,13 @@ static int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf) {struct compat_stat tmp; -if (!old_valid_dev (stat->dev) || !old_valid_dev (stat->rdev)) +if (sizeof (tmp.st_dev) <4 && !old_valid_dev (stat->dev)) +return -EOVERFLOW ; +if (sizeof (tmp.st_rdev) <4 && !old_valid_dev (stat->rdev))return -EOVERFLOW ;memset (&tmp,0 ,sizeof (tmp)); - tmp.st_dev =old_encode_dev (stat->dev); + tmp.st_dev =new_encode_dev (stat->dev); tmp.st_ino = stat->ino;if (sizeof (tmp.st_ino) <sizeof (stat->ino) && tmp.st_ino != stat->ino)return -EOVERFLOW ;
@@ -630,7 +631,7 @@ static int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)return -EOVERFLOW ;SET_UID (tmp.st_uid,from_kuid_munged (current_user_ns (), stat->uid));SET_GID (tmp.st_gid,from_kgid_munged (current_user_ns (), stat->gid)); - tmp.st_rdev =old_encode_dev (stat->rdev); + tmp.st_rdev =new_encode_dev (stat->rdev);if ((u64 ) stat->size >MAX_NON_LFS )return -EOVERFLOW ; tmp.st_size = stat->size;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 49/86 nvme: add a quirk to disable namespace identifiers
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 00ff400e6deee00f7b15e200205b2708b63b8cf6 ]
Add a quirk to disable using and exporting namespace identifiers for controllers where they are broken beyond repair.
The most directly visible problem with non-unique namespace identifiers is that they break the /dev/disk/by-id/ links, with the link for a supposedly unique identifier now pointing to one of multiple possible namespaces that share the same ID, and a somewhat random selection of which one actually shows up.
--- drivers/nvme/host/core.c | 24 ++++++++++++++++++------ drivers/nvme/host/nvme.h | 5 +++++ 2 files changed, 23 insertions(+), 6 deletions(-)
drivers/nvme/host/core.c +18 -6
@@ -1270,6 +1270,8 @@ static int nvme_process_ns_desc(struct nvme_ctrl *ctrl, struct nvme_ns_ids *ids, warn_str, cur->nidl);return -1 ; } +if (ctrl->quirks &NVME_QUIRK_BOGUS_NID ) +return NVME_NIDT_EUI64_LEN ;memcpy (ids->eui64, data +sizeof (*cur),NVME_NIDT_EUI64_LEN );return NVME_NIDT_EUI64_LEN ;case NVME_NIDT_NGUID :
@@ -1278,6 +1280,8 @@ static int nvme_process_ns_desc(struct nvme_ctrl *ctrl, struct nvme_ns_ids *ids, warn_str, cur->nidl);return -1 ; } +if (ctrl->quirks &NVME_QUIRK_BOGUS_NID ) +return NVME_NIDT_NGUID_LEN ;memcpy (ids->nguid, data +sizeof (*cur),NVME_NIDT_NGUID_LEN );return NVME_NIDT_NGUID_LEN ;case NVME_NIDT_UUID :
@@ -1286,6 +1290,8 @@ static int nvme_process_ns_desc(struct nvme_ctrl *ctrl, struct nvme_ns_ids *ids, warn_str, cur->nidl);return -1 ; } +if (ctrl->quirks &NVME_QUIRK_BOGUS_NID ) +return NVME_NIDT_UUID_LEN ;uuid_copy (&ids->uuid, data +sizeof (*cur));return NVME_NIDT_UUID_LEN ;case NVME_NIDT_CSI :
@@ -1381,12 +1387,18 @@ static int nvme_identify_ns(struct nvme_ctrl *ctrl, unsigned nsid,if ((*id)->ncap ==0 )/* namespace not allocated or attached */ goto out_free_id; -if (ctrl->vs >=NVME_VS (1 ,1 ,0 ) && - !memchr_inv (ids->eui64,0 ,sizeof (ids->eui64))) -memcpy (ids->eui64, (*id)->eui64,sizeof (ids->eui64)); -if (ctrl->vs >=NVME_VS (1 ,2 ,0 ) && - !memchr_inv (ids->nguid,0 ,sizeof (ids->nguid))) -memcpy (ids->nguid, (*id)->nguid,sizeof (ids->nguid)); + +if (ctrl->quirks &NVME_QUIRK_BOGUS_NID ) { +dev_info (ctrl->device, +"Ignoring bogus Namespace Identifiers\n" ); + }else { +if (ctrl->vs >=NVME_VS (1 ,1 ,0 ) && + !memchr_inv (ids->eui64,0 ,sizeof (ids->eui64))) +memcpy (ids->eui64, (*id)->eui64,sizeof (ids->eui64)); +if (ctrl->vs >=NVME_VS (1 ,2 ,0 ) && + !memchr_inv (ids->nguid,0 ,sizeof (ids->nguid))) +memcpy (ids->nguid, (*id)->nguid,sizeof (ids->nguid)); + }return 0 ;
drivers/nvme/host/nvme.h +5 -0
@@ -150,6 +150,11 @@ enum nvme_quirks {* encoding the generation sequence number. */ NVME_QUIRK_SKIP_CID_GEN = (1 <<17 ), + +/* +* Reports garbage in the namespace identifiers (eui64, nguid, uuid). +*/ + NVME_QUIRK_BOGUS_NID = (1 << 18), };/*
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 50/86 nvme-pci: disable namespace identifiers for Qemu controllers
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 66dd346b84d79fde20832ed691a54f4881eac20d ]
Qemu unconditionally reports a UUID, which depending on the qemu version is either all-null (which is incorrect but harmless) or contains a single bit set for all controllers. In addition it can also optionally report a eui64 which needs to be manually set. Disable namespace identifiers for Qemu controlles entirely even if in some cases they could be set correctly through manual intervention.
--- drivers/nvme/host/pci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/nvme/host/pci.c +4 -1
@@ -3212,7 +3212,10 @@ static const struct pci_device_id nvme_id_table[] = { .driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN, }, { PCI_VDEVICE(INTEL, 0x5845), /* Qemu emulated controller */ .driver_data =NVME_QUIRK_IDENTIFY_CNS | - NVME_QUIRK_DISABLE_WRITE_ZEROES, }, +NVME_QUIRK_DISABLE_WRITE_ZEROES | + NVME_QUIRK_BOGUS_NID, }, + { PCI_VDEVICE(REDHAT, 0x0010), /* Qemu emulated controller */ + .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(0x126f, 0x2263), /* Silicon Motion unidentified */ .driver_data = NVME_QUIRK_NO_NS_DESC_LIST, }, { PCI_DEVICE(0x1bb1, 0x0100), /* Seagate Nytro Flash Storage */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 51/86 EDAC/synopsys: Read the error count from the correct register
In reply to Greg Kroah-HartmanFrom: Shubhrajyoti Datta <[email protected]>
commit e2932d1f6f055b2af2114c7e64a26dc1b5593d0c upstream.
Currently, the error count is read wrongly from the status register. Read the count from the proper error count register (ERRCNT).
[ bp: Massage. ]
--- drivers/edac/synopsys_edac.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/edac/synopsys_edac.c +11 -5
@@ -163,6 +163,11 @@#define ECC_STAT_CECNT_SHIFT 8#define ECC_STAT_BITNUM_MASK 0x7F +/* ECC error count register definitions */ +#define ECC_ERRCNT_UECNT_MASK 0xFFFF0000 +#define ECC_ERRCNT_UECNT_SHIFT 16 +#define ECC_ERRCNT_CECNT_MASK 0xFFFF +/* DDR QOS Interrupt register definitions */ #define DDR_QOS_IRQ_STAT_OFST 0x20200#define DDR_QOSUE_MASK 0x4
@@ -418,15 +423,16 @@ static int zynqmp_get_error_info(struct base = priv->baseaddr; p = &priv->stat; + regval =readl (base +ECC_ERRCNT_OFST ); + p->ce_cnt = regval &ECC_ERRCNT_CECNT_MASK ; + p->ue_cnt = (regval &ECC_ERRCNT_UECNT_MASK ) >>ECC_ERRCNT_UECNT_SHIFT ; +if (!p->ce_cnt) + goto ue_err; + regval =readl (base +ECC_STAT_OFST );if (!regval)return 1 ; - p->ce_cnt = (regval &ECC_STAT_CECNT_MASK ) >>ECC_STAT_CECNT_SHIFT ; - p->ue_cnt = (regval &ECC_STAT_UECNT_MASK ) >>ECC_STAT_UECNT_SHIFT ; -if (!p->ce_cnt) - goto ue_err; - p->ceinfo.bitpos = (regval &ECC_STAT_BITNUM_MASK ); regval =readl (base +ECC_CEADDR0_OFST );
Greg Kroah-Hartman
maintainerPATCH 52/86 mm, hugetlb: allow for "high" userspace addresses
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
commit 5f24d5a579d1eace79d505b148808a850b417d4c upstream.
This is a fix for commit f6795053dac8 ("mm: mmap: Allow for "high" userspace addresses") for hugetlb.
This patch adds support for "high" userspace addresses that are optionally supported on the system and have to be requested via a hint mechanism ("high" addr parameter to mmap).
Architectures such as powerpc and x86 achieve this by making changes to their architectural versions of hugetlb_get_unmapped_area() function. However, arm64 uses the generic version of that function.
So take into account arch_get_mmap_base() and arch_get_mmap_end() in hugetlb_get_unmapped_area(). To allow that, move those two macros out of mm/mmap.c into include/linux/sched/mm.h
If these macros are not defined in architectural code then they default to (TASK_SIZE) and (base) so should not introduce any behavioural changes to architectures that do not define them.
For the time being, only ARM64 is affected by this change.
Catalin (ARM64) said
"We should have fixed hugetlb_get_unmapped_area() as well when we added
support for 52-bit VA. The reason for commit f6795053dac8 was to prevent normal mmap() from returning addresses above 48-bit by default as some user-space had hard assumptions about this.
It's a slight ABI change if you do this for hugetlb_get_unmapped_area() but I doubt anyone would notice. It's more likely that the current behaviour would cause issues, so I'd rather have them consistent.
Basically when arm64 gained support for 52-bit addresses we did not want user-space calling mmap() to suddenly get such high addresses, otherwise we could have inadvertently broken some programs (similar behaviour to x86 here). Hence we added commit f6795053dac8. But we missed hugetlbfs which could still get such high mmap() addresses. So in theory that's a potential regression that should have bee addressed at the same time as commit f6795053dac8 (and before arm64 enabled 52-bit addresses)"
--- fs/hugetlbfs/inode.c | 9 +++++---- include/linux/sched/mm.h | 8 ++++++++ mm/mmap.c | 8 -------- 3 files changed, 13 insertions(+), 12 deletions(-)
fs/hugetlbfs/inode.c +5 -4
@@ -206,7 +206,7 @@ hugetlb_get_unmapped_area_bottomup(struc info.flags =0 ; info.length = len; info.low_limit = current->mm->mmap_base; - info.high_limit =TASK_SIZE ; + info.high_limit =arch_get_mmap_end (addr); info.align_mask =PAGE_MASK & ~huge_page_mask (h); info.align_offset =0 ;return vm_unmapped_area (&info);
@@ -222,7 +222,7 @@ hugetlb_get_unmapped_area_topdown(struct info.flags =VM_UNMAPPED_AREA_TOPDOWN ; info.length = len; info.low_limit =max (PAGE_SIZE , mmap_min_addr); - info.high_limit = current->mm->mmap_base; + info.high_limit =arch_get_mmap_base (addr, current->mm->mmap_base); info.align_mask =PAGE_MASK & ~huge_page_mask (h); info.align_offset =0 ; addr =vm_unmapped_area (&info);
@@ -237,7 +237,7 @@ hugetlb_get_unmapped_area_topdown(structVM_BUG_ON (addr != -ENOMEM ); info.flags =0 ; info.low_limit = current->mm->mmap_base; - info.high_limit =TASK_SIZE ; + info.high_limit =arch_get_mmap_end (addr); addr =vm_unmapped_area (&info); }
@@ -251,6 +251,7 @@ hugetlb_get_unmapped_area(struct file *fstruct mm_struct *mm = current->mm;struct vm_area_struct *vma;struct hstate *h =hstate_file (file); +const unsigned long mmap_end =arch_get_mmap_end (addr);if (len & ~huge_page_mask (h))return -EINVAL ;
@@ -266,7 +267,7 @@ hugetlb_get_unmapped_area(struct file *fif (addr) { addr =ALIGN (addr,huge_page_size (h)); vma =find_vma (mm, addr); -if (TASK_SIZE - len >= addr && +if (mmap_end - len >= addr && (!vma || addr + len <=vm_start_gap (vma)))return addr; }
include/linux/sched/mm.h +8 -0
@@ -106,6 +106,14 @@ static inline void mm_update_next_owner(#endif /* CONFIG_MEMCG */ #ifdef CONFIG_MMU +#ifndef arch_get_mmap_end +#define arch_get_mmap_end (addr) (TASK_SIZE) +#endif + +#ifndef arch_get_mmap_base +#define arch_get_mmap_base (addr, base) (base) +#endif +extern void arch_pick_mmap_layout (struct mm_struct *mm,struct rlimit *rlim_stack); extern unsigned long
mm/mmap.c +0 -8
@@ -2140,14 +2140,6 @@ unsigned long vm_unmapped_area(struct vmreturn addr; } -#ifndef arch_get_mmap_end -#define arch_get_mmap_end (addr) (TASK_SIZE) -#endif - -#ifndef arch_get_mmap_base -#define arch_get_mmap_base (addr, base) (base) -#endif -/* Get an address range which is currently unmapped. * For shmat() with addr=0. *
Greg Kroah-Hartman
maintainerPATCH 53/86 oom_kill.c: futex: delay the OOM reaper to allow time for proper futex cleanup
In reply to Greg Kroah-HartmanFrom: Nico Pache <[email protected]>
commit e4a38402c36e42df28eb1a5394be87e6571fb48a upstream.
The pthread struct is allocated on PRIVATE|ANONYMOUS memory [1] which can be targeted by the oom reaper. This mapping is used to store the futex robust list head; the kernel does not keep a copy of the robust list and instead references a userspace address to maintain the robustness during a process death.
A race can occur between exit_mm and the oom reaper that allows the oom reaper to free the memory of the futex robust list before the exit path has handled the futex death:
CPU1 CPU2
--------------------------------------------------------------------
page_fault
do_exit "signal"
wake_oom_reaper
oom_reaper oom_reap_task_mm (invalidates mm)
exit_mm
exit_mm_release
futex_exit_release
futex_cleanup
exit_robust_list
get_user (EFAULT- can't access memory)
If the get_user EFAULT's, the kernel will be unable to recover the waiters on the robust_list, leaving userspace mutexes hung indefinitely.
Delay the OOM reaper, allowing more time for the exit path to perform the futex cleanup.
Reproducer: https://gitlab.com/jsavitz/oom_futex_reproducer
Based on a patch by Michal Hocko.
--- include/linux/sched.h | 1 mm/oom_kill.c | 54 +++++++++++++++++++++++++++++++++++++------------- 2 files changed, 41 insertions(+), 14 deletions(-)
include/linux/sched.h +1 -0
@@ -1325,6 +1325,7 @@ struct task_struct {int pagefault_disabled;#ifdef CONFIG_MMU struct task_struct *oom_reaper_list; +struct timer_list oom_reaper_timer;#endif #ifdef CONFIG_VMAP_STACK struct vm_struct *stack_vm_area;
mm/oom_kill.c +40 -14
109 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 54/86 mm/mmu_notifier.c: fix race in mmu_interval_notifier_remove()
In reply to Greg Kroah-HartmanFrom: Alistair Popple <[email protected]>
commit 319561669a59d8e9206ab311ae5433ef92fd79d1 upstream.
In some cases it is possible for mmu_interval_notifier_remove() to race with mn_tree_inv_end() allowing it to return while the notifier data structure is still in use. Consider the following sequence:
CPU0 - mn_tree_inv_end() CPU1 - mmu_interval_notifier_remove()
----------------------------------- ------------------------------------
spin_lock(subscriptions->lock);
seq = subscriptions->invalidate_seq;
spin_lock(subscriptions->lock); spin_unlock(subscriptions->lock);
subscriptions->invalidate_seq++;
wait_event(invalidate_seq != seq);
return;
interval_tree_remove(interval_sub); kfree(interval_sub);
spin_unlock(subscriptions->lock);
wake_up_all();As the wait_event() condition is true it will return immediately. This can lead to use-after-free type errors if the caller frees the data structure containing the interval notifier subscription while it is still on a deferred list. Fix this by taking the appropriate lock when reading invalidate_seq to ensure proper synchronisation.
I observed this whilst running stress testing during some development. You do have to be pretty unlucky, but it leads to the usual problems of use-after-free (memory corruption, kernel crash, difficult to diagnose WARN_ON, etc).
--- mm/mmu_notifier.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
mm/mmu_notifier.c +13 -1
@@ -1043,6 +1043,18 @@ int mmu_interval_notifier_insert_locked( }EXPORT_SYMBOL_GPL (mmu_interval_notifier_insert_locked); +static bool +mmu_interval_seq_released (struct mmu_notifier_subscriptions *subscriptions, +unsigned long seq) +{ +bool ret; + +spin_lock (&subscriptions->lock); + ret = subscriptions->invalidate_seq != seq; +spin_unlock (&subscriptions->lock); +return ret; +} +/** * mmu_interval_notifier_remove - Remove a interval notifier * @interval_sub: Interval subscription to unregister
@@ -1090,7 +1102,7 @@ void mmu_interval_notifier_remove(structlock_map_release (&__mmu_notifier_invalidate_range_start_map);if (seq)wait_event (subscriptions->wq, -READ_ONCE (subscriptions->invalidate_seq) != seq); +mmu_interval_seq_released (subscriptions, seq));/* pairs with mmgrab in mmu_interval_notifier_insert() */ mmdrop (mm);
Greg Kroah-Hartman
maintainerPATCH 55/86 ata: pata_marvell: Check the bmdma_addr beforing reading
In reply to Greg Kroah-HartmanFrom: Zheyu Ma <[email protected]>
commit aafa9f958342db36c17ac2a7f1b841032c96feb4 upstream.
Before detecting the cable type on the dma bar, the driver should check whether the 'bmdma_addr' is zero, which means the adapter does not support DMA, otherwise we will get the following error:
[ 5.146634] Bad IO access at port 0x1 (return inb(port)) [ 5.147206] WARNING: CPU: 2 PID: 303 at lib/iomap.c:44 ioread8+0x4a/0x60 [ 5.150856] RIP: 0010:ioread8+0x4a/0x60 [ 5.160238] Call Trace: [ 5.160470] <TASK> [ 5.160674] marvell_cable_detect+0x6e/0xc0 [pata_marvell] [ 5.161728] ata_eh_recover+0x3520/0x6cc0 [ 5.168075] ata_do_eh+0x49/0x3c0
--- drivers/ata/pata_marvell.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/ata/pata_marvell.c +2 -0
@@ -83,6 +83,8 @@ static int marvell_cable_detect(struct aswitch (ap->port_no) {case 0 : +if (!ap->ioaddr.bmdma_addr) +return ATA_CBL_PATA_UNK ;if (ioread8 (ap->ioaddr.bmdma_addr +1 ) &1 )return ATA_CBL_PATA40 ;return ATA_CBL_PATA80 ;
Greg Kroah-Hartman
maintainerPATCH 56/86 dma: at_xdmac: fix a missing check on list iterator
In reply to Greg Kroah-HartmanFrom: Xiaomeng Tong <[email protected]>
commit 206680c4e46b62fd8909385e0874a36952595b85 upstream.
The bug is here:
__func__, desc, &desc->tx_dma_desc.phys, ret, cookie, residue);
The list iterator 'desc' will point to a bogus position containing HEAD if the list is empty or no element is found. To avoid dev_dbg() prints a invalid address, use a new variable 'iter' as the list iterator, while use the origin variable 'desc' as a dedicated pointer to point to the found element.
--- drivers/dma/at_xdmac.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/dma/at_xdmac.c +7 -5
@@ -1390,7 +1390,7 @@ at_xdmac_tx_status(struct dma_chan *chan {struct at_xdmac_chan *atchan =to_at_xdmac_chan (chan);struct at_xdmac *atxdmac =to_at_xdmac (atchan->chan.device); -struct at_xdmac_desc *desc, *_desc; +struct at_xdmac_desc *desc, *_desc, *iter;struct list_head *descs_list;enum dma_status ret;int residue, retry;
@@ -1505,11 +1505,13 @@ at_xdmac_tx_status(struct dma_chan *chan* microblock. */ descs_list = &desc->descs_list; -list_for_each_entry_safe (desc, _desc, descs_list, desc_node) { - dwidth =at_xdmac_get_dwidth (desc->lld.mbr_cfg); - residue -= (desc->lld.mbr_ubc &0xffffff ) << dwidth; -if ((desc->lld.mbr_nda &0xfffffffc ) == cur_nda) +list_for_each_entry_safe (iter, _desc, descs_list, desc_node) { + dwidth =at_xdmac_get_dwidth (iter->lld.mbr_cfg); + residue -= (iter->lld.mbr_ubc &0xffffff ) << dwidth; +if ((iter->lld.mbr_nda &0xfffffffc ) == cur_nda) { + desc = iter;break ; + } } residue += cur_ubc << dwidth;
Greg Kroah-Hartman
maintainerPATCH 57/86 net: atlantic: invert deep par in pm functions, preventing null derefs
In reply to Greg Kroah-HartmanFrom: Manuel Ullmann <[email protected]>
commit cbe6c3a8f8f4315b96e46e1a1c70393c06d95a4c upstream.
This will reset deeply on freeze and thaw instead of suspend and resume and prevent null pointer dereferences of the uninitialized ring 0 buffer while thawing.
The impact is an indefinitely hanging kernel. You can't switch consoles after this and the only possible user interaction is SysRq.
BUG: kernel NULL pointer dereference RIP: 0010:aq_ring_rx_fill+0xcf/0x210 [atlantic] aq_vec_init+0x85/0xe0 [atlantic] aq_nic_init+0xf7/0x1d0 [atlantic] atl_resume_common+0x4f/0x100 [atlantic] pci_pm_thaw+0x42/0xa0
resolves in aq_ring.o to
```
0000000000000ae0 <aq_ring_rx_fill>:
{
/* ... */
baf: 48 8b 43 08 mov 0x8(%rbx),%rax
buff->flags = 0U; /* buff is NULL */
```The bug has been present since the introduction of the new pm code in 8aaa112a57c1 ("net: atlantic: refactoring pm logic") and was hidden until 8ce84271697a ("net: atlantic: changes for multi-TC support"), which refactored the aq_vec_{free,alloc} functions into aq_vec_{,ring}_{free,alloc}, but is technically not wrong. The original functions just always reinitialized the buffers on S3/S4. If the interface is down before freezing, the bug does not occur. It does not matter, whether the initrd contains and loads the module before thawing.
So the fix is to invert the boolean parameter deep in all pm function calls, which was clearly intended to be set like that.
First report was on Github [1], which you have to guess from the resume logs in the posted dmesg snippet. Recently I posted one on Bugzilla [2], since I did not have an AQC device so far.
#regzbot introduced: 8ce84271697a
#regzbot from: koo5 <[email protected]> #regzbot monitor: https://github.com/Aquantia/AQtion/issues/32
--- drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c +4 -4
@@ -450,22 +450,22 @@ err_exit:static int aq_pm_freeze (struct device *dev) { -return aq_suspend_common (dev, false); +return aq_suspend_common (dev, true); }static int aq_pm_suspend_poweroff (struct device *dev) { -return aq_suspend_common (dev, true); +return aq_suspend_common (dev, false); }static int aq_pm_thaw (struct device *dev) { -return atl_resume_common (dev, false); +return atl_resume_common (dev, true); }static int aq_pm_resume_restore (struct device *dev) { -return atl_resume_common (dev, true); +return atl_resume_common (dev, false); }static const struct dev_pm_ops aq_pm_ops = {
Greg Kroah-Hartman
maintainerPATCH 58/86 xtensa: patch_text: Fixup last cpu should be master
In reply to Greg Kroah-HartmanFrom: Guo Ren <[email protected]>
commit ee69d4be8fd064cd08270b4808d2dfece3614ee0 upstream.
These patch_text implementations are using stop_machine_cpuslocked infrastructure with atomic cpu_count. The original idea: When the master CPU patch_text, the others should wait for it. But current implementation is using the first CPU as master, which couldn't guarantee the remaining CPUs are waiting. This patch changes the last CPU as the master to solve the potential risk.
Message-Id: <[email protected]>
--- arch/xtensa/kernel/jump_label.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/xtensa/kernel/jump_label.c +1 -1
@@ -40,7 +40,7 @@ static int patch_text_stop_machine(void {struct patch *patch = data; -if (atomic_inc_return (&patch->cpu_count) ==1 ) { +if (atomic_inc_return (&patch->cpu_count) ==num_online_cpus ()) {local_patch_text (patch->addr, patch->data, patch->sz);atomic_inc (&patch->cpu_count); }else {
Greg Kroah-Hartman
maintainerPATCH 59/86 xtensa: fix a7 clobbering in coprocessor context load/store
In reply to Greg Kroah-HartmanFrom: Max Filippov <[email protected]>
commit 839769c35477d4acc2369e45000ca7b0b6af39a7 upstream.
Fast coprocessor exception handler saves a3..a6, but coprocessor context load/store code uses a4..a7 as temporaries, potentially clobbering a7. 'Potentially' because coprocessor state load/store macros may not use all four temporary registers (and neither FPU nor HiFi macros do). Use a3..a6 as intended.
--- arch/xtensa/kernel/coprocessor.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/xtensa/kernel/coprocessor.S +2 -2
@@ -29,7 +29,7 @@ .if XTENSA_HAVE_COPROCESSOR(x); \ .align 4; \ .Lsave_cp_regs_cp##x: \ - xchal_cp##x##_store a2 a4 a5 a6 a7; \ + xchal_cp##x##_store a2 a3 a4 a5 a6; \ jx a0; \ .endif
@@ -46,7 +46,7 @@ .if XTENSA_HAVE_COPROCESSOR(x); \ .align 4; \ .Lload_cp_regs_cp##x: \ - xchal_cp##x##_load a2 a4 a5 a6 a7; \ + xchal_cp##x##_load a2 a3 a4 a5 a6; \ jx a0; \ .endif
Greg Kroah-Hartman
maintainerPATCH 60/86 openvswitch: fix OOB access in reserve_sfa_size()
In reply to Greg Kroah-HartmanFrom: Paolo Valerio <[email protected]>
commit cefa91b2332d7009bc0be5d951d6cbbf349f90f8 upstream.
Given a sufficiently large number of actions, while copying and reserving memory for a new action of a new flow, if next_offset is greater than MAX_ACTIONS_BUFSIZE, the function reserve_sfa_size() does not return -EMSGSIZE as expected, but it allocates MAX_ACTIONS_BUFSIZE bytes increasing actions_len by req_size. This can then lead to an OOB write access, especially when further actions need to be copied.
Fix it by rearranging the flow action size check.
KASAN splat below:
==================================================================
BUG: KASAN: slab-out-of-bounds in reserve_sfa_size+0x1ba/0x380 [openvswitch] Write of size 65360 at addr ffff888147e4001c by task handler15/836 CPU: 1 PID: 836 Comm: handler15 Not tainted 5.18.0-rc1+ #27 ... Call Trace: <TASK> dump_stack_lvl+0x45/0x5a print_report.cold+0x5e/0x5db ? __lock_text_start+0x8/0x8 ? reserve_sfa_size+0x1ba/0x380 [openvswitch] kasan_report+0xb5/0x130 ? reserve_sfa_size+0x1ba/0x380 [openvswitch] kasan_check_range+0xf5/0x1d0 memcpy+0x39/0x60 reserve_sfa_size+0x1ba/0x380 [openvswitch] __add_action+0x24/0x120 [openvswitch] ovs_nla_add_action+0xe/0x20 [openvswitch] ovs_ct_copy_action+0x29d/0x1130 [openvswitch] ? __kernel_text_address+0xe/0x30 ? unwind_get_return_address+0x56/0xa0 ? create_prof_cpu_mask+0x20/0x20 ? ovs_ct_verify+0xf0/0xf0 [openvswitch] ? prep_compound_page+0x198/0x2a0 ? __kasan_check_byte+0x10/0x40 ? kasan_unpoison+0x40/0x70 ? ksize+0x44/0x60 ? reserve_sfa_size+0x75/0x380 [openvswitch] __ovs_nla_copy_actions+0xc26/0x2070 [openvswitch] ? __zone_watermark_ok+0x420/0x420 ? validate_set.constprop.0+0xc90/0xc90 [openvswitch] ? __alloc_pages+0x1a9/0x3e0 ? __alloc_pages_slowpath.constprop.0+0x1da0/0x1da0 ? unwind_next_frame+0x991/0x1e40 ? __mod_node_page_state+0x99/0x120 ? __mod_lruvec_page_state+0x2e3/0x470 ? __kasan_kmalloc_large+0x90/0xe0 ovs_nla_copy_actions+0x1b4/0x2c0 [openvswitch] ovs_flow_cmd_new+0x3cd/0xb10 [openvswitch] ...
--- net/openvswitch/flow_netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/openvswitch/flow_netlink.c +1 -1
@@ -2436,7 +2436,7 @@ static struct nlattr *reserve_sfa_size(s new_acts_size =max (next_offset + req_size,ksize (*sfa) *2 );if (new_acts_size >MAX_ACTIONS_BUFSIZE ) { -if ((MAX_ACTIONS_BUFSIZE - next_offset) < req_size) { +if ((next_offset + req_size) >MAX_ACTIONS_BUFSIZE ) {OVS_NLERR (log,"Flow action size exceeds max %u" ,MAX_ACTIONS_BUFSIZE );return ERR_PTR (-EMSGSIZE );
Greg Kroah-Hartman
maintainerPATCH 61/86 gpio: Request interrupts after IRQ is initialized
In reply to Greg Kroah-HartmanFrom: Mario Limonciello <[email protected]>
commit 06fb4ecfeac7e00d6704fa5ed19299f2fefb3cc9 upstream.
Commit 5467801f1fcb ("gpio: Restrict usage of GPIO chip irq members before initialization") attempted to fix a race condition that lead to a NULL pointer, but in the process caused a regression for _AEI/_EVT declared GPIOs.
This manifests in messages showing deferred probing while trying to allocate IRQs like so:
amd_gpio AMDI0030:00: Failed to translate GPIO pin 0x0000 to IRQ, err -517 amd_gpio AMDI0030:00: Failed to translate GPIO pin 0x002C to IRQ, err -517 amd_gpio AMDI0030:00: Failed to translate GPIO pin 0x003D to IRQ, err -517 [ .. more of the same .. ]
The code for walking _AEI doesn't handle deferred probing and so this leads to non-functional GPIO interrupts.
Fix this issue by moving the call to acpi_gpiochip_request_interrupts to occur after gc->irc.initialized is set.
--- drivers/gpio/gpiolib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpio/gpiolib.c +2 -2
@@ -1612,8 +1612,6 @@ static int gpiochip_add_irqchip(struct ggpiochip_set_irq_hooks (gc); -acpi_gpiochip_request_interrupts (gc); -/* * Using barrier() here to prevent compiler from reordering * gc->irq.initialized before initialization of above
@@ -1623,6 +1621,8 @@ static int gpiochip_add_irqchip(struct g gc->irq.initialized = true; +acpi_gpiochip_request_interrupts (gc); +return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 62/86 ASoC: soc-dapm: fix two incorrect uses of list iterator
In reply to Greg Kroah-HartmanFrom: Xiaomeng Tong <[email protected]>
commit f730a46b931d894816af34a0ff8e4ad51565b39f upstream.
These two bug are here:
list_for_each_entry_safe_continue(w, n, list, power_list); list_for_each_entry_safe_continue(w, n, list, power_list);
After the list_for_each_entry_safe_continue() exits, the list iterator will always be a bogus pointer which point to an invalid struct objdect containing HEAD member. The funciton poniter 'w->event' will be a invalid value which can lead to a control-flow hijack if the 'w' can be controlled.
The original intention was to continue the outer list_for_each_entry_safe() loop with the same entry if w->event is NULL, but misunderstanding the meaning of list_for_each_entry_safe_continue().
So just add a 'continue;' to fix the bug.
--- sound/soc/soc-dapm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
sound/soc/soc-dapm.c +2 -4
@@ -1683,8 +1683,7 @@ static void dapm_seq_run(struct snd_soc_switch (w->id) {case snd_soc_dapm_pre:if (!w->event) -list_for_each_entry_safe_continue (w, n, list, - power_list); +continue ;if (event ==SND_SOC_DAPM_STREAM_START ) ret = w->event(w,
@@ -1696,8 +1695,7 @@ static void dapm_seq_run(struct snd_soc_case snd_soc_dapm_post:if (!w->event) -list_for_each_entry_safe_continue (w, n, list, - power_list); +continue ;if (event ==SND_SOC_DAPM_STREAM_START ) ret = w->event(w,
Greg Kroah-Hartman
maintainerPATCH 63/86 e1000e: Fix possible overflow in LTR decoding
In reply to Greg Kroah-HartmanFrom: Sasha Neftin <[email protected]>
commit 04ebaa1cfddae5f240cc7404f009133bb0389a47 upstream.
When we decode the latency and the max_latency, u16 value may not fit the required size and could lead to the wrong LTR representation.
Scaling is represented as:
scale 0 - 1 (2^(5*0)) = 2^0 scale 1 - 32 (2^(5 *1))= 2^5 scale 2 - 1024 (2^(5 *2)) =2^10 scale 3 - 32768 (2^(5 *3)) =2^15 scale 4 - 1048576 (2^(5 *4)) = 2^20 scale 5 - 33554432 (2^(5 *4)) = 2^25
scale 4 and scale 5 required 20 and 25 bits respectively. scale 6 reserved.
Replace the u16 type with the u32 type and allow corrected LTR representation.
--- drivers/net/ethernet/intel/e1000e/ich8lan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/e1000e/ich8lan.c +2 -2
@@ -1006,8 +1006,8 @@ static s32 e1000_platform_pm_pch_lpt(str {u32 reg = link << (E1000_LTRV_REQ_SHIFT +E1000_LTRV_NOSNOOP_SHIFT ) | link <<E1000_LTRV_REQ_SHIFT |E1000_LTRV_SEND ; -u16 max_ltr_enc_d =0 ;/* maximum LTR decoded by platform */ -u16 lat_enc_d =0 ;/* latency decoded */ +u32 max_ltr_enc_d =0 ;/* maximum LTR decoded by platform */ +u32 lat_enc_d =0 ;/* latency decoded */ u16 lat_enc =0 ;/* latency encoded */ if (link) {
Greg Kroah-Hartman
maintainerPATCH 64/86 ARC: entry: fix syscall_trace_exit argument
In reply to Greg Kroah-HartmanFrom: Sergey Matyukevich <[email protected]>
commit b1c6ecfdd06907554518ec384ce8e99889d15193 upstream.
Function syscall_trace_exit expects pointer to pt_regs. However r0 is also used to keep syscall return value. Restore pointer to pt_regs before calling syscall_trace_exit.
--- arch/arc/kernel/entry.S | 1 + 1 file changed, 1 insertion(+)
arch/arc/kernel/entry.S +1 -0
@@ -199,6 +199,7 @@ tracesys_exit: st r0, [sp, PT_r0] ; sys call return value in pt_regs ;POST Sys Call Ptrace Hook + mov r0, sp ; pt_regs needed bl @syscall_trace_exit b ret_from_exception ; NOT ret_from_system_call at is saves r0 which ; we'd done before calling post hook above
Greg Kroah-Hartman
maintainerPATCH 65/86 arm_pmu: Validate single/group leader events
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
commit e5c23779f93d45e39a52758ca593bd7e62e9b4be upstream.
In the case where there is only a cycle counter available (i.e. PMCR_EL0.N is 0) and an event other than CPU cycles is opened, the open should fail as the event can never possibly be scheduled. However, the event validation when an event is opened is skipped when the group leader is opened. Fix this by always validating the group leader events.
--- drivers/perf/arm_pmu.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/perf/arm_pmu.c +4 -6
@@ -398,6 +398,9 @@ validate_group(struct perf_event *event)if (!validate_event (event->pmu, &fake_pmu, leader))return -EINVAL ; +if (event == leader) +return 0 ; +for_each_sibling_event (sibling, leader) {if (!validate_event (event->pmu, &fake_pmu, sibling))return -EINVAL ;
@@ -487,12 +490,7 @@ __hw_perf_event_init(struct perf_event *local64_set (&hwc->period_left, hwc->sample_period); } -if (event->group_leader != event) { -if (validate_group (event) !=0 ) -return -EINVAL ; - } - -return 0 ; +return validate_group (event); }static int armpmu_event_init (struct perf_event *event)
Greg Kroah-Hartman
maintainerPATCH 66/86 sched/pelt: Fix attach_entity_load_avg() corner case
In reply to Greg Kroah-HartmanFrom: kuyo chang <[email protected]>
[ Upstream commit 40f5aa4c5eaebfeaca4566217cb9c468e28ed682 ]
The warning in cfs_rq_is_decayed() triggered:
SCHED_WARN_ON(cfs_rq->avg.load_avg || cfs_rq->avg.util_avg || cfs_rq->avg.runnable_avg)
There exists a corner case in attach_entity_load_avg() which will cause load_sum to be zero while load_avg will not be.
Consider se_weight is 88761 as per the sched_prio_to_weight[] table. Further assume the get_pelt_divider() is 47742, this gives:se->avg.load_avg is 1.
However, calculating load_sum:
se->avg.load_sum = div_u64(se->avg.load_avg * se->avg.load_sum, se_weight(se)); se->avg.load_sum = 1*47742/88761 = 0.
Then enqueue_load_avg() adds this to the cfs_rq totals:
cfs_rq->avg.load_avg += se->avg.load_avg; cfs_rq->avg.load_sum += se_weight(se) * se->avg.load_sum;
Resulting in load_avg being 1 with load_sum is 0, which will trigger the WARN.
--- kernel/sched/fair.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
kernel/sched/fair.c +5 -5
@@ -3748,11 +3748,11 @@ static void attach_entity_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *s se->avg.runnable_sum = se->avg.runnable_avg * divider; - se->avg.load_sum = divider; -if (se_weight (se)) { - se->avg.load_sum = -div_u64 (se->avg.load_avg * se->avg.load_sum,se_weight (se)); - } + se->avg.load_sum = se->avg.load_avg * divider; +if (se_weight (se) < se->avg.load_sum) + se->avg.load_sum =div_u64 (se->avg.load_sum,se_weight (se)); +else + se->avg.load_sum =1 ;enqueue_load_avg (cfs_rq, se); cfs_rq->avg.util_avg += se->avg.util_avg;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 67/86 perf/core: Fix perf_mmap fail when CONFIG_PERF_USE_VMALLOC enabled
In reply to Greg Kroah-HartmanFrom: Zhipeng Xie <[email protected]>
[ Upstream commit 60490e7966659b26d74bf1fa4aa8693d9a94ca88 ]
This problem can be reproduced with CONFIG_PERF_USE_VMALLOC enabled on both x86_64 and aarch64 arch when using sysdig -B(using ebpf)[1]. sysdig -B works fine after rebuilding the kernel with CONFIG_PERF_USE_VMALLOC disabled.
I tracked it down to the if condition event->rb->nr_pages != nr_pages in perf_mmap is true when CONFIG_PERF_USE_VMALLOC is enabled where event->rb->nr_pages = 1 and nr_pages = 2048 resulting perf_mmap to return -EINVAL. This is because when CONFIG_PERF_USE_VMALLOC is enabled, rb->nr_pages is always equal to 1.
Arch with CONFIG_PERF_USE_VMALLOC enabled by default:
arc/arm/csky/mips/sh/sparc/xtensa
Arch with CONFIG_PERF_USE_VMALLOC disabled by default:
x86_64/aarch64/...
Fix this problem by using data_page_nr()
[1] https://github.com/draios/sysdig
--- kernel/events/core.c | 2 +- kernel/events/internal.h | 5 +++++ kernel/events/ring_buffer.c | 5 ----- 3 files changed, 6 insertions(+), 6 deletions(-)
kernel/events/core.c +1 -1
@@ -6221,7 +6221,7 @@ static int perf_mmap(struct file *file, struct vm_area_struct *vma) again:mutex_lock (&event->mmap_mutex);if (event->rb) { -if (event->rb->nr_pages != nr_pages) { +if (data_page_nr (event->rb) != nr_pages) { ret = -EINVAL ; goto unlock; }
kernel/events/internal.h +5 -0
@@ -116,6 +116,11 @@ static inline int page_order(struct perf_buffer *rb) }#endif +static inline int data_page_nr (struct perf_buffer *rb) +{ +return rb->nr_pages <<page_order (rb); +} +static inline unsigned long perf_data_size (struct perf_buffer *rb) {return rb->nr_pages << (PAGE_SHIFT +page_order (rb));
kernel/events/ring_buffer.c +0 -5
@@ -856,11 +856,6 @@ void rb_free(struct perf_buffer *rb) }#else -static int data_page_nr (struct perf_buffer *rb) -{ -return rb->nr_pages <<page_order (rb); -} -static struct page *__perf_mmap_to_page (struct perf_buffer *rb,unsigned long pgoff) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 68/86 drm/panel/raspberrypi-touchscreen: Avoid NULL deref if not initialised
In reply to Greg Kroah-HartmanFrom: Dave Stevenson <[email protected]>
[ Upstream commit f92055ae0acb035891e988ce345d6b81a0316423 ]
If a call to rpi_touchscreen_i2c_write from rpi_touchscreen_probe fails before mipi_dsi_device_register_full is called, then in trying to log the error message if uses ts->dsi->dev when it is still NULL.
Use ts->i2c->dev instead, which is initialised earlier in probe.
--- drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c +1 -1
@@ -229,7 +229,7 @@ static void rpi_touchscreen_i2c_write(struct rpi_touchscreen *ts, ret =i2c_smbus_write_byte_data (ts->i2c, reg, val);if (ret) -dev_err (&ts->dsi->dev,"I2C write failed: %d\n" , ret); +dev_err (&ts->i2c->dev,"I2C write failed: %d\n" , ret); }static int rpi_touchscreen_write (struct rpi_touchscreen *ts,u16 reg,u32 val)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 69/86 drm/panel/raspberrypi-touchscreen: Initialise the bridge in prepare
In reply to Greg Kroah-HartmanFrom: Dave Stevenson <[email protected]>
[ Upstream commit 5f18c0782b99e26121efa93d20b76c19e17aa1dd ]
The panel has a prepare call which is before video starts, and an enable call which is after.
The Toshiba bridge should be configured before video, so move the relevant power and initialisation calls to prepare.
--- drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c +9 -2
@@ -265,7 +265,7 @@ static int rpi_touchscreen_noop(struct drm_panel *panel)return 0 ; } -static int rpi_touchscreen_enable (struct drm_panel *panel) +static int rpi_touchscreen_prepare (struct drm_panel *panel) {struct rpi_touchscreen *ts =panel_to_ts (panel);int i;
@@ -295,6 +295,13 @@ static int rpi_touchscreen_enable(struct drm_panel *panel)rpi_touchscreen_write (ts,DSI_STARTDSI ,0x01 );msleep (100 ); +return 0 ; +} + +static int rpi_touchscreen_enable (struct drm_panel *panel) +{ +struct rpi_touchscreen *ts =panel_to_ts (panel); +/* Turn on the backlight. */ rpi_touchscreen_i2c_write (ts,REG_PWM ,255 );
@@ -349,7 +356,7 @@ static int rpi_touchscreen_get_modes(struct drm_panel *panel,static const struct drm_panel_funcs rpi_touchscreen_funcs = { .disable = rpi_touchscreen_disable, .unprepare = rpi_touchscreen_noop, - .prepare = rpi_touchscreen_noop, + .prepare = rpi_touchscreen_prepare, .enable = rpi_touchscreen_enable, .get_modes = rpi_touchscreen_get_modes, };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 70/86 KVM: PPC: Fix TCE handling for VFIO
In reply to Greg Kroah-HartmanFrom: Alexey Kardashevskiy <[email protected]>
[ Upstream commit 26a62b750a4e6364b0393562f66759b1494c3a01 ]
The LoPAPR spec defines a guest visible IOMMU with a variable page size. Currently QEMU advertises 4K, 64K, 2M, 16MB pages, a Linux VM picks the biggest (16MB). In the case of a passed though PCI device, there is a hardware IOMMU which does not support all pages sizes from the above - P8 cannot do 2MB and P9 cannot do 16MB. So for each emulated 16M IOMMU page we may create several smaller mappings ("TCEs") in the hardware IOMMU.
The code wrongly uses the emulated TCE index instead of hardware TCE index in error handling. The problem is easier to see on POWER8 with multi-level TCE tables (when only the first level is preallocated) as hash mode uses real mode TCE hypercalls handlers.
The kernel starts using indirect tables when VMs get bigger than 128GB (depends on the max page order).
The very first real mode hcall is going to fail with H_TOO_HARD as in the real mode we cannot allocate memory for TCEs (we can in the virtual mode) but on the way out the code attempts to clear hardware TCEs using emulated TCE indexes which corrupts random kernel memory because it_offset==1<<59 is subtracted from those indexes and the resulting index is out of the TCE table bounds.
This fixes kvmppc_clear_tce() to use the correct TCE indexes.
While at it, this fixes TCE cache invalidation which uses emulated TCE indexes instead of the hardware ones. This went unnoticed as 64bit DMA is used these days and VMs map all RAM in one go and only then do DMA and this is when the TCE cache gets populated.
Potentially this could slow down mapping, however normally 16MB emulated pages are backed by 64K hardware pages so it is one write to the "TCE Kill" per 256 updates which is not that bad considering the size of the cache (1024 TCEs or so).
--- arch/powerpc/kvm/book3s_64_vio.c | 45 +++++++++++++++-------------- arch/powerpc/kvm/book3s_64_vio_hv.c | 44 ++++++++++++++-------------- 2 files changed, 45 insertions(+), 44 deletions(-)
arch/powerpc/kvm/book3s_64_vio.c +23 -22
@@ -421,13 +421,19 @@ static void kvmppc_tce_put(struct kvmppc_spapr_tce_table *stt, tbl[idx %TCES_PER_PAGE ] = tce; } -static void kvmppc_clear_tce (struct mm_struct *mm,struct iommu_table *tbl, -unsigned long entry) +static void kvmppc_clear_tce (struct mm_struct *mm,struct kvmppc_spapr_tce_table *stt, +struct iommu_table *tbl,unsigned long entry) { -unsigned long hpa =0 ; -enum dma_data_direction dir =DMA_NONE ; +unsigned long i; +unsigned long subpages =1ULL << (stt->page_shift - tbl->it_page_shift); +unsigned long io_entry = entry << (stt->page_shift - tbl->it_page_shift); + +for (i =0 ; i < subpages; ++i) { +unsigned long hpa =0 ; +enum dma_data_direction dir =DMA_NONE ; -iommu_tce_xchg_no_kill (mm, tbl, entry, &hpa, &dir); +iommu_tce_xchg_no_kill (mm, tbl, io_entry + i, &hpa, &dir); + } } static long kvmppc_tce_iommu_mapped_dec(struct kvm *kvm,
@@ -486,6 +492,8 @@ static long kvmppc_tce_iommu_unmap(struct kvm *kvm,break ; } +iommu_tce_kill (tbl, io_entry, subpages); +return ret; }
@@ -545,6 +553,8 @@ static long kvmppc_tce_iommu_map(struct kvm *kvm,break ; } +iommu_tce_kill (tbl, io_entry, subpages); +return ret; }
@@ -591,10 +601,9 @@ long kvmppc_h_put_tce(struct kvm_vcpu *vcpu, unsigned long liobn, ret =kvmppc_tce_iommu_map (vcpu->kvm, stt, stit->tbl, entry, ua, dir); -iommu_tce_kill (stit->tbl, entry,1 );if (ret !=H_SUCCESS ) { -kvmppc_clear_tce (vcpu->kvm->mm, stit->tbl, entry); +kvmppc_clear_tce (vcpu->kvm->mm, stt, stit->tbl, entry); goto unlock_exit; } }
@@ -670,13 +679,13 @@ long kvmppc_h_put_tce_indirect(struct kvm_vcpu *vcpu,*/ if (get_user (tce, tces + i)) { ret =H_TOO_HARD ; - goto invalidate_exit; + goto unlock_exit; } tce =be64_to_cpu (tce);if (kvmppc_tce_to_ua (vcpu->kvm, tce, &ua)) { ret =H_PARAMETER ; - goto invalidate_exit; + goto unlock_exit; }list_for_each_entry_lockless (stit, &stt->iommu_tables, next) {
@@ -685,19 +694,15 @@ long kvmppc_h_put_tce_indirect(struct kvm_vcpu *vcpu, iommu_tce_direction(tce));if (ret !=H_SUCCESS ) { -kvmppc_clear_tce (vcpu->kvm->mm, stit->tbl, - entry); - goto invalidate_exit; +kvmppc_clear_tce (vcpu->kvm->mm, stt, stit->tbl, + entry + i); + goto unlock_exit; } }kvmppc_tce_put (stt, entry + i, tce); } -invalidate_exit: -list_for_each_entry_lockless (stit, &stt->iommu_tables, next) -iommu_tce_kill (stit->tbl, entry, npages); - unlock_exit:srcu_read_unlock (&vcpu->kvm->srcu, idx);
@@ -736,20 +741,16 @@ long kvmppc_h_stuff_tce(struct kvm_vcpu *vcpu,continue ;if (ret ==H_TOO_HARD ) - goto invalidate_exit; +return ret;WARN_ON_ONCE (1 ); -kvmppc_clear_tce (vcpu->kvm->mm, stit->tbl, entry); +kvmppc_clear_tce (vcpu->kvm->mm, stt, stit->tbl, entry + i); } }for (i =0 ; i < npages; ++i, ioba += (1ULL << stt->page_shift))kvmppc_tce_put (stt, ioba >> stt->page_shift, tce_value); -invalidate_exit: -list_for_each_entry_lockless (stit, &stt->iommu_tables, next) -iommu_tce_kill (stit->tbl, ioba >> stt->page_shift, npages); -return ret; }EXPORT_SYMBOL_GPL (kvmppc_h_stuff_tce);
arch/powerpc/kvm/book3s_64_vio_hv.c +22 -22
103 lines not on this page · raw message
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 71/86 drm/vc4: Use pm_runtime_resume_and_get to fix pm_runtime_get_sync() usage
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 3d0b93d92a2790337aa9d18cb332d02356a24126 ]
If the device is already in a runtime PM enabled state pm_runtime_get_sync() will return 1.
Also, we need to call pm_runtime_put_noidle() when pm_runtime_get_sync() fails, so use pm_runtime_resume_and_get() instead. this function will handle this.
--- drivers/gpu/drm/vc4/vc4_dsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/vc4/vc4_dsi.c +1 -1
@@ -835,7 +835,7 @@ static void vc4_dsi_encoder_enable(struct drm_encoder *encoder)unsigned long phy_clock;int ret; - ret =pm_runtime_get_sync (dev); + ret =pm_runtime_resume_and_get (dev);if (ret) {DRM_ERROR ("Failed to runtime PM enable on DSI%d\n" , dsi->port);return ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 72/86 powerpc/perf: Fix power9 event alternatives
In reply to Greg Kroah-HartmanFrom: Athira Rajeev <[email protected]>
[ Upstream commit 0dcad700bb2776e3886fe0a645a4bf13b1e747cd ]
When scheduling a group of events, there are constraint checks done to make sure all events can go in a group. Example, one of the criteria is that events in a group cannot use the same PMC. But platform specific PMU supports alternative event for some of the event codes. During perf_event_open(), if any event group doesn't match constraint check criteria, further lookup is done to find alternative event.
By current design, the array of alternatives events in PMU code is expected to be sorted by column 0. This is because in find_alternative() the return criteria is based on event code comparison. ie. "event < ev_alt[i][0])". This optimisation is there since find_alternative() can be called multiple times. In power9 PMU code, the alternative event array is not sorted properly and hence there is breakage in finding alternative events.
To work with existing logic, fix the alternative event array to be sorted by column 0 for power9-pmu.c
Results:
With alternative events, multiplexing can be avoided. That is, for example, in power9 PM_LD_MISS_L1 (0x3e054) has alternative event, PM_LD_MISS_L1_ALT (0x400f0). This is an identical event which can be programmed in a different PMC.
Before:
# perf stat -e r3e054,r300fc
Performance counter stats for 'system wide':
1057860 r3e054 (50.21%)
379 r300fc (49.79%)0.944329741 seconds time elapsed
Since both the events are using PMC3 in this case, they are multiplexed here.
After:
# perf stat -e r3e054,r300fc
Performance counter stats for 'system wide':
1006948 r3e054
182 r300fc--- arch/powerpc/perf/power9-pmu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/powerpc/perf/power9-pmu.c +4 -4
@@ -133,11 +133,11 @@ int p9_dd22_bl_ev[] = {/* Table of alternatives, sorted by column 0 */ static const unsigned int power9_event_alternatives[][MAX_ALT ] = { - {PM_INST_DISP ,PM_INST_DISP_ALT }, - {PM_RUN_CYC_ALT ,PM_RUN_CYC }, - {PM_RUN_INST_CMPL_ALT ,PM_RUN_INST_CMPL }, - {PM_LD_MISS_L1 ,PM_LD_MISS_L1_ALT }, {PM_BR_2PATH ,PM_BR_2PATH_ALT }, + {PM_INST_DISP ,PM_INST_DISP_ALT }, + {PM_RUN_CYC_ALT ,PM_RUN_CYC }, + {PM_LD_MISS_L1 ,PM_LD_MISS_L1_ALT }, + {PM_RUN_INST_CMPL_ALT ,PM_RUN_INST_CMPL }, };static int power9_get_alternatives (u64 event,unsigned int flags,u64 alt[])
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 73/86 perf report: Set PERF_SAMPLE_DATA_SRC bit for Arm SPE event
In reply to Greg Kroah-HartmanFrom: Leo Yan <[email protected]>
[ Upstream commit ccb17caecfbd542f49a2a79ae088136ba8bfb794 ]
Since commit bb30acae4c4dacfa ("perf report: Bail out --mem-mode if mem info is not available") "perf mem report" and "perf report --mem-mode" don't report result if the PERF_SAMPLE_DATA_SRC bit is missed in sample type.
The commit ffab487052054162 ("perf: arm-spe: Fix perf report --mem-mode") partially fixes the issue. It adds PERF_SAMPLE_DATA_SRC bit for Arm SPE event, this allows the perf data file generated by kernel v5.18-rc1 or later version can be reported properly.
On the other hand, perf tool still fails to be backward compatibility for a data file recorded by an older version's perf which contains Arm SPE trace data. This patch is a workaround in reporting phase, when detects ARM SPE PMU event and without PERF_SAMPLE_DATA_SRC bit, it will force to set the bit in the sample type and give a warning info.
--- tools/perf/builtin-report.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
tools/perf/builtin-report.c +14 -0
@@ -340,6 +340,7 @@ static int report__setup_sample_type(struct report *rep)struct perf_session *session = rep->session;u64 sample_type =evlist__combined_sample_type (session->evlist);bool is_pipe =perf_data__is_pipe (session->data); +struct evsel *evsel; if (session->itrace_synth_opts->callchain || session->itrace_synth_opts->add_callchain ||
@@ -394,6 +395,19 @@ static int report__setup_sample_type(struct report *rep) }if (sort__mode ==SORT_MODE__MEMORY ) { +/* +* FIXUP: prior to kernel 5.18, Arm SPE missed to set +* PERF_SAMPLE_DATA_SRC bit in sample type. For backward +* compatibility, set the bit if it's an old perf data file. +*/ +evlist__for_each_entry (session->evlist, evsel) { +if (strstr (evsel->name,"arm_spe" ) && + !(sample_type &PERF_SAMPLE_DATA_SRC )) { + evsel->core.attr.sample_type |=PERF_SAMPLE_DATA_SRC ; + sample_type |=PERF_SAMPLE_DATA_SRC ; + } + } +if (!is_pipe && !(sample_type &PERF_SAMPLE_DATA_SRC )) {ui__error ("Selected --mem-mode but no mem data. " "Did you call perf record without -d?\n" );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 74/86 ext4: fix fallocate to use file_modified to update permissions consistently
In reply to Greg Kroah-HartmanFrom: Darrick J. Wong <[email protected]>
commit ad5cd4f4ee4d5fcdb1bfb7a0c073072961e70783 upstream.
Since the initial introduction of (posix) fallocate back at the turn of the century, it has been possible to use this syscall to change the user-visible contents of files. This can happen by extending the file size during a preallocation, or through any of the newer modes (punch, zero, collapse, insert range). Because the call can be used to change file contents, we should treat it like we do any other modification to a file -- update the mtime, and drop set[ug]id privileges/capabilities.
The VFS function file_modified() does all this for us if pass it a locked inode, so let's make fallocate drop permissions correctly.
--- fs/ext4/ext4.h | 2 +- fs/ext4/extents.c | 32 +++++++++++++++++++++++++------- fs/ext4/inode.c | 7 ++++++- 3 files changed, 32 insertions(+), 9 deletions(-)
fs/ext4/ext4.h +1 -1
@@ -2870,7 +2870,7 @@ extern int ext4_inode_attach_jinode(struextern int ext4_can_truncate (struct inode *inode);extern int ext4_truncate (struct inode *);extern int ext4_break_layouts (struct inode *); -extern int ext4_punch_hole (struct inode *inode,loff_t offset,loff_t length); +extern int ext4_punch_hole (struct file *file,loff_t offset,loff_t length);extern void ext4_set_inode_flags (struct inode *,bool init);extern int ext4_alloc_da_blocks (struct inode *inode);extern void ext4_set_aops (struct inode *inode);
fs/ext4/extents.c +25 -7
@@ -4498,9 +4498,9 @@ retry:return ret >0 ? ret2 : ret; } -static int ext4_collapse_range (struct inode *inode,loff_t offset,loff_t len); +static int ext4_collapse_range (struct file *file,loff_t offset,loff_t len); -static int ext4_insert_range (struct inode *inode,loff_t offset,loff_t len); +static int ext4_insert_range (struct file *file,loff_t offset,loff_t len);static long ext4_zero_range (struct file *file,loff_t offset,loff_t len,int mode)
@@ -4571,6 +4571,10 @@ static long ext4_zero_range(struct file/* Wait all existing dio workers, newcomers will block on i_mutex */ inode_dio_wait (inode); + ret =file_modified (file); +if (ret) + goto out_mutex; +/* Preallocate the range including the unaligned edges */ if (partial_begin || partial_end) { ret = ext4_alloc_file_blocks(file,
@@ -4689,7 +4693,7 @@ long ext4_fallocate(struct file *file, iext4_fc_start_update (inode);if (mode &FALLOC_FL_PUNCH_HOLE ) { - ret =ext4_punch_hole (inode, offset, len); + ret =ext4_punch_hole (file, offset, len); goto exit; }
@@ -4698,12 +4702,12 @@ long ext4_fallocate(struct file *file, i goto exit;if (mode &FALLOC_FL_COLLAPSE_RANGE ) { - ret =ext4_collapse_range (inode, offset, len); + ret =ext4_collapse_range (file, offset, len); goto exit; }if (mode &FALLOC_FL_INSERT_RANGE ) { - ret =ext4_insert_range (inode, offset, len); + ret =ext4_insert_range (file, offset, len); goto exit; }
@@ -4739,6 +4743,10 @@ long ext4_fallocate(struct file *file, i/* Wait all existing dio workers, newcomers will block on i_mutex */ inode_dio_wait (inode); + ret =file_modified (file); +if (ret) + goto out; + ret =ext4_alloc_file_blocks (file, lblk, max_blocks, new_size, flags);if (ret) goto out;
@@ -5241,8 +5249,9 @@ out:* This implements the fallocate's collapse range functionality for ext4 * Returns: 0 and non-zero on error. */ -static int ext4_collapse_range (struct inode *inode,loff_t offset,loff_t len) +static int ext4_collapse_range (struct file *file,loff_t offset,loff_t len) { +struct inode *inode =file_inode (file);struct super_block *sb = inode->i_sb;ext4_lblk_t punch_start, punch_stop;handle_t *handle;
@@ -5293,6 +5302,10 @@ static int ext4_collapse_range(struct in/* Wait for existing dio to complete */ inode_dio_wait (inode); + ret =file_modified (file); +if (ret) + goto out_mutex; +/* * Prevent page faults from reinstantiating pages we have released from * page cache.
@@ -5387,8 +5400,9 @@ out_mutex:* by len bytes. * Returns 0 on success, error otherwise. */ -static int ext4_insert_range (struct inode *inode,loff_t offset,loff_t len) +static int ext4_insert_range (struct file *file,loff_t offset,loff_t len) { +struct inode *inode =file_inode (file);struct super_block *sb = inode->i_sb;handle_t *handle;struct ext4_ext_path *path;
@@ -5444,6 +5458,10 @@ static int ext4_insert_range(struct inod/* Wait for existing dio to complete */ inode_dio_wait (inode); + ret =file_modified (file); +if (ret) + goto out_mutex; +/* * Prevent page faults from reinstantiating pages we have released from * page cache.
fs/ext4/inode.c +6 -1
@@ -4028,8 +4028,9 @@ int ext4_break_layouts(struct inode *ino* Returns: 0 on success or negative on failure */ -int ext4_punch_hole (struct inode *inode,loff_t offset,loff_t length) +int ext4_punch_hole (struct file *file,loff_t offset,loff_t length) { +struct inode *inode =file_inode (file);struct super_block *sb = inode->i_sb;ext4_lblk_t first_block, stop_block;struct address_space *mapping = inode->i_mapping;
@@ -4091,6 +4092,10 @@ int ext4_punch_hole(struct inode *inode,/* Wait all existing dio workers, newcomers will block on i_mutex */ inode_dio_wait (inode); + ret =file_modified (file); +if (ret) + goto out_mutex; +/* * Prevent page faults from reinstantiating pages we have released from * page cache.
Greg Kroah-Hartman
maintainerPATCH 75/86 ext4: fix symlink file size not match to file content
In reply to Greg Kroah-HartmanFrom: Ye Bin <[email protected]>
commit a2b0b205d125f27cddfb4f7280e39affdaf46686 upstream.
We got issue as follows:
[home]# fsck.ext4 -fn ram0yb
e2fsck 1.45.6 (20-Mar-2020)
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
Symlink /p3/d14/d1a/l3d (inode #3494) is invalid.
Clear? no
Entry 'l3d' in /p3/d14/d1a (3383) has an incorrect filetype (was 7, should be 0). Fix? no
As the symlink file size does not match the file content. If the writeback of the symlink data block failed, ext4_finish_bio() handles the end of IO. However this function fails to mark the buffer with BH_write_io_error and so when unmount does journal checkpoint it cannot detect the writeback error and will cleanup the journal. Thus we've lost the correct data in the journal area. To solve this issue, mark the buffer as BH_write_io_error in ext4_finish_bio().
--- fs/ext4/page-io.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/ext4/page-io.c +3 -1
@@ -137,8 +137,10 @@ static void ext4_finish_bio(struct bio *continue ; }clear_buffer_async_write (bh); -if (bio->bi_status) +if (bio->bi_status) { +set_buffer_write_io_error (bh);buffer_io_error (bh); + } }while ((bh = bh->b_this_page) != head);spin_unlock_irqrestore (&head->b_uptodate_lock, flags);if (!under_io) {
Greg Kroah-Hartman
maintainerPATCH 76/86 ext4: fix use-after-free in ext4_search_dir
In reply to Greg Kroah-HartmanFrom: Ye Bin <[email protected]>
commit c186f0887fe7061a35cebef024550ec33ef8fbd8 upstream.
We got issue as follows:
EXT4-fs (loop0): mounted filesystem without journal. Opts: ,errors=continue
==================================================================
BUG: KASAN: use-after-free in ext4_search_dir fs/ext4/namei.c:1394 [inline]
BUG: KASAN: use-after-free in search_dirblock fs/ext4/namei.c:1199 [inline]
BUG: KASAN: use-after-free in __ext4_find_entry+0xdca/0x1210 fs/ext4/namei.c:1553
Read of size 1 at addr ffff8881317c3005 by task syz-executor117/2331
CPU: 1 PID: 2331 Comm: syz-executor117 Not tainted 5.10.0+ #1
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.14.0-0-g155821a1990b-prebuilt.qemu.org 04/01/2014
Call Trace:
__dump_stack lib/dump_stack.c:83 [inline]
dump_stack+0x144/0x187 lib/dump_stack.c:124
print_address_description+0x7d/0x630 mm/kasan/report.c:387
__kasan_report+0x132/0x190 mm/kasan/report.c:547
kasan_report+0x47/0x60 mm/kasan/report.c:564
ext4_search_dir fs/ext4/namei.c:1394 [inline]
search_dirblock fs/ext4/namei.c:1199 [inline]
__ext4_find_entry+0xdca/0x1210 fs/ext4/namei.c:1553
ext4_lookup_entry fs/ext4/namei.c:1622 [inline]
ext4_lookup+0xb8/0x3a0 fs/ext4/namei.c:1690
__lookup_hash+0xc5/0x190 fs/namei.c:1451
do_rmdir+0x19e/0x310 fs/namei.c:3760
do_syscall_64+0x33/0x40 arch/x86/entry/common.c:46
entry_SYSCALL_64_after_hwframe+0x44/0xa9
RIP: 0033:0x445e59
Code: 4d c7 fb ff c3 66 2e 0f 1f 84 00 00 00 00 00 66 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 1b c7 fb ff c3 66 2e 0f 1f 84 00 00 00 00
RSP: 002b:00007fff2277fac8 EFLAGS: 00000246 ORIG_RAX: 0000000000000054
RAX: ffffffffffffffda RBX: 0000000000400280 RCX: 0000000000445e59
RDX: 0000000000000000 RSI: 0000000000000000 RDI: 00000000200000c0
RBP: 0000000000000000 R08: 0000000000000000 R09: 0000000000000002
R10: 00007fff2277f990 R11: 0000000000000246 R12: 0000000000000000
R13: 431bde82d7b634db R14: 0000000000000000 R15: 0000000000000000
The buggy address belongs to the page:
page:0000000048cd3304 refcount:0 mapcount:0 mapping:0000000000000000 index:0x1 pfn:0x1317c3
flags: 0x200000000000000()
raw: 0200000000000000 ffffea0004526588 ffffea0004528088 0000000000000000
raw: 0000000000000001 0000000000000000 00000000ffffffff 0000000000000000
page dumped because: kasan: bad access detected
Memory state around the buggy address:
ffff8881317c2f00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
ffff8881317c2f80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
>ffff8881317c3000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
^
ffff8881317c3080: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
ffff8881317c3100: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
==================================================================ext4_search_dir:
...
de = (struct ext4_dir_entry_2 *)search_buf;
dlimit = search_buf + buf_size;
while ((char *) de < dlimit) {
...
if ((char *) de + de->name_len <= dlimit &&
ext4_match(dir, fname, de)) {
...
}
...
de_len = ext4_rec_len_from_disk(de->rec_len, dir->i_sb->s_blocksize);
if (de_len <= 0)
return -1;
offset += de_len;
de = (struct ext4_dir_entry_2 *) ((char *) de + de_len);}
Assume:
de=0xffff8881317c2fff
dlimit=0x0xffff8881317c3000
If read 'de->name_len' which address is 0xffff8881317c3005, obviously is out of range, then will trigger use-after-free.
To solve this issue, 'dlimit' must reserve 8 bytes, as we will read 'de->name_len' to judge if '(char *) de + de->name_len' out of range.
--- fs/ext4/ext4.h | 4 ++++ fs/ext4/namei.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)
fs/ext4/ext4.h +4 -0
@@ -2159,6 +2159,10 @@ static inline int ext4_forced_shutdown(s* Structure of a directory entry */ #define EXT4_NAME_LEN 255 +/* +* Base length of the ext4 directory entry excluding the name length +*/ +#define EXT4_BASE_DIR_LEN (sizeof(struct ext4_dir_entry_2) - EXT4_NAME_LEN)struct ext4_dir_entry {__le32 inode;/* Inode number */
fs/ext4/namei.c +2 -2
@@ -1388,10 +1388,10 @@ int ext4_search_dir(struct buffer_head * de = (struct ext4_dir_entry_2 *)search_buf; dlimit = search_buf + buf_size; -while ((char *) de < dlimit) { +while ((char *) de < dlimit -EXT4_BASE_DIR_LEN ) {/* this code is executed quadratically often */ /* do minimal checking `by hand' */ -if ((char *) de + de->name_len <= dlimit && +if (de->name + de->name_len <= dlimit &&ext4_match (dir, fname, de)) {/* found a match - just to be sure, do * a full check */
Greg Kroah-Hartman
maintainerPATCH 77/86 ext4: limit length to bitmap_maxbytes - blocksize in punch_hole
In reply to Greg Kroah-HartmanFrom: Tadeusz Struk <[email protected]>
commit 2da376228a2427501feb9d15815a45dbdbdd753e upstream.
Syzbot found an issue [1] in ext4_fallocate().
The C reproducer [2] calls fallocate(), passing size 0xffeffeff000ul, and offset 0x1000000ul, which, when added together exceed the bitmap_maxbytes for the inode. This triggers a BUG in ext4_ind_remove_space(). According to the comments in this function the 'end' parameter needs to be one block after the last block to be removed. In the case when the BUG is triggered it points to the last block. Modify the ext4_punch_hole() function and add constraint that caps the length to satisfy the one before laster block requirement.
--- fs/ext4/inode.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
fs/ext4/inode.c +10 -1
@@ -4034,7 +4034,8 @@ int ext4_punch_hole(struct file *file, lstruct super_block *sb = inode->i_sb;ext4_lblk_t first_block, stop_block;struct address_space *mapping = inode->i_mapping; -loff_t first_block_offset, last_block_offset; +loff_t first_block_offset, last_block_offset, max_length; +struct ext4_sb_info *sbi =EXT4_SB (inode->i_sb);handle_t *handle;unsigned int credits;int ret =0 , ret2 =0 ;
@@ -4077,6 +4078,14 @@ int ext4_punch_hole(struct file *file, l offset; } +/* +* For punch hole the length + offset needs to be within one block +* before last range. Adjust the length if it goes beyond that limit. +*/ + max_length = sbi->s_bitmap_maxbytes - inode->i_sb->s_blocksize; +if (offset + length > max_length) + length = max_length - offset; +if (offset & (sb->s_blocksize -1 ) || (offset + length) & (sb->s_blocksize -1 )) {/*
Greg Kroah-Hartman
maintainerPATCH 78/86 ext4, doc: fix incorrect h_reserved size
In reply to Greg Kroah-HartmanFrom: wangjianjian (C) <[email protected]>
commit 7102ffe4c166ca0f5e35137e9f9de83768c2d27d upstream.
According to document and code, ext4_xattr_header's size is 32 bytes, so h_reserved size should be 3.
--- Documentation/filesystems/ext4/attributes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/filesystems/ext4/attributes.rst +1 -1
@@ -76,7 +76,7 @@ The beginning of an extended attribute b - Checksum of the extended attribute block. * - 0x14 - \_\_u32 - - h\_reserved[2] + - h\_reserved[3] - Zero. The checksum is calculated against the FS UUID, the 64-bit block number
Greg Kroah-Hartman
maintainerPATCH 79/86 ext4: fix overhead calculation to account for the reserved gdt blocks
In reply to Greg Kroah-HartmanFrom: Theodore Ts'o <[email protected]>
commit 10b01ee92df52c8d7200afead4d5e5f55a5c58b1 upstream.
The kernel calculation was underestimating the overhead by not taking into account the reserved gdt blocks. With this change, the overhead calculated by the kernel matches the overhead calculation in mke2fs.
--- fs/ext4/super.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/ext4/super.c +3 -1
@@ -3870,9 +3870,11 @@ static int count_overhead(struct super_bext4_fsblk_t first_block, last_block, b;ext4_group_t i, ngroups =ext4_get_groups_count (sb);int s, j, count =0 ; +int has_super =ext4_bg_has_super (sb, grp);if (!ext4_has_feature_bigalloc (sb)) -return (ext4_bg_has_super (sb, grp) +ext4_bg_num_gdb (sb, grp) + +return (has_super +ext4_bg_num_gdb (sb, grp) + + (has_super ?le16_to_cpu (sbi->s_es->s_reserved_gdt_blocks) :0 ) + sbi->s_itb_per_group +2 ); first_block = le32_to_cpu(sbi->s_es->s_first_data_block) +
Greg Kroah-Hartman
maintainerPATCH 80/86 ext4: force overhead calculation if the s_overhead_cluster makes no sense
In reply to Greg Kroah-HartmanFrom: Theodore Ts'o <[email protected]>
commit 85d825dbf4899a69407338bae462a59aa9a37326 upstream.
If the file system does not use bigalloc, calculating the overhead is cheap, so force the recalculation of the overhead so we don't have to trust the precalculated overhead in the superblock.
--- fs/ext4/super.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
fs/ext4/super.c +12 -3
@@ -4933,9 +4933,18 @@ no_journal:* Get the # of file system overhead blocks from the * superblock if present. */ -if (es->s_overhead_clusters) - sbi->s_overhead =le32_to_cpu (es->s_overhead_clusters); -else { + sbi->s_overhead =le32_to_cpu (es->s_overhead_clusters); +/* ignore the precalculated value if it is ridiculous */ +if (sbi->s_overhead >ext4_blocks_count (es)) + sbi->s_overhead =0 ; +/* +* If the bigalloc feature is not enabled recalculating the +* overhead doesn't take long, so we might as well just redo +* it to make sure we are using the correct value. +*/ +if (!ext4_has_feature_bigalloc (sb)) + sbi->s_overhead =0 ; +if (sbi->s_overhead ==0 ) { err =ext4_calculate_overhead (sb);if (err) goto failed_mount_wq;
Greg Kroah-Hartman
maintainerPATCH 81/86 can: isotp: stop timeout monitoring when no first frame was sent
In reply to Greg Kroah-HartmanFrom: Oliver Hartkopp <[email protected]>
commit d73497081710c876c3c61444445512989e102152 upstream.
The first attempt to fix a the 'impossible' WARN_ON_ONCE(1) in isotp_tx_timer_handler() focussed on the identical CAN IDs created by the syzbot reproducer and lead to upstream fix/commit 3ea566422cbd ("can: isotp: sanitize CAN ID checks in isotp_bind()"). But this did not catch the root cause of the wrong tx.state in the tx_timer handler.
In the isotp 'first frame' case a timeout monitoring needs to be started before the 'first frame' is send. But when this sending failed the timeout monitoring for this specific frame has to be disabled too.
Otherwise the tx_timer is fired with the 'warn me' tx.state of ISOTP_IDLE.
--- net/can/isotp.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
net/can/isotp.c +9 -1
@@ -864,6 +864,7 @@ static int isotp_sendmsg(struct socket *struct canfd_frame *cf;int ae = (so->opt.flags &CAN_ISOTP_EXTEND_ADDR ) ?1 :0 ;int wait_tx_done = (so->opt.flags &CAN_ISOTP_WAIT_TX_DONE ) ?1 :0 ; +s64 hrtimer_sec =0 ;int off;int err;
@@ -962,7 +963,9 @@ static int isotp_sendmsg(struct socket *isotp_create_fframe (cf, so, ae);/* start timeout for FC */ -hrtimer_start (&so->txtimer,ktime_set (1 ,0 ),HRTIMER_MODE_REL_SOFT ); + hrtimer_sec =1 ; +hrtimer_start (&so->txtimer,ktime_set (hrtimer_sec,0 ), +HRTIMER_MODE_REL_SOFT ); }/* send the first or only CAN frame */
@@ -975,6 +978,11 @@ static int isotp_sendmsg(struct socket *if (err) {pr_notice_once ("can-isotp: %s: can_send_ret %d\n" , __func__, err); + +/* no transmission -> no timeout monitoring */ +if (hrtimer_sec) +hrtimer_cancel (&so->txtimer); + goto err_out_drop; }
Greg Kroah-Hartman
maintainerPATCH 82/86 jbd2: fix a potential race while discarding reserved buffers after an abort
In reply to Greg Kroah-HartmanFrom: Ye Bin <[email protected]>
commit 23e3d7f7061f8682c751c46512718f47580ad8f0 upstream.
we got issue as follows:
[ 72.796117] EXT4-fs error (device sda): ext4_journal_check_start:83: comm fallocate: Detected aborted journal [ 72.826847] EXT4-fs (sda): Remounting filesystem read-only fallocate: fallocate failed: Read-only file system [ 74.791830] jbd2_journal_commit_transaction: jh=0xffff9cfefe725d90 bh=0x0000000000000000 end delay [ 74.793597] ------------[ cut here ]------------ [ 74.794203] kernel BUG at fs/jbd2/transaction.c:2063! [ 74.794886] invalid opcode: 0000 [#1] PREEMPT SMP PTI [ 74.795533] CPU: 4 PID: 2260 Comm: jbd2/sda-8 Not tainted 5.17.0-rc8-next-20220315-dirty #150 [ 74.798327] RIP: 0010:__jbd2_journal_unfile_buffer+0x3e/0x60 [ 74.801971] RSP: 0018:ffffa828c24a3cb8 EFLAGS: 00010202 [ 74.802694] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 [ 74.803601] RDX: 0000000000000001 RSI: ffff9cfefe725d90 RDI: ffff9cfefe725d90 [ 74.804554] RBP: ffff9cfefe725d90 R08: 0000000000000000 R09: ffffa828c24a3b20 [ 74.805471] R10: 0000000000000001 R11: 0000000000000001 R12: ffff9cfefe725d90 [ 74.806385] R13: ffff9cfefe725d98 R14: 0000000000000000 R15: ffff9cfe833a4d00 [ 74.807301] FS: 0000000000000000(0000) GS:ffff9d01afb00000(0000) knlGS:0000000000000000 [ 74.808338] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 74.809084] CR2: 00007f2b81bf4000 CR3: 0000000100056000 CR4: 00000000000006e0 [ 74.810047] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 74.810981] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 74.811897] Call Trace: [ 74.812241] <TASK> [ 74.812566] __jbd2_journal_refile_buffer+0x12f/0x180 [ 74.813246] jbd2_journal_refile_buffer+0x4c/0xa0 [ 74.813869] jbd2_journal_commit_transaction.cold+0xa1/0x148 [ 74.817550] kjournald2+0xf8/0x3e0 [ 74.819056] kthread+0x153/0x1c0 [ 74.819963] ret_from_fork+0x22/0x30
Above issue may happen as follows:
write truncate kjournald2generic_perform_write
ext4_write_begin
ext4_walk_page_buffers
do_journal_get_write_access ->add BJ_Reserved list
ext4_journalled_write_end
ext4_walk_page_buffers
write_end_fn
ext4_handle_dirty_metadata
***************JBD2 ABORT**************
jbd2_journal_dirty_metadata
-> return -EROFS, jh in reserved_list
jbd2_journal_commit_transaction
while (commit_transaction->t_reserved_list)
jh = commit_transaction->t_reserved_list;
truncate_pagecache_range
do_invalidatepage
ext4_journalled_invalidatepage
jbd2_journal_invalidatepage
journal_unmap_buffer
__dispose_buffer
__jbd2_journal_unfile_buffer
jbd2_journal_put_journal_head ->put last ref_count
__journal_remove_journal_head
bh->b_private = NULL;
jh->b_bh = NULL;
jbd2_journal_refile_buffer(journal, jh);
bh = jh2bh(jh);
->bh is NULL, later will trigger null-ptr-deref
journal_free_journal_head(jh);After commit 96f1e0974575, we no longer hold the j_state_lock while iterating over the list of reserved handles in jbd2_journal_commit_transaction(). This potentially allows the journal_head to be freed by journal_unmap_buffer while the commit codepath is also trying to free the BJ_Reserved buffers. Keeping j_state_lock held while trying extends hold time of the lock minimally, and solves this issue.
--- fs/jbd2/commit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/jbd2/commit.c +3 -1
@@ -501,7 +501,6 @@ void jbd2_journal_commit_transaction(jou }spin_unlock (&commit_transaction->t_handle_lock); commit_transaction->t_state =T_SWITCH ; -write_unlock (&journal->j_state_lock);J_ASSERT (atomic_read (&commit_transaction->t_outstanding_credits) <= journal->j_max_transaction_buffers);
@@ -521,6 +520,8 @@ void jbd2_journal_commit_transaction(jou* has reserved. This is consistent with the existing behaviour * that multiple jbd2_journal_get_write_access() calls to the same * buffer are perfectly permissible. +* We use journal->j_state_lock here to serialize processing of +* t_reserved_list with eviction of buffers from journal_unmap_buffer(). */ while (commit_transaction->t_reserved_list) { jh = commit_transaction->t_reserved_list;
@@ -540,6 +541,7 @@ void jbd2_journal_commit_transaction(joujbd2_journal_refile_buffer (journal, jh); } +write_unlock (&journal->j_state_lock);/* * Now try to drop any written-back buffers from the journal's * checkpoint lists. We do this *before* commit because it potentially
Greg Kroah-Hartman
maintainerPATCH 83/86 spi: atmel-quadspi: Fix the buswidth adjustment between spi-mem and controller
In reply to Greg Kroah-HartmanFrom: Tudor Ambarus <[email protected]>
commit 8c235cc25087495c4288d94f547e9d3061004991 upstream.
Use the spi_mem_default_supports_op() core helper in order to take into account the buswidth specified by the user in device tree.
--- drivers/spi/atmel-quadspi.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/spi/atmel-quadspi.c +3 -0
@@ -277,6 +277,9 @@ static int atmel_qspi_find_mode(const ststatic bool atmel_qspi_supports_op (struct spi_mem *mem,const struct spi_mem_op *op) { +if (!spi_mem_default_supports_op (mem, op)) +return false; +if (atmel_qspi_find_mode (op) <0 )return false;
Greg Kroah-Hartman
maintainerPATCH 84/86 staging: ion: Prevent incorrect reference counting behavour
In reply to Greg Kroah-HartmanSupply additional check in order to prevent unexpected results.
--- drivers/staging/android/ion/ion.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/staging/android/ion/ion.c +3 -0
@@ -114,6 +114,9 @@ static void *ion_buffer_kmap_get(structvoid *vaddr;if (buffer->kmap_cnt) { +if (buffer->kmap_cnt ==INT_MAX ) +return ERR_PTR (-EOVERFLOW ); + buffer->kmap_cnt++;return buffer->vaddr; }
Greg Kroah-Hartman
maintainerPATCH 85/86 block/compat_ioctl: fix range check in BLKGETSIZE
In reply to Greg Kroah-HartmanFrom: Khazhismel Kumykov <[email protected]>
commit ccf16413e520164eb718cf8b22a30438da80ff23 upstream.
kernel ulong and compat_ulong_t may not be same width. Use type directly to eliminate mismatches.
This would result in truncation rather than EFBIG for 32bit mode for large disks.
--- block/ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/ioctl.c +1 -1
@@ -679,7 +679,7 @@ long compat_blkdev_ioctl(struct file *fi (bdev->bd_bdi->ra_pages * PAGE_SIZE) / 512);case BLKGETSIZE : size =i_size_read (bdev->bd_inode); -if ((size >>9 ) > ~0UL ) +if ((size >>9 ) > ~(compat_ulong_t )0 )return -EFBIG ;return compat_put_ulong (argp, size >>9 );
Greg Kroah-Hartman
maintainerPATCH 86/86 Revert "net: micrel: fix KS8851_MLL Kconfig"
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
This reverts commit 1ff5359afa5ec0dd09fe76183dc4fa24b50e4125 which is commit c3efcedd272aa6dd5929e20cf902a52ddaa1197a upstream.
The upstream commit c3efcedd272a ("net: micrel: fix KS8851_MLL Kconfig") depends on e5f31552674e ("ethernet: fix PTP_1588_CLOCK dependencies") which is not part of Linux 5.10.y . Revert the aforementioned commit to prevent breakage in 5.10.y .
--- drivers/net/ethernet/micrel/Kconfig | 1 - 1 file changed, 1 deletion(-)
drivers/net/ethernet/micrel/Kconfig +0 -1
@@ -37,7 +37,6 @@ config KS8851 config KS8851_MLL tristate "Micrel KS8851 MLL" depends on HAS_IOMEM - depends on PTP_1588_CLOCK_OPTIONAL select MII select CRC32 select EEPROM_93CX6
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.113 release. There are 86 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 Thu, 28 Apr 2022 08:17:22 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.113-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v5.10:
10 builds: 10 pass, 0 fail
28 boots: 28 pass, 0 fail
75 tests: 75 pass, 0 failLinux version: 5.10.113-rc1-g889ce55360e7
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra194-p3509-0000+p3668-0000,
tegra20-ventana, tegra210-p2371-2180,
tegra210-p3450-0000, tegra30-cardhu-a04Jon
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.113 release. There are 86 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 Thu, 28 Apr 2022 08:17:22 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.113-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels:
Signature · 1 line
Florian
Hi!
Quoted 7 lines
This is the start of the stable review cycle for the 5.10.113 release. There are 86 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 Thu, 28 Apr 2022 08:17:22 +0000. Anything received after that time might be too late.
CIP testing did not find any problems here:
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/tree/linux-5.10.y
Best regards,
Pavel
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.113 release. There are 86 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 Thu, 28 Apr 2022 08:17:22 +0000. Anything received after that time might be too late.
Build results:
total: 161 pass: 161 fail: 0 Qemu test results: total: 477 pass: 477 fail: 0
Guenter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.113 release. There are 86 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 Thu, 28 Apr 2022 08:17:22 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.113-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.113 release. There are 86 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 Thu, 28 Apr 2022 08:17:22 +0000. Anything received after that time might be too late.
5.10.113-rc1 compiled and booted with no errors or regressions on my x86_64 test system.
Cheers,
Slade
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.113 release. There are 86 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 Thu, 28 Apr 2022 08:17:22 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.113-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
## Build
* kernel: 5.10.113-rc1
* git: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
* git branch: linux-5.10.y
* git commit: 889ce55360e75088d2b85d71e5119d5e3d45c90c
* git describe: v5.10.112-87-g889ce55360e7
* test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.10.y/build/v5.10.112-87-g889ce55360e7
## Test Regressions (compared to v5.10.111-106-gd5c581fe77b5) No test regressions found.
## Metric Regressions (compared to v5.10.111-106-gd5c581fe77b5) No metric regressions found.
## Test Fixes (compared to v5.10.111-106-gd5c581fe77b5) No test fixes found.
## Metric Fixes (compared to v5.10.111-106-gd5c581fe77b5) No metric fixes found.
## Test result summary
total: 99479, pass: 83784, fail: 947, skip: 13672, xfail: 1076
## Build Summary
* arc: 10 total, 10 passed, 0 failed
* arm: 291 total, 291 passed, 0 failed
* arm64: 41 total, 41 passed, 0 failed
* dragonboard-410c: 1 total, 1 passed, 0 failed
* hi6220-hikey: 1 total, 1 passed, 0 failed
* i386: 40 total, 40 passed, 0 failed
* juno-r2: 1 total, 1 passed, 0 failed
* mips: 37 total, 37 passed, 0 failed
* parisc: 12 total, 12 passed, 0 failed
* powerpc: 60 total, 51 passed, 9 failed
* riscv: 27 total, 27 passed, 0 failed
* s390: 21 total, 21 passed, 0 failed
* sh: 24 total, 24 passed, 0 failed
* sparc: 12 total, 12 passed, 0 failed
* x15: 1 total, 1 passed, 0 failed
* x86: 1 total, 1 passed, 0 failed
* x86_64: 41 total, 41 passed, 0 failed
## Test suites summary
* fwts
* igt-gpu-tools
* kselftest-android
* kselftest-arm64
* kselftest-bpf
* kselftest-breakpoints
* kselftest-capabilities
* kselftest-cgroup
* kselftest-clone3
* kselftest-core
* kselftest-cpu-hotplug
* kselftest-cpufreq
* kselftest-drivers
* kselftest-efivarfs
* kselftest-filesystems
* kselftest-firmware
* kselftest-fpu
* kselftest-futex
* kselftest-gpio
* kselftest-intel_pstate
* kselftest-ipc
* kselftest-ir
* kselftest-kcmp
* kselftest-kexec
* kselftest-kvm
* kselftest-lib
* kselftest-livepatch
* kselftest-membarrier
* kselftest-memfd
* kselftest-memory-hotplug
* kselftest-mincore
* kselftest-mount
* kselftest-mqueue
* kselftest-net
* kselftest-netfilter
* kselftest-nsfs
* kselftest-openat2
* kselftest-pid_namespace
* kselftest-pidfd
* kselftest-proc
* kselftest-pstore
* kselftest-ptrace
* kselftest-rseq
* kselftest-rtc
* kselftest-seccomp
* kselftest-sigaltstack
* kselftest-size
* kselftest-splice
* kselftest-static_keys
* kselftest-sync
* kselftest-sysctl
* kselftest-tc-testing
* kselftest-timens
* kselftest-timers
* kselftest-tmpfs
* kselftest-tpm2
* kselftest-user
* kselftest-vm
* kselftest-x86
* kselftest-zram
* kunit
* kvm-unit-tests
* libgpiod
* libhugetlbfs
* linux-log-parser
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-controllers-tests
* ltp-cpuhotplug-tests
* ltp-crypto-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-open-posix-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* ltp-tracing-tests
* network-basic-tests
* packetdrill
* perf
* perf/Zstd-perf.data-compression
* rcutorture
* ssuite
* v4l2-compliance
* vdso
--
Linaro LKFT
https://lkft.linaro.org
Hi Greg,
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.113 release. There are 86 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 Thu, 28 Apr 2022 08:17:22 +0000. Anything received after that time might be too late.
Build test:
mips (gcc version 11.2.1 20220408): 63 configs -> no failure arm (gcc version 11.2.1 20220408): 105 configs -> no new failure arm64 (gcc version 11.2.1 20220408): 3 configs -> no failure x86_64 (gcc version 11.2.1 20220408): 4 configs -> no failure
Boot test:x86_64: Booted on my test laptop. No regression.x86_64: Booted on qemu. No regression. [1]
arm64: Booted on rpi4b (4GB model). No regression. [2]
[1]. https://openqa.qa.codethink.co.uk/tests/1070
[2]. https://openqa.qa.codethink.co.uk/tests/1072
--
Regards
Sudip