5.15.3-rc1 review
Subsystems (15)
Greg Kroah-Hartman
maintainercover 5.15.3-rc1 review
This is the start of the stable review cycle for the 5.15.3 release. There are 917 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 Wed, 17 Nov 2021 16:52:23 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.3-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.15.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.15.3-rc1
Mario Limonciello <[email protected]>
drm/amd/display: Look at firmware version to determine using dmub on dcn21
Trond Myklebust <[email protected]>
SUNRPC: Partial revert of commit 6f9f17287e78
Pali Rohár <[email protected]>
PCI: aardvark: Fix PCIe Max Payload Size setting
Pali Rohár <[email protected]>
PCI: Add PCI_EXP_DEVCTL_PAYLOAD_* macros
Jernej Skrabec <[email protected]>
drm/sun4i: Fix macros in sun8i_csc.h
Xiaoming Ni <[email protected]>
powerpc/85xx: fix timebase sync issue when CONFIG_HOTPLUG_CPU=n
Nathan Lynch <[email protected]>
powerpc/pseries/mobility: ignore ibm, platform-facilities updates
Nicholas Piggin <[email protected]>
powerpc/64s/interrupt: Fix check_return_regs_valid() false positive
Russell Currey <[email protected]>
powerpc/security: Use a mutex for interrupt exit code patching
Vasant Hegde <[email protected]>
powerpc/powernv/prd: Unregister OPAL_MSG_PRD2 notifier during module unload
Nicholas Piggin <[email protected]>
powerpc/32e: Ignore ESR in instruction storage interrupt handler
Hari Bathini <[email protected]>
powerpc/bpf: Fix write protecting JIT code
Gustavo A. R. Silva <[email protected]>
powerpc/vas: Fix potential NULL pointer dereference
Miquel Raynal <[email protected]>
mtd: rawnand: au1550nd: Keep the driver compatible with on-die ECC engines
Miquel Raynal <[email protected]>
mtd: rawnand: plat_nand: Keep the driver compatible with on-die ECC engines
Miquel Raynal <[email protected]>
mtd: rawnand: orion: Keep the driver compatible with on-die ECC engines
Miquel Raynal <[email protected]>
mtd: rawnand: pasemi: Keep the driver compatible with on-die ECC engines
Miquel Raynal <[email protected]>
mtd: rawnand: gpio: Keep the driver compatible with on-die ECC engines
Miquel Raynal <[email protected]>
mtd: rawnand: mpc5121: Keep the driver compatible with on-die ECC engines
Miquel Raynal <[email protected]>
mtd: rawnand: xway: Keep the driver compatible with on-die ECC engines
Miquel Raynal <[email protected]>
mtd: rawnand: ams-delta: Keep the driver compatible with on-die ECC engines
Miquel Raynal <[email protected]>
mtd: rawnand: fsmc: Fix use of SM ORDER
Dong Aisheng <[email protected]>
remoteproc: imx_rproc: Fix rsc-table name
Dong Aisheng <[email protected]>
remoteproc: imx_rproc: Fix ignoring mapping vdev regions
Dong Aisheng <[email protected]>
remoteproc: Fix the wrong default value of is_iomem
Peng Fan <[email protected]>
remoteproc: elf_loader: Fix loading segment when is_iomem true
Halil Pasic <[email protected]>
s390/cio: make ccw_device_dma_* more robust
Harald Freudenberger <[email protected]>
s390/ap: Fix hanging ioctl caused by orphaned replies
Sven Schnelle <[email protected]>
s390/tape: fix timer initialization in tape_std_assign()
Vineeth Vijayan <[email protected]>
s390/cio: check the subchannel validity for dev_busid
Thomas Richter <[email protected]>
s390/cpumf: cpum_cf PMU displays invalid value after hotplug remove
Rafael J. Wysocki <[email protected]>
PM: sleep: Avoid calling put_device() under dpm_list_mtx
Coly Li <[email protected]>
bcache: Revert "bcache: use bvec_virt"
Coly Li <[email protected]>
bcache: fix use-after-free problem in bcache_device_free()
Marek Vasut <[email protected]>
video: backlight: Drop maximum brightness override for brightness zero
Jack Andersen <[email protected]>
mfd: dln2: Add cell for initializing DLN2 ADC
Rongwei Wang <[email protected]>
mm, thp: fix incorrect unmap behavior for private pages
Rongwei Wang <[email protected]>
mm, thp: lock filemap when truncating page cache
Michal Hocko <[email protected]>
mm, oom: do not trigger out_of_memory from the #PF
Vasily Averin <[email protected]>
mm, oom: pagefault_out_of_memory: don't force global OOM for dying tasks
Vasily Averin <[email protected]>
memcg: prohibit unconditional exceeding the limit of dying tasks
Matthew Wilcox (Oracle) <[email protected]>
mm/filemap.c: remove bogus VM_BUG_ON
Dominique Martinet <[email protected]>
9p/net: fix missing error check in p9_check_errors
Daniel Borkmann <[email protected]>
net, neigh: Enable state migration between NUD_PERMANENT and NTF_USE
Anatolij Gustschin <[email protected]>
dmaengine: bestcomm: fix system boot lockups
Kishon Vijay Abraham I <[email protected]>
dmaengine: ti: k3-udma: Set r/tchan or rflow to NULL if request fail
Kishon Vijay Abraham I <[email protected]>
dmaengine: ti: k3-udma: Set bchan to NULL if a channel request fail
Namjae Jeon <[email protected]>
ksmbd: don't need 8byte alignment for request length in ksmbd_check_message
Marios Makassikis <[email protected]>
ksmbd: Fix buffer length check in fsctl_validate_negotiate_info()
Shin'ichiro Kawasaki <[email protected]>
block: Hold invalidate_lock in BLKRESETZONE ioctl
Shin'ichiro Kawasaki <[email protected]>
block: Hold invalidate_lock in BLKZEROOUT ioctl
Shin'ichiro Kawasaki <[email protected]>
block: Hold invalidate_lock in BLKDISCARD ioctl
Matthew Brost <[email protected]>
drm/i915/guc: Fix blocked context accounting
Gao Xiang <[email protected]>
erofs: fix unsafe pagevec reuse of hooked pclusters
Xiubo Li <[email protected]>
ceph: fix mdsmap decode when there are MDS's beyond max_mds
Dongliang Mu <[email protected]>
f2fs: fix UAF in f2fs_available_free_memory
Daeho Jeong <[email protected]>
f2fs: include non-compressed blocks in compr_written_block
Jaegeuk Kim <[email protected]>
f2fs: should use GFP_NOFS for directory inodes
Guo Ren <[email protected]>
irqchip/sifive-plic: Fixup EOI failed when masked
Michael Pratt <[email protected]>
posix-cpu-timers: Clear task::posix_cputimers_work in copy_process()
Paolo Bonzini <[email protected]>
KVM: x86: move guest_pv_has out of user_access section
Thomas Gleixner <[email protected]>
PCI/MSI: Destroy sysfs before freeing entries
Thomas Gleixner <[email protected]>
PCI/MSI: Move non-mask check back into low level accessors
Dave Jones <[email protected]>
x86/mce: Add errata workaround for Skylake SKX37
Maciej W. Rozycki <[email protected]>
MIPS: Fix assembly error from MIPSr2 code used within MIPS_ISA_ARCH_LEVEL
Masahiro Yamada <[email protected]>
MIPS: fix *-pkg builds for loongson2ef platform
Masahiro Yamada <[email protected]>
MIPS: fix duplicated slashes for Platform file path
John David Anglin <[email protected]>
parisc: Flush kernel data mapping in set_pte_at() when installing pte for user page
Helge Deller <[email protected]>
parisc: Fix backtrace to always include init funtion names
Arnd Bergmann <[email protected]>
ARM: 9156/1: drop cc-option fallbacks for architecture selection
Michał Mirosław <[email protected]>
ARM: 9155/1: fix early early_iounmap()
Steve French <[email protected]>
smb3: do not error on fsync when readonly
Linus Torvalds <[email protected]>
thermal: int340x: fix build on 32-bit targets
Willem de Bruijn <[email protected]>
selftests/net: udpgso_bench_rx: fix port argument
Rahul Lakkireddy <[email protected]>
cxgb4: fix eeprom len when diagnostics not implemented
Dust Li <[email protected]>
net/smc: fix sk_refcnt underflow on linkdown and fallback
Eiichi Tsukata <[email protected]>
vsock: prevent unnecessary refcnt inc for nonblocking connect
Marek Behún <[email protected]>
net: marvell: mvpp2: Fix wrong SerDes reconfiguration order
Christophe JAILLET <[email protected]>
net: ethernet: ti: cpsw_ale: Fix access to un-initialized memory
Vladimir Oltean <[email protected]>
net: stmmac: allow a tc-taprio base-time of zero
Guangbin Huang <[email protected]>
net: hns3: allow configure ETS bandwidth of all TCs
Yufeng Mo <[email protected]>
net: hns3: fix kernel crash when unload VF while it is being reset
Jie Wang <[email protected]>
net: hns3: fix pfc packet number incorrect after querying pfc parameters
Jie Wang <[email protected]>
net: hns3: fix ROCE base interrupt vector initialization bug
Eric Dumazet <[email protected]>
net/sched: sch_taprio: fix undefined behavior in ktime_mono_to_any
Marek Behún <[email protected]>
net: dsa: mv88e6xxx: Don't support >1G speeds on 6191X on ports other than 10
Evan Quan <[email protected]>
drm/amdgpu: fix uvd crash on Polaris12 during driver unloading
Muchun Song <[email protected]>
seq_file: fix passing wrong private data
Andrew Halaney <[email protected]>
init: make unknown command line param message clearer
Imre Deak <[email protected]>
drm/i915/fb: Fix rounding error in subsampled plane size calculation
Dan Carpenter <[email protected]>
gve: Fix off by one in gve_tx_timeout()
Arnd Bergmann <[email protected]>
dmaengine: stm32-dma: avoid 64-bit division in stm32_dma_get_max_width
Amelie Delaunay <[email protected]>
dmaengine: stm32-dma: fix burst in case of unaligned memory address
Jussi Maki <[email protected]>
bpf, sockmap: sk_skb data_end access incorrect when src_reg = dst_reg
John Fastabend <[email protected]>
bpf: sockmap, strparser, and tls are reusing qdisc_skb_cb and colliding
John Fastabend <[email protected]>
bpf, sockmap: Fix race in ingress receive verdict with redirect to self
John Fastabend <[email protected]>
bpf, sockmap: Remove unhash handler for BPF sockmap usage
Arnd Bergmann <[email protected]>
arm64: pgtable: make __pte_to_phys/__phys_to_pte_val inline functions
Reiji Watanabe <[email protected]>
arm64: arm64_ftr_reg->name may not be a human-readable string
Christophe JAILLET <[email protected]>
litex_liteeth: Fix a double free in the remove function
Chengfeng Ye <[email protected]>
nfc: pn533: Fix double free when pn533_fill_fragment_skbs() fails
Eric Dumazet <[email protected]>
llc: fix out-of-bound array index in llc_sk_dev_hash()
Ian Rogers <[email protected]>
perf bpf: Add missing free to bpf_event__print_bpf_prog_info()
Dan Carpenter <[email protected]>
zram: off by one in read_block_state()
Miaohe Lin <[email protected]>
mm/zsmalloc.c: close race window between zs_pool_dec_isolated() and zs_unregister_migration()
Marc Kleine-Budde <[email protected]>
can: mcp251xfd: mcp251xfd_chip_start(): fix error handling for mcp251xfd_chip_rx_int_enable()
Vincent Mailhol <[email protected]>
can: etas_es58x: es58x_rx_err_msg(): fix memory leak in error path
Alex Deucher <[email protected]>
drm/amdgpu/powerplay: fix sysfs_emit/sysfs_emit_at handling
Fabio Estevam <[email protected]>
Revert "drm/imx: Annotate dma-fence critical section in commit path"
Arnd Bergmann <[email protected]>
drm: fb_helper: improve CONFIG_FB dependency
Hangbin Liu <[email protected]>
selftests/bpf/xdp_redirect_multi: Limit the tests in netns
Hangbin Liu <[email protected]>
selftests/bpf/xdp_redirect_multi: Give tcpdump a chance to terminate cleanly
Hangbin Liu <[email protected]>
selftests/bpf/xdp_redirect_multi: Use arping to accurate the arp number
Hangbin Liu <[email protected]>
selftests/bpf/xdp_redirect_multi: Put the logs to tmp folder
Mehrdad Arshad Rad <[email protected]>
libbpf: Fix lookup_and_delete_elem_flags error reporting
Rafael J. Wysocki <[email protected]>
ACPI: PM: Fix device wakeup power reference counting error
Kai Song <[email protected]>
mfd: altera-sysmgr: Fix a mistake caused by resource_size conversion
Mark Brown <[email protected]>
mfd: sprd: Add SPI device ID table
Mark Brown <[email protected]>
mfd: cpcap: Add SPI device ID table
Krzysztof Kozlowski <[email protected]>
mfd: core: Add missing of_node_put for loop iteration
Takashi Iwai <[email protected]>
ALSA: memalloc: Catch call with NULL snd_dma_buffer pointer
Arnd Bergmann <[email protected]>
octeontx2-pf: select CONFIG_NET_DEVLINK
Huang Guobin <[email protected]>
bonding: Fix a use-after-free problem when bond_sysfs_slave_add() failed
Jason Gunthorpe <[email protected]>
drm/ttm: remove ttm_bo_vm_insert_huge()
Luis Chamberlain <[email protected]>
block: fix device_add_disk() kobject_create_and_add() error handling
Heiner Kallweit <[email protected]>
net: phy: fix duplex out of sync problem while changing settings
Rafael J. Wysocki <[email protected]>
cpufreq: intel_pstate: Clear HWP desired on suspend/shutdown and offline
Selvin Xavier <[email protected]>
PCI: Do not enable AtomicOps on VFs
Tetsuo Handa <[email protected]>
ataflop: remove ataflop_probe_lock mutex
Luis Chamberlain <[email protected]>
block/ataflop: provide a helper for cleanup up an atari disk
Luis Chamberlain <[email protected]>
block/ataflop: add registration bool before calling del_gendisk()
Luis Chamberlain <[email protected]>
block/ataflop: use the blk_cleanup_disk() helper
Luis Chamberlain <[email protected]>
nvdimm/pmem: cleanup the disk if pmem_release_disk() is yet assigned
Chenyuan Mi <[email protected]>
drm/nouveau/svm: Fix refcount leak bug and missing check against null bug
Andrea Righi <[email protected]>
selftests: net: properly support IPv6 in GSO GRE test
Avri Altman <[email protected]>
scsi: ufs: ufshpb: Properly handle max-single-cmd
Bean Huo <[email protected]>
scsi: ufs: core: Fix NULL pointer dereference
Daejun Park <[email protected]>
scsi: ufs: ufshpb: Use proper power management API
Jackie Liu <[email protected]>
scsi: bsg: Fix errno when scsi_bsg_register_queue() fails
Luis Chamberlain <[email protected]>
nvdimm/btt: do not call del_gendisk() if not needed
Christophe JAILLET <[email protected]>
PCI: j721e: Fix j721e_pcie_probe() error path
Hans de Goede <[email protected]>
ACPI: PMIC: Fix intel_pmic_regs_handler() read accesses
Daniel Thompson <[email protected]>
kdb: Adopt scheduler's task classification
Brett Creeley <[email protected]>
ice: Fix not stopping Tx queues for VFs
Sylwester Dziedziuch <[email protected]>
ice: Fix replacing VF hardware MAC to existing MAC filter
Vladimir Oltean <[email protected]>
net: dsa: felix: fix broken VLAN-tagged PTP under VLAN-aware bridge
Ziyang Xuan <[email protected]>
net: vlan: fix a UAF in vlan_dev_real_dev()
Stafford Horne <[email protected]>
openrisc: fix SMP tlb flush NULL pointer dereference
Jakub Kicinski <[email protected]>
ethtool: fix ethtool msg len calculation for pause stats
Hangbin Liu <[email protected]>
kselftests/net: add missed toeplitz.sh/toeplitz_client.sh to Makefile
Hangbin Liu <[email protected]>
kselftests/net: add missed vrf_strict_mode_test.sh test to Makefile
Hangbin Liu <[email protected]>
kselftests/net: add missed SRv6 tests
Hangbin Liu <[email protected]>
kselftests/net: add missed setup_loopback.sh/setup_veth.sh to Makefile
Hangbin Liu <[email protected]>
kselftests/net: add missed icmp.sh test to Makefile
Maxim Kiselev <[email protected]>
net: davinci_emac: Fix interrupt pacing disable
Beld Zhang <[email protected]>
io-wq: fix max-workers not correctly set on multi-node system
Yu Kuai <[email protected]>
nbd: fix possible overflow for 'first_minor' in nbd_dev_add()
Yu Kuai <[email protected]>
nbd: fix max value for 'first_minor'
YueHaibing <[email protected]>
xen-pciback: Fix return in pm_ctrl_init()
Sander Vanheule <[email protected]>
gpio: realtek-otto: fix GPIO line IRQ offset
Christophe JAILLET <[email protected]>
i2c: xlr: Fix a resource leak in the error handling path of 'xlr_i2c_probe()'
Dave Jiang <[email protected]>
dmaengine: idxd: fix resource leak on dmaengine driver disable
Trond Myklebust <[email protected]>
NFSv4: Fix a regression in nfs_set_open_stateid_locked()
Quinn Tran <[email protected]>
scsi: qla2xxx: edif: Fix EDIF bsg
Quinn Tran <[email protected]>
scsi: qla2xxx: edif: Increase ELS payload
Quinn Tran <[email protected]>
scsi: qla2xxx: edif: Flush stale events and msgs on session down
Quinn Tran <[email protected]>
scsi: qla2xxx: edif: Fix app start delay
Quinn Tran <[email protected]>
scsi: qla2xxx: edif: Fix app start fail
Quinn Tran <[email protected]>
scsi: qla2xxx: Turn off target reset during issue_lip
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix gnl list corruption
Quinn Tran <[email protected]>
scsi: qla2xxx: Relogin during fabric disturbance
Dmitry Bogdanov <[email protected]>
scsi: target: core: Remove from tmr_list during LUN unlink
Jackie Liu <[email protected]>
ar7: fix kernel builds for compiler test
Ahmad Fatoum <[email protected]>
watchdog: f71808e_wdt: fix inaccurate report in WDIOC_GETTIMEOUT
Randy Dunlap <[email protected]>
m68k: set a default value for MEMORY_RESERVE
Eric W. Biederman <[email protected]>
signal/sh: Use force_sig(SIGKILL) instead of do_group_exit(SIGKILL)
Dave Jiang <[email protected]>
dmaengine: idxd: reconfig device after device reset command
Dave Jiang <[email protected]>
dmanegine: idxd: fix resource free ordering on driver removal
Dongliang Mu <[email protected]>
dmaengine: tegra210-adma: fix pm runtime unbalance
Lars-Peter Clausen <[email protected]>
dmaengine: dmaengine_desc_callback_valid(): Check for callback_result
Florian Westphal <[email protected]>
netfilter: nfnetlink_queue: fix OOB when mac header was cleared
Robert-Ionut Alexa <[email protected]>
soc: fsl: dpaa2-console: free buffer before returning from dpaa2_console_read
Geert Uytterhoeven <[email protected]>
auxdisplay: ht16k33: Fix frame buffer device blanking
Geert Uytterhoeven <[email protected]>
auxdisplay: ht16k33: Connect backlight to fbdev
Geert Uytterhoeven <[email protected]>
auxdisplay: img-ascii-lcd: Fix lock-up when displaying empty string
Alexey Gladkov <[email protected]>
Fix user namespace leak
Trond Myklebust <[email protected]>
NFS: Fix an Oops in pnfs_mark_request_commit()
Trond Myklebust <[email protected]>
NFS: Fix up commit deadlocks
Amelie Delaunay <[email protected]>
dmaengine: stm32-dma: fix stm32_dma_get_max_width
Claudiu Beznea <[email protected]>
dmaengine: at_xdmac: fix AT_XDMAC_CC_PERID() macro
Claudiu Beznea <[email protected]>
dmaengine: at_xdmac: call at_xdmac_axi_config() on resume path
Dan Carpenter <[email protected]>
rtc: rv3032: fix error handling in rv3032_clkout_set_rate()
Christophe JAILLET <[email protected]>
remoteproc: Fix a memory leak in an error handling path in 'rproc_handle_vdev()'
Zev Weiss <[email protected]>
mtd: core: don't remove debugfs directory if device is in use
Miquel Raynal <[email protected]>
mtd: rawnand: arasan: Prevent an unsupported configuration
Kunihiko Hayashi <[email protected]>
PCI: uniphier: Serialize INTx masking/unmasking and fix the bit operation
Evgeny Novikov <[email protected]>
mtd: spi-nor: hisi-sfc: Remove excessive clk_disable_unprepare()
Guido Günther <[email protected]>
drm/bridge: nwl-dsi: Add atomic_get_input_bus_fmts
John Keeping <[email protected]>
Input: st1232 - increase "wait ready" timeout
Jia-Ju Bai <[email protected]>
fs: orangefs: fix error return code of orangefs_revalidate_lookup()
Kees Cook <[email protected]>
sparc: Add missing "FORCE" target when using if_changed
Trond Myklebust <[email protected]>
NFS: Fix deadlocks in nfs_scan_commit_list()
YueHaibing <[email protected]>
opp: Fix return in _opp_add_static_v2()
Pali Rohár <[email protected]>
PCI: aardvark: Fix preserving PCI_EXP_RTCTL_CRSSVE flag on emulated bridge
Marek Behún <[email protected]>
PCI: aardvark: Don't spam about PIO Response Status
Alex Xu (Hello71) <[email protected]>
drm/plane-helper: fix uninitialized variable reference
Dmitry Baryshkov <[email protected]>
drm/bridge/lontium-lt9611uxc: fix provided connector suport
Baptiste Lepers <[email protected]>
pnfs/flexfiles: Fix misplaced barrier in nfs4_ff_layout_prepare_ds
Trond Myklebust <[email protected]>
NFS: Fix dentry verifier races
Trond Myklebust <[email protected]>
NFS: Ignore the directory size when marking for revalidation
Trond Myklebust <[email protected]>
NFS: Don't set NFS_INO_DATA_INVAL_DEFER and NFS_INO_INVALID_DATA
Trond Myklebust <[email protected]>
NFS: Default change_attr_type to NFS4_CHANGE_TYPE_IS_UNDEFINED
Kewei Xu <[email protected]>
i2c: mediatek: fixing the incorrect register offset
Mark Brown <[email protected]>
Input: ariel-pwrbutton - add SPI device ID table
Mark Brown <[email protected]>
rtc: mcp795: Add SPI ID table
Dave Jiang <[email protected]>
dmaengine: idxd: move out percpu_ref_exit() to ensure it's outside submission
Heiner Kallweit <[email protected]>
i2c: i801: Use PCI bus rescan mutex to protect P2SB access
Dong Aisheng <[email protected]>
remoteproc: imx_rproc: Fix TCM io memory type
Mark Brown <[email protected]>
rtc: pcf2123: Add SPI ID table
Mark Brown <[email protected]>
rtc: ds1390: Add SPI ID table
Mark Brown <[email protected]>
rtc: ds1302: Add SPI ID table
J. Bruce Fields <[email protected]>
nfsd: don't alloc under spinlock in rpc_parse_scope_id
Evgeny Novikov <[email protected]>
mtd: rawnand: intel: Fix potential buffer overflow in probe
Arnaud Pouliquen <[email protected]>
rpmsg: Fix rpmsg_create_ept return when RPMSG config is not defined
Tom Rix <[email protected]>
apparmor: fix error check
Aharon Landau <[email protected]>
RDMA/core: Require the driver to set the IOVA correctly during rereg_mr
Hans de Goede <[email protected]>
power: supply: bq27xxx: Fix kernel crash on IRQ handler register error
Geert Uytterhoeven <[email protected]>
mips: cm: Convert to bitfield API to fix out-of-bounds access
Parav Pandit <[email protected]>
vdpa/mlx5: Fix clearing of VIRTIO_NET_F_MAC feature bit
Xuan Zhuo <[email protected]>
virtio_ring: check desc == NULL when using indirect with packed
Geert Uytterhoeven <[email protected]>
serial: cpm_uart: Protect udbg definitions by CONFIG_SERIAL_CPM_CONSOLE
Christophe JAILLET <[email protected]>
ASoC: rsnd: Fix an error handling path in 'rsnd_node_count()'
Yixing Liu <[email protected]>
RDMA/hns: Modify the value of MAX_LP_MSG_LEN to meet hardware compatibility
Haoyue Xu <[email protected]>
RDMA/hns: Fix initial arm_st of CQ
Richard Fitzgerald <[email protected]>
ASoC: cs42l42: Correct configuring of switch inversion from ts-inv
Christophe Leroy <[email protected]>
powerpc: Don't provide __kernel_map_pages() without ARCH_SUPPORTS_DEBUG_PAGEALLOC
Logan Gunthorpe <[email protected]>
iommu/dma: Fix incorrect error return on iommu deferred attach
Takashi Sakamoto <[email protected]>
ALSA: oxfw: fix functional regression for Mackie Onyx 1640i in v5.14 or later
Denis Kirjanov <[email protected]>
powerpc/xmon: fix task state output
Bixuan Cui <[email protected]>
powerpc/44x/fsp2: add missing of_node_put
Christophe Leroy <[email protected]>
powerpc/book3e: Fix set_memory_x() and set_memory_nx()
Christophe Leroy <[email protected]>
powerpc/nohash: Fix __ptep_set_access_flags() and ptep_set_wrprotect()
Andrej Shadura <[email protected]>
HID: u2fzero: properly handle timeouts in usb_submit_urb
Andrej Shadura <[email protected]>
HID: u2fzero: clarify error check and length calculations
Claudiu Beznea <[email protected]>
clk: at91: clk-master: fix prescaler logic
Claudiu Beznea <[email protected]>
clk: at91: clk-master: check if div or pres is zero
Claudiu Beznea <[email protected]>
clk: at91: sam9x60-pll: use DIV_ROUND_CLOSEST_ULL
Anssi Hannula <[email protected]>
serial: xilinx_uartps: Fix race condition causing stuck TX
Yang Yingliang <[email protected]>
phy: Sparx5 Eth SerDes: Fix return value check in sparx5_serdes_probe()
Sandeep Maheswaram <[email protected]>
phy: qcom-snps: Correct the FSEL_MASK
Dmitry Baryshkov <[email protected]>
phy: qcom-qmp: another fix for the sc8180x PCIe definition
Dan Carpenter <[email protected]>
phy: ti: gmii-sel: check of_get_address() for failure
Vladimir Zapolskiy <[email protected]>
phy: qcom-qusb2: Fix a memory leak on probe
Mark Brown <[email protected]>
ASoC: topology: Fix stub for snd_soc_tplg_component_remove()
Rahul Tanwar <[email protected]>
pinctrl: equilibrium: Fix function addition in multiple groups
Vladimir Zapolskiy <[email protected]>
arm64: dts: qcom: sdm845: Fix Qualcomm crypto engine bus clock
Bhupesh Sharma <[email protected]>
arm64: dts: qcom: sdm845: Use RPMH_CE_CLK macro directly
Marijn Suijten <[email protected]>
arm64: dts: qcom: pmi8994: Fix "eternal"->"external" typo in WLED node
Wan Jiabing <[email protected]>
soc: qcom: apr: Add of_node_put() before return
Dmitry Baryshkov <[email protected]>
soc: qcom: rpmhpd: fix sm8350_mxc's peer domain
Guru Das Srinagesh <[email protected]>
firmware: qcom_scm: Fix error retval in __qcom_scm_is_call_available()
Jack Pham <[email protected]>
usb: dwc3: gadget: Skip resizing EP's TX FIFO if already resized
Christophe Leroy <[email protected]>
powerpc/booke: Disable STRICT_KERNEL_RWX, DEBUG_PAGEALLOC and KFENCE
Amelie Delaunay <[email protected]>
usb: dwc2: drd: reset current session before setting the new one
Amelie Delaunay <[email protected]>
usb: dwc2: drd: fix dwc2_drd_role_sw_set when clock could be disabled
Amelie Delaunay <[email protected]>
usb: dwc2: drd: fix dwc2_force_mode call in dwc2_ovr_init
Stefan Agner <[email protected]>
serial: imx: fix detach/attach of serial console
James Smart <[email protected]>
scsi: lpfc: Wait for successful restart of SLI3 adapter during host sg_reset
Srinivas Kandagatla <[email protected]>
scsi: ufs: ufshcd-pltfrm: Fix memory leak due to probe defer
Srinivas Kandagatla <[email protected]>
soundwire: bus: stop dereferencing invalid slave pointer
Nuno Sá <[email protected]>
iio: adis: do not disabe IRQs in 'adis_init()'
Randy Dunlap <[email protected]>
usb: typec: STUSB160X should select REGMAP_I2C
Yang Yingliang <[email protected]>
iio: buffer: Fix double-free in iio_buffers_alloc_sysfs_and_mask()
Dmitry Baryshkov <[email protected]>
soc: qcom: socinfo: add two missing PMIC IDs
Bjorn Andersson <[email protected]>
soc: qcom: rpmhpd: Make power_on actually enable the domain
Richard Fitzgerald <[email protected]>
ASoC: cs42l42: Defer probe if request_threaded_irq() returns EPROBE_DEFER
Richard Fitzgerald <[email protected]>
ASoC: cs42l42: Correct some register default values
Richard Fitzgerald <[email protected]>
ASoC: cs42l42: Always configure both ASP TX channels
Olivier Moysan <[email protected]>
ARM: dts: stm32: fix AV96 board SAI2 pin muxing on stm32mp15
Olivier Moysan <[email protected]>
ARM: dts: stm32: fix SAI sub nodes register range
Fabrice Gasnier <[email protected]>
ARM: dts: stm32: fix STUSB1600 Type-C irq level on stm32mp15xx-dkx
Marek Vasut <[email protected]>
ARM: dts: stm32: Reduce DHCOR SPI NOR frequency to 50 MHz
Geert Uytterhoeven <[email protected]>
pinctrl: renesas: checker: Fix off-by-one bug in drive register check
Athira Rajeev <[email protected]>
powerpc/perf: Fix cycles/instructions as PM_CYC/PM_INST_CMPL in power10
Andrew Halaney <[email protected]>
dyndbg: make dyndbg a known cli param
Logan Gunthorpe <[email protected]>
RDMA/core: Set sgtable nents when using ib_dma_virt_map_sg()
Vegard Nossum <[email protected]>
staging: ks7010: select CRYPTO_HASH/CRYPTO_MICHAEL_MIC
Nikita Yushchenko <[email protected]>
staging: most: dim2: do not double-register the same device
Randy Dunlap <[email protected]>
usb: musb: select GENERIC_PHY instead of depending on it
Leon Romanovsky <[email protected]>
RDMA/mlx4: Return missed an error if device doesn't support steering
Dan Carpenter <[email protected]>
scsi: csiostor: Uninitialized data in csio_ln_vnp_read_cbfn()
Yang Yingliang <[email protected]>
power: supply: max17040: fix null-ptr-deref in max17040_probe()
Jakob Hauser <[email protected]>
power: supply: rt5033_battery: Change voltage values to µV
Dan Carpenter <[email protected]>
usb: gadget: hid: fix error code in do_config()
Andy Shevchenko <[email protected]>
serial: 8250_dw: Drop wrong use of ACPI_PTR()
Nathan Lynch <[email protected]>
powerpc/paravirt: correct preempt debug splat in vcpu_is_preempted()
Nathan Lynch <[email protected]>
powerpc: fix unbalanced node refcount in check_kvm_guest()
Christophe Leroy <[email protected]>
video: fbdev: chipsfb: use memset_io() instead of memset()
Christophe Leroy <[email protected]>
powerpc/mem: Fix arch/powerpc/mm/mem.c:53:12: error: no previous prototype for 'create_section_mapping'
Clément Léger <[email protected]>
clk: at91: check pmc node status before registering syscore ops
Dongliang Mu <[email protected]>
memory: fsl_ifc: fix leak of irq and nand_irq in fsl_ifc_ctrl_probe
Christophe JAILLET <[email protected]>
soc/tegra: Fix an error handling path in tegra_powergate_power_up()
Mark Brown <[email protected]>
iio: st_pressure_spi: Add missing entries SPI to device ID table
Ranjani Sridharan <[email protected]>
ASoC: SOF: topology: do not power down primary core during topology removal
Andreas Kemnade <[email protected]>
arm: dts: omap3-gta04a4: accelerometer irq fix
Yang Yingliang <[email protected]>
driver core: Fix possible memory leak in device_link_add()
Igor Pylypiv <[email protected]>
scsi: pm80xx: Fix misleading log statement in pm8001_mpi_get_nvmd_resp()
Sumit Saxena <[email protected]>
scsi: megaraid_sas: Fix concurrent access to ISR between IRQ polling and real interrupt
Bart Van Assche <[email protected]>
scsi: ufs: core: Stop clearing UNIT ATTENTIONS
Bean Huo <[email protected]>
scsi: ufs: core: Fix ufshcd_probe_hba() prototype to match the definition
Claudiu Beznea <[email protected]>
power: reset: at91-reset: check properly the return value of devm_of_iomap
Srinivas Kandagatla <[email protected]>
soundwire: debugfs: use controller id and link_id for debugfs
Takashi Iwai <[email protected]>
ALSA: usb-audio: Fix possible race at sync of urb completions
Takashi Iwai <[email protected]>
ALSA: hda: Use position buffer for SKL+ again
Takashi Iwai <[email protected]>
ALSA: hda: Reduce udelay() at SKL+ position reporting
David Stevens <[email protected]>
iommu/dma: Fix arch_sync_dma for map
David Stevens <[email protected]>
iommu/dma: Fix sync_sg with swiotlb
Stephan Gerhold <[email protected]>
arm64: dts: qcom: pm8916: Remove wrong reg-names for rtc@6000
Arnd Bergmann <[email protected]>
iommu/mediatek: Fix out-of-range warning with clang
Geert Uytterhoeven <[email protected]>
arm64: dts: renesas: beacon: Fix Ethernet PHY mode
Stephan Gerhold <[email protected]>
arm64: dts: qcom: msm8916: Fix Secondary MI2S bit clock
Yassine Oudjana <[email protected]>
ASoC: wcd9335: Use correct version to initialize Class H
Biju Das <[email protected]>
pinctrl: renesas: rzg2l: Fix missing port register 21h
Dongliang Mu <[email protected]>
JFS: fix memleak in jfs_mount
Jackie Liu <[email protected]>
MIPS: loongson64: make CPU_LOONGSON64 depends on MIPS_FP_SUPPORT
Tong Zhang <[email protected]>
scsi: dc395: Fix error case unwinding
Kuogee Hsieh <[email protected]>
arm64: dts: qcom: sc7280: fix display port phy reg property
Naina Mehta <[email protected]>
soc: qcom: llcc: Disable MMUHWT retention
Douglas Anderson <[email protected]>
arm64: dts: qcom: sc7180: Base dynamic CPU power coefficients in reality
Peter Rosin <[email protected]>
ARM: dts: at91: tse850: the emac<->phy interface is rmii
Tony Lindgren <[email protected]>
bus: ti-sysc: Fix timekeeping_suspended warning on resume
Anand Moon <[email protected]>
arm64: dts: meson-sm1: Fix the pwm regulator supply properties
Anand Moon <[email protected]>
arm64: dts: meson-g12b: Fix the pwm regulator supply properties
Anand Moon <[email protected]>
arm64: dts: meson-g12a: Fix the pwm regulator supply properties
Kishon Vijay Abraham I <[email protected]>
arm64: dts: ti: j7200-main: Fix "bus-range" upto 256 bus number for PCIe
Kishon Vijay Abraham I <[email protected]>
arm64: dts: ti: j7200-main: Fix "vendor-id"/"device-id" properties of pcie node
Kishon Vijay Abraham I <[email protected]>
arm64: dts: ti: k3-j721e-main: Fix "bus-range" upto 256 bus number for PCIe
Kishon Vijay Abraham I <[email protected]>
arm64: dts: ti: k3-j721e-main: Fix "max-virtual-functions" in PCIe EP nodes
Selvin Xavier <[email protected]>
RDMA/bnxt_re: Fix query SRQ failure
Marijn Suijten <[email protected]>
ARM: dts: qcom: msm8974: Add xo_board reference clock to DSI0 PHY
Alex Bee <[email protected]>
arm64: dts: rockchip: Fix GPU register width for RK3328
Jackie Liu <[email protected]>
ARM: s3c: irq-s3c24xx: Fix return value check for s3c24xx_init_intc()
James Smart <[email protected]>
scsi: lpfc: Fix NVMe I/O failover to non-optimized path
Quinn Tran <[email protected]>
scsi: qla2xxx: edif: Use link event to wake up app
Ajish Koshy <[email protected]>
scsi: pm80xx: Fix lockup in outbound queue management
Christophe JAILLET <[email protected]>
clk: mvebu: ap-cpu-clk: Fix a memory leak in error handling paths
Rafał Miłecki <[email protected]>
arm64: dts: broadcom: bcm4908: Fix UART clock name
Rafał Miłecki <[email protected]>
ARM: dts: BCM5301X: Fix memory nodes names
Junji Wei <[email protected]>
RDMA/rxe: Fix wrong port_cap_flags
Alexandru Ardelean <[email protected]>
iio: st_sensors: disable regulators after device unregistration
Dongjin Kim <[email protected]>
arm64: dts: meson: sm1: add Ethernet PHY reset line for ODROID-C4/HC4
Pavel Skripkin <[email protected]>
staging: r8188eu: fix memory leak in rtw_set_key
Hector.Yuan <[email protected]>
cpufreq: Fix parameter in parse_perf_domain()
Frank Rowand <[email protected]>
of: unittest: fix EXPECT text for gpio hog errors
Alexei Starovoitov <[email protected]>
bpf: Fix propagation of signed bounds from 64-bit min/max into 32-bit.
Alexei Starovoitov <[email protected]>
bpf: Fix propagation of bounds from 64-bit min/max into 32-bit and var_off.
Dan Schatzberg <[email protected]>
cgroup: Fix rootcg cpu.stat guest double counting
Liu Jian <[email protected]>
skmsg: Lose offset info in sk_psock_skb_ingress
Geliang Tang <[email protected]>
selftests: mptcp: fix proto type in link_failure tests
Sukadev Bhattiprolu <[email protected]>
ibmvnic: delay complete()
Sukadev Bhattiprolu <[email protected]>
ibmvnic: Process crqs after enabling interrupts
Sukadev Bhattiprolu <[email protected]>
ibmvnic: don't stop queue in xmit
Jakub Kicinski <[email protected]>
udp6: allow SO_MARK ctrl msg to affect routing
Andrea Righi <[email protected]>
selftests/bpf: Fix fclose/pclose mismatch in test_progs
Daniel Jordan <[email protected]>
crypto: pcrypt - Delay write to padata->info
Nikolay Aleksandrov <[email protected]>
selftests: net: bridge: update IGMP/MLD membership interval value
Ivan Vecera <[email protected]>
net: bridge: fix uninitialized variables when BRIDGE_CFM is disabled
Russell King (Oracle) <[email protected]>
net: phylink: avoid mvneta warning when setting pause parameters
Yinjun Zhang <[email protected]>
nfp: fix potential deadlock when canceling dim work
Yinjun Zhang <[email protected]>
nfp: fix NULL pointer access when scheduling dim work
Christophe JAILLET <[email protected]>
ipmi: kcs_bmc: Fix a memory leak in the error handling path of 'kcs_bmc_serio_add_device()'
Shyam Sundar S K <[email protected]>
net: amd-xgbe: Toggle PLL settings during rate change
Xin Long <[email protected]>
sctp: return true only for pathmtu update in sctp_transport_pl_toobig
Xin Long <[email protected]>
sctp: subtract sctphdr len in sctp_transport_pl_hlen
Xin Long <[email protected]>
sctp: reset probe_timer in sctp_transport_pl_update
Xin Long <[email protected]>
sctp: allow IP fragmentation when PLPMTUD enters Error state
Kumar Kartikeya Dwivedi <[email protected]>
selftests/bpf: Fix memory leak in test_ima
Kumar Kartikeya Dwivedi <[email protected]>
selftests/bpf: Fix fd cleanup in sk_lookup test
Alex Deucher <[email protected]>
drm/amdgpu/gmc6: fix DMA mask from 44 to 40 bits
Lang Yu <[email protected]>
drm/amdgpu: fix a potential memory leak in amdgpu_device_fini_sw()
Loic Poulain <[email protected]>
wcn36xx: Channel list update before hardware scan
Eric Dumazet <[email protected]>
bpf: Fixes possible race in update_prog_stats() for 32bit arches
Eric Dumazet <[email protected]>
bpf: Avoid races in __bpf_prog_run() for 32bit arches
Loic Poulain <[email protected]>
wcn36xx: Fix discarded frames due to wrong sequence number
Benjamin Li <[email protected]>
wcn36xx: add proper DMA memory barriers in rx path
Wang Hai <[email protected]>
libertas: Fix possible memory leak in probe and disconnect
Wang Hai <[email protected]>
libertas_tf: Fix possible memory leak in probe and disconnect
Janis Schoetterl-Glausch <[email protected]>
KVM: s390: Fix handle_sske page fault handling
Tiezhu Yang <[email protected]>
samples/kretprobes: Fix return value if register_kretprobe() failed
Peter Zijlstra <[email protected]>
x86: Fix __get_wchan() for !STACKTRACE
Kees Cook <[email protected]>
sched: Add wrapper for get_wchan() to keep task blocked
Lad Prabhakar <[email protected]>
spi: spi-rpc-if: Check return value of rpcif_sw_init()
Zhang Rui <[email protected]>
cpufreq: intel_pstate: Fix cpu->pstate.turbo_freq initialization
Mathieu Desnoyers <[email protected]>
tracing: Fix missing trace_boot_init_histograms kstrdup NULL checks
Jon Maxwell <[email protected]>
tcp: don't free a FIN sk_buff in tcp_remove_empty_skb()
Ilya Leoshkevich <[email protected]>
libbpf: Fix endianness detection in BPF_CORE_READ_BITFIELD_PROBED()
Mark Brown <[email protected]>
tpm_tis_spi: Add missing SPI ID
Hao Wu <[email protected]>
tpm: fix Atmel TPM crash caused by too frequent queries
Andrii Nakryiko <[email protected]>
libbpf: Fix off-by-one bug in bpf_core_apply_relo()
Yu Kuai <[email protected]>
blk-cgroup: synchronize blkg creation against policy deactivation
Michael Schmitz <[email protected]>
block: ataflop: more blk-mq refactoring fixes
Abinaya Kalaiselvan <[email protected]>
ath10k: fix module load regression with iram-recovery feature
Arnd Bergmann <[email protected]>
ARM: 9142/1: kasan: work around LPAE build warning
Vladimir Oltean <[email protected]>
net: dsa: avoid refcount warnings when ->port_{fdb,mdb}_del returns errorMark Rutland <[email protected]>
irq: mips: avoid nested irq_enter()
Claudio Imbrenda <[email protected]>
KVM: s390: pv: avoid stalls for kvm_s390_pv_init_vm
Claudio Imbrenda <[email protected]>
KVM: s390: pv: avoid double free of sida page
David Hildenbrand <[email protected]>
s390/uv: fully validate the VMA before calling follow_page()
David Hildenbrand <[email protected]>
s390/mm: fix VMA and page table handling code in storage key handling functions
David Hildenbrand <[email protected]>
s390/mm: validate VMA in PGSTE manipulation functions
David Hildenbrand <[email protected]>
s390/gmap: don't unconditionally call pte_unmap_unlock() in __gmap_zap()
David Hildenbrand <[email protected]>
s390/gmap: validate VMA in __gmap_zap()
Nick Hainke <[email protected]>
mt76: mt7615: mt7622: fix ibss and meshpoint
Andrii Nakryiko <[email protected]>
libbpf: Fix BTF header parsing checks
Andrii Nakryiko <[email protected]>
libbpf: Fix overflow in BTF sanity checks
Quentin Monnet <[email protected]>
bpftool: Avoid leaking the JSON writer prepared for program metadata
Mauricio Vásquez <[email protected]>
libbpf: Fix memory leak in btf__dedup()
Jim Mattson <[email protected]>
KVM: selftests: Fix nested SVM tests when built with clang
Tetsuo Handa <[email protected]>
smackfs: use netlbl_cfg_cipsov4_del() for deleting cipso_v4_doi
Horia Geantă <[email protected]>
crypto: tcrypt - fix skcipher multi-buffer tests for 1420B blocks
Jessica Zhang <[email protected]>
drm/msm/dsi: fix wrong type in msm_dsi_host
Jessica Zhang <[email protected]>
drm/msm: Fix potential NULL dereference in DPU SSPP
Joerg Roedel <[email protected]>
x86/sev: Fix stack type check in vc_switch_off_ist()
Kees Cook <[email protected]>
clocksource/drivers/timer-ti-dm: Select TIMER_OF
Anders Roxell <[email protected]>
PM: hibernate: fix sparse warnings
Max Gurtovoy <[email protected]>
nvme-rdma: fix error code in nvme_rdma_setup_ctrl
Ye Bin <[email protected]>
nbd: Fix use-after-free in pid_show
Stefan Agner <[email protected]>
phy: micrel: ksz8041nl: do not use power down mode
Tim Gardner <[email protected]>
net: enetc: unmap DMA in enetc_send_cmd()
Johannes Berg <[email protected]>
iwlwifi: pnvm: read EFI data only if long enough
Johannes Berg <[email protected]>
iwlwifi: pnvm: don't kmemdup() more than we have
Johannes Berg <[email protected]>
iwlwifi: mvm: reset PM state on unsuccessful resume
Jonas Dreßler <[email protected]>
mwifiex: Send DELBA requests according to spec
Ziyang Xuan <[email protected]>
rsi: stop thread firstly in rsi_91x_init() error handling
Shayne Chen <[email protected]>
mt76: mt7915: fix muar_idx in mt7915_mcu_alloc_sta_req()
Shayne Chen <[email protected]>
mt76: mt7915: fix sta_rec_wtbl tag len
Lorenzo Bianconi <[email protected]>
mt76: connac: fix possible NULL pointer dereference in mt76_connac_get_phy_mode_v2
Ryder Lee <[email protected]>
mt76: mt7615: fix monitor mode tear down crash
Sean Wang <[email protected]>
mt76: mt7921: fix retrying release semaphore without end
Lorenzo Bianconi <[email protected]>
mt76: mt7915: fix possible infinite loop release semaphore
Ryder Lee <[email protected]>
mt76: mt7615: fix hwmon temp sensor mem use-after-free
Ben Greear <[email protected]>
mt76: mt7915: fix hwmon temp sensor mem use-after-free
Lorenzo Bianconi <[email protected]>
mt76: mt7921: always wake device if necessary in debugfs
Sean Wang <[email protected]>
mt76: mt7921: fix kernel warning from cfg80211_calculate_bitrate
Sean Wang <[email protected]>
mt76: mt7921: fix firmware usage of RA info using legacy rates
Sean Wang <[email protected]>
mt76: mt7921: report HE MU radiotap
Lorenzo Bianconi <[email protected]>
mt76: overwrite default reg_ops if necessary
Leon Yen <[email protected]>
mt76: connac: fix GTK rekey offload failure on WPA mixed mode
Deren Wu <[email protected]>
mt76: mt7921: fix dma hang in rmmod
Shayne Chen <[email protected]>
mt76: mt7915: fix bit fields for HT rate idx
Shayne Chen <[email protected]>
mt76: mt7915: fix potential overflow of eeprom page index
Deren Wu <[email protected]>
mt76: mt7921: Fix out of order process by invalid event pkt
Lorenzo Bianconi <[email protected]>
mt76: mt76x02: fix endianness warnings in mt76x02_mac.c
Lorenzo Bianconi <[email protected]>
mt76: mt7921: fix survey-dump reporting
Sean Wang <[email protected]>
mt76: fix build error implicit enumeration conversion
Leon Yen <[email protected]>
mt76: connac: fix mt76_connac_gtk_rekey_tlv usage
Dan Carpenter <[email protected]>
mt76: mt7915: fix info leak in mt7915_mcu_set_pre_cal()
Lorenzo Bianconi <[email protected]>
mt76: mt7615: fix endianness warning in mt7615_mac_write_txwi
Lorenzo Bianconi <[email protected]>
mt76: mt7921: fix endianness warning in mt7921_update_txs
Lorenzo Bianconi <[email protected]>
mt76: mt7915: fix endianness warning in mt7915_mac_add_txs_skb
Lorenzo Bianconi <[email protected]>
mt76: mt7921: fix endianness in mt7921_mcu_tx_done_event
Lang Yu <[email protected]>
drm/amdkfd: Fix an inappropriate error handling in allloc memory of gpu
Rafael J. Wysocki <[email protected]>
ACPI: PM: Fix sharing of wakeup power resources
Rafael J. Wysocki <[email protected]>
ACPI: PM: Turn off unused wakeup power resources
Fei Shao <[email protected]>
mailbox: mtk-cmdq: Fix local clock ID usage
Fei Shao <[email protected]>
mailbox: mtk-cmdq: Validate alias_id on probe
Nathan Chancellor <[email protected]>
platform/x86: thinkpad_acpi: Fix bitwise vs. logical warning
Andrea Righi <[email protected]>
blk-wbt: prevent NULL pointer dereference in wb_timer_fn
Michael Schmitz <[email protected]>
block: ataflop: fix breakage introduced at blk-mq refactoring
Bixuan Cui <[email protected]>
io-wq: Remove duplicate code in io_workqueue_create()
Christophe JAILLET <[email protected]>
mmc: mxs-mmc: disable regulator on error and in the remove function
Sean Young <[email protected]>
media: ir_toy: assignment to be16 should be of correct type
Randy Dunlap <[email protected]>
media: ivtv: fix build for UML
jason-jh.lin <[email protected]>
mailbox: Remove WARN_ON for async_cb.cb in cmdq_exec_done
Jackie Liu <[email protected]>
thermal/drivers/qcom/lmh: make QCOM_LMH depends on QCOM_SCM
Jakub Kicinski <[email protected]>
net: stream: don't purge sk_error_queue in sk_stream_kill_queues()
Dan Carpenter <[email protected]>
drm/msm: uninitialized variable in msm_gem_import()
Dan Carpenter <[email protected]>
drm/msm: fix potential NULL dereference in cleanup
Dan Carpenter <[email protected]>
drm/msm: unlock on error in get_sched_entity()
Dan Carpenter <[email protected]>
drm/msm: potential error pointer dereference in init()
Dan Carpenter <[email protected]>
drm/msm: Fix potential Oops in a6xx_gmu_rpmh_init()
Dmitry Baryshkov <[email protected]>
drm/msm/dsi: do not enable irq handler before powering up the host
Ziyang Xuan <[email protected]>
thermal/core: fix a UAF bug in __thermal_cooling_device_register()
Ovidiu Panait <[email protected]>
crypto: octeontx2 - set assoclen in aead_do_fallback()
Eric Dumazet <[email protected]>
tcp: switch orphan_count to bare per-cpu counters
Qi Zheng <[email protected]>
x86: Fix get_wchan() to support the ORC unwinder
Randy Dunlap <[email protected]>
net: tulip: winbond-840: fix build for UML
Randy Dunlap <[email protected]>
net: intel: igc_ptp: fix build for UML
Randy Dunlap <[email protected]>
net: fealnx: fix build for UML
Zhang Qiao <[email protected]>
kernel/sched: Fix sched_fork() access an invalid sched_task_group
Sven Eckelmann <[email protected]>
ath10k: fix max antenna gain unit
Zev Weiss <[email protected]>
hwmon: (pmbus/lm25066) Let compiler determine outer dimension of lm25066_coeff
Yang Yingliang <[email protected]>
hwmon: Fix possible memleak in __hwmon_device_register()
Daniel Borkmann <[email protected]>
net, neigh: Fix NTF_EXT_LEARNED in combination with NTF_USE
Dan Carpenter <[email protected]>
memstick: jmb38x_ms: use appropriate free function in jmb38x_ms_alloc_host()
Arnd Bergmann <[email protected]>
memstick: avoid out-of-range warning
Tony Lindgren <[email protected]>
mmc: sdhci-omap: Fix context restore
Tony Lindgren <[email protected]>
mmc: sdhci-omap: Fix NULL pointer exception if regulator is not configured
Catherine Sullivan <[email protected]>
gve: Track RX buffer allocation failures
John Fraker <[email protected]>
gve: Recover from queue stall due to missed IRQ
Dan Carpenter <[email protected]>
b43: fix a lower bounds test
Dan Carpenter <[email protected]>
b43legacy: fix a lower bounds test
liqiong <[email protected]>
ima: fix deadlock when traversing "ima_default_rules".
Markus Schneider-Pargmann <[email protected]>
hwrng: mtk - Force runtime pm ops for sleep ops
Giovanni Cabiddu <[email protected]>
crypto: qat - disregard spurious PFVF interrupts
Giovanni Cabiddu <[email protected]>
crypto: qat - detect PFVF collision after ACK
Arnd Bergmann <[email protected]>
crypto: ccree - avoid out-of-range warnings from clang
Evgeny Novikov <[email protected]>
media: dvb-frontends: mn88443x: Handle errors of clk_prepare_enable()
Mansur Alisha Shaik <[email protected]>
media: venus: fix vpp frequency calculation for decoder
Pablo Neira Ayuso <[email protected]>
netfilter: nft_dynset: relax superfluous check on set updates
Peter Zijlstra <[email protected]>
rcu: Fix rcu_dynticks_curr_cpu_in_eqs() vs noinstr
Peter Zijlstra <[email protected]>
rcu: Always inline rcu_dynticks_task*_{enter,exit}()
Yazen Ghannam <[email protected]>
EDAC/amd64: Handle three rank interleaving mode
Borislav Petkov <[email protected]>
x86/insn: Use get_unaligned() instead of memcpy()
Vincent Donnefort <[email protected]>
PM: EM: Fix inefficient states detection
Linus Lüssing <[email protected]>
ath9k: Fix potential interrupt storm on queue reset
Stephen Boyd <[email protected]>
ath10k: Don't always treat modem stop events as crashes
Colin Ian King <[email protected]>
media: em28xx: Don't use ops->suspend if it is NULL
Anel Orazgaliyeva <[email protected]>
cpuidle: Fix kobject memory leaks in error paths
Arnd Bergmann <[email protected]>
drm: fb_helper: fix CONFIG_FB dependency
Arnd Bergmann <[email protected]>
crypto: ecc - fix CRYPTO_DEFAULT_RNG dependency
Punit Agrawal <[email protected]>
kprobes: Do not use local variable when creating debugfs file
Yee Lee <[email protected]>
scs: Release kasan vmalloc poison in scs_free process
Eugen Hristev <[email protected]>
media: atmel: fix the ispck initialization
Colin Ian King <[email protected]>
media: cx23885: Fix snd_card_free call on null card pointer
Kees Cook <[email protected]>
media: tm6000: Avoid card name truncation
Kees Cook <[email protected]>
media: si470x: Avoid card name truncation
Kees Cook <[email protected]>
media: radio-wl1273: Avoid card name truncation
Ondrej Jirman <[email protected]>
media: sun6i-csi: Allow the video device to be open multiple times
Randy Dunlap <[email protected]>
media: i2c: ths8200 needs V4L2_ASYNC
Christophe JAILLET <[email protected]>
media: imx-jpeg: Fix the error handling path of 'mxc_jpeg_probe()'
Christophe JAILLET <[email protected]>
media: mtk-vpu: Fix a resource leak in the error handling path of 'mtk_vpu_probe()'
Tom Rix <[email protected]>
media: TDA1997x: handle short reads of hdmi info frame.
Dafna Hirschfeld <[email protected]>
media: mtk-vcodec: venc: fix return value when start_streaming fails
Ricardo Ribalda <[email protected]>
media: v4l2-ioctl: S_CTRL output the right value
Sakari Ailus <[email protected]>
media: imx258: Fix getting clock frequency
Pavel Skripkin <[email protected]>
media: dvb-usb: fix ununit-value in az6027_rc_query
Evgeny Novikov <[email protected]>
media: ttusb-dec: avoid release of non-acquired mutex
Colin Ian King <[email protected]>
media: cxd2880-spi: Fix a null pointer dereference on error handling path
Christophe JAILLET <[email protected]>
media: meson-ge2d: Fix rotation parameter changes detection in 'ge2d_s_ctrl()'
Pavel Skripkin <[email protected]>
media: em28xx: add missing em28xx_close_extension
Kumar Kartikeya Dwivedi <[email protected]>
libbpf: Fix skel_internal.h to set errno on loader retval < 0
Arnd Bergmann <[email protected]>
drm/amdgpu: fix warning for overflow check
Sudarshan Rajagopalan <[email protected]>
arm64: mm: update max_pfn after memory hotplug
Matthew Auld <[email protected]>
drm/ttm: stop calling tt_swapin in vm_access
Fabio Estevam <[email protected]>
ath10k: sdio: Add missing BH locking around napi_schdule()
Loic Poulain <[email protected]>
ath10k: Fix missing frame timestamp for beacon/probe-resp
Arnd Bergmann <[email protected]>
gve: DQO: avoid unused variable warnings
Baochen Qiang <[email protected]>
ath11k: Fix memory leak in ath11k_qmi_driver_event_work
Pradeep Kumar Chitrapu <[email protected]>
ath11k: fix packet drops due to incorrect 6 GHz freq value in rx status
Sriram R <[email protected]>
ath11k: Avoid race during regd updates
Dan Carpenter <[email protected]>
ath11k: fix some sleeping in atomic bugs
Johan Almbladh <[email protected]>
bpf/tests: Fix error in tail call limit tests
Linus Walleij <[email protected]>
net: dsa: rtl8366: Fix a bug in deleting VLANs
Linus Walleij <[email protected]>
net: dsa: rtl8366rb: Fix off-by-one bug
Leon Romanovsky <[email protected]>
net/mlx5: Accept devlink user input after driver initialization complete
Johannes Berg <[email protected]>
cfg80211: always free wiphy specific regdomain
Johannes Berg <[email protected]>
mac80211: twt: don't use potentially unaligned pointer
Kees Cook <[email protected]>
fortify: Fix dropped strcpy() compile-time write overflow check
Florian Westphal <[email protected]>
mptcp: do not shrink snd_nxt when recovering
Jiasheng Jiang <[email protected]>
rxrpc: Fix _usecs_to_jiffies() by using usecs_to_jiffies()
Leon Romanovsky <[email protected]>
qed: Don't ignore devlink allocation failures
Leon Romanovsky <[email protected]>
bnxt_en: Check devlink allocation and registration status
Hans de Goede <[email protected]>
Bluetooth: hci_h5: Fix (runtime)suspend issues on RTL8723BS HCIs
Giovanni Cabiddu <[email protected]>
crypto: qat - power up 4xxx device
Michael Walle <[email protected]>
crypto: caam - disable pkc for non-E SoCs
Guchun Chen <[email protected]>
drm/amdgpu: move amdgpu_virt_release_full_gpu to fini_early stage
Harry Wentland <[email protected]>
drm/amd/display: Pass display_pipe_params_st as const in DML
Andrey Grodzovsky <[email protected]>
drm/amdgpu: Fix crash on device remove/driver unload
Dinghao Liu <[email protected]>
Bluetooth: btmtkuart: fix a memleak in mtk_hci_wmt_sync
Ajay Singh <[email protected]>
wilc1000: fix possible memory leak in cfg_scan_result()
Bryan O'Donoghue <[email protected]>
wcn36xx: Fix Antenna Diversity Switching
Waiman Long <[email protected]>
cgroup: Make rebind_subsystems() disable v2 controllers all at once
Yoshitaka Ikeda <[email protected]>
spi: Fixed division by zero warning
Alex Bee <[email protected]>
drm: bridge: it66121: Fix return value it66121_probe
Russell King (Oracle) <[email protected]>
net: phylink: don't call netif_carrier_off() with NULL netdev
Yajun Deng <[email protected]>
net: net_namespace: Fix undefined member in key_remove_domain()
Sebastian Andrzej Siewior <[email protected]>
lockdep: Let lock_is_held_type() detect recursive read as read
liuyuntao <[email protected]>
virtio-gpu: fix possible memory allocation failure
Nathan Chancellor <[email protected]>
crypto: sm4 - Do not change section of ck and sbox
Iago Toral Quiroga <[email protected]>
drm/v3d: fix wait for TMU write combiner flush
Leon Romanovsky <[email protected]>
net/mlx5: Publish and unpublish all devlink parameters at once
Peter Zijlstra <[email protected]>
objtool: Handle __sanitize_cov*() tail calls
Peter Zijlstra <[email protected]>
x86/xen: Mark cpu_bringup_and_idle() as dead_end_function
Aleksander Jan Bajkowski <[email protected]>
MIPS: lantiq: dma: fix burst length for DEU
Neeraj Upadhyay <[email protected]>
rcu: Fix existing exp request check in sync_sched_exp_online_cleanup()
Pavel Skripkin <[email protected]>
Bluetooth: hci_uart: fix GPF in h5_recv
Toke Høiland-Jørgensen <[email protected]>
libbpf: Don't crash on object files with no symbol tables
Desmond Cheong Zhi Xi <[email protected]>
Bluetooth: fix init and cleanup of sco_conn.timeout_work
Paul Cercueil <[email protected]>
drm/bridge: it66121: Wait for next bridge to be probed
Paul Cercueil <[email protected]>
drm/bridge: it66121: Initialize {device,vendor}_ids
Kan Liang <[email protected]>
perf/x86/intel/uncore: Fix Intel SPR M3UPI event constraints
Kan Liang <[email protected]>
perf/x86/intel/uncore: Fix Intel SPR M2PCIE event constraints
Kan Liang <[email protected]>
perf/x86/intel/uncore: Fix Intel SPR IIO event constraints
Kan Liang <[email protected]>
perf/x86/intel/uncore: Fix Intel SPR CHA event constraints
Robert Foss <[email protected]>
drm/bridge: anx7625: Propagate errors from sp_tx_rst_aux()
Imre Deak <[email protected]>
fbdev/efifb: Release PCI device's runtime PM ref during FB destroy
Andrii Nakryiko <[email protected]>
selftests/bpf: Fix strobemeta selftest regression
Pablo Neira Ayuso <[email protected]>
netfilter: conntrack: set on IPS_ASSURED if flows enters internal stream state
Sven Schnelle <[email protected]>
parisc/kgdb: add kgdb_roundup() to make kgdb work with idle polling
Sven Schnelle <[email protected]>
parisc/unwind: fix unwinder when CONFIG_64BIT is enabled
Gao Xiang <[email protected]>
erofs: don't trigger WARN() when decompression fails
Helge Deller <[email protected]>
task_stack: Fix end_of_stack() for architectures with upwards-growing stack
Sven Schnelle <[email protected]>
parisc: fix warning in flush_tlb_all
Stephane Eranian <[email protected]>
perf/x86/intel: Fix ICL/SPR INST_RETIRED.PREC_DIST encodings
Shuah Khan <[email protected]>
selftests/core: fix conflicting types compile error for close_range()
Anson Jacob <[email protected]>
drm/amd/display: dcn20_resource_construct reduce scope of FPU enabled
Vitaly Kuznetsov <[email protected]>
x86/hyperv: Protect set_hv_tscchange_cb() against getting preempted
Eric Dumazet <[email protected]>
inet: remove races in inet{6}_getname()
王贇 <[email protected]>
ftrace: do CPU checking after preemption disabled
Bryan O'Donoghue <[email protected]>
Revert "wcn36xx: Enable firmware link monitoring"
Loic Poulain <[email protected]>
wcn36xx: Fix packet drop on resume
Loic Poulain <[email protected]>
wcn36xx: Correct band/freq reporting on RX
Yang Yingliang <[email protected]>
spi: bcm-qspi: Fix missing clk_disable_unprepare() on error in bcm_qspi_probe()
Josef Bacik <[email protected]>
btrfs: do not take the uuid_mutex in btrfs_rm_device
Sidong Yang <[email protected]>
btrfs: reflink: initialize return value to 0 in btrfs_extent_same()
Vladimir Oltean <[email protected]>
net: dsa: flush switchdev workqueue when leaving the bridge
Hui Wang <[email protected]>
ACPI: resources: Add one more Medion model in IRQ override quirk
Stefan Schaeckeler <[email protected]>
ACPI: AC: Quirk GK45 to skip reading _PSR
Eric Dumazet <[email protected]>
net: annotate data-race in neigh_output()
Florian Westphal <[email protected]>
vrf: run conntrack only in context of lower/physdev for locally generated packets
Viktor Rosendahl <[email protected]>
tools/latency-collector: Use correct size when writing queue_full_warning
Arnd Bergmann <[email protected]>
ARM: 9136/1: ARMv7-M uses BE-8, not BE-32
Andreas Gruenbacher <[email protected]>
gfs2: Fix glock_hash_walk bugs
Andreas Gruenbacher <[email protected]>
gfs2: Cancel remote delete work asynchronously
Marc Kleine-Budde <[email protected]>
can: bittiming: can_fixup_bittiming(): change type of tseg1 and alltseg to unsigned int
Vladimir Oltean <[email protected]>
net: dsa: lantiq_gswip: serialize access to the PCE table
Stephen Suryaputra <[email protected]>
gre/sit: Don't generate link-local addr if addr_gen_mode is IN6_ADDR_GEN_MODE_NONE
Masami Hiramatsu <[email protected]>
ARM: clang: Do not rely on lr register for stacktrace
Tetsuo Handa <[email protected]>
smackfs: use __GFP_NOFAIL for smk_cipso_doi()
Johannes Berg <[email protected]>
iwlwifi: mvm: disable RX-diversity in powersave
Jiri Olsa <[email protected]>
selftests/bpf: Fix perf_buffer test on system with offline cpus
Shuah Khan <[email protected]>
selftests: kvm: fix mismatched fclose() after popen()
Ye Bin <[email protected]>
PM: hibernate: Get block device exclusively in swsusp_check()
Nick Desaulniers <[email protected]>
arm64: vdso32: suppress error message for 'make mrproper'
David Yang <[email protected]>
samples/bpf: Fix application of sizeof to pointer
Hannes Reinecke <[email protected]>
nvme: drop scan_lock and always kick requeue list when removing namespaces
Israel Rukshin <[email protected]>
nvmet-tcp: fix use-after-free when a port is removed
Israel Rukshin <[email protected]>
nvmet-rdma: fix use-after-free when a port is removed
Israel Rukshin <[email protected]>
nvmet: fix use-after-free when a port is removed
Alex Deucher <[email protected]>
drm/amdgpu/pm: properly handle sclk for profiling modes on vangogh
Michael Tretter <[email protected]>
media: allegro: ignore interrupt if mailbox is not initialized
Jens Axboe <[email protected]>
block: remove inaccurate requeue check
Yaara Baruch <[email protected]>
iwlwifi: change all JnP to NO-160 configuration
Zheyu Ma <[email protected]>
mwl8k: Fix use-after-free in mwl8k_fw_state_machine()
Ryder Lee <[email protected]>
mt76: mt7915: fix an off-by-one bound check
Kalesh Singh <[email protected]>
tracing/cfi: Fix cmp_entries_* functions signature mismatch
Menglong Dong <[email protected]>
workqueue: make sysfs of unbound kworker cpumask more clever
Lasse Collin <[email protected]>
lib/xz: Validate the value before assigning it to an enum variable
Lasse Collin <[email protected]>
lib/xz: Avoid overlapping memcpy() with invalid input with in-place decompression
Yanfei Xu <[email protected]>
locking/rwsem: Disable preemption for spinning region
Zheyu Ma <[email protected]>
memstick: r592: Fix a UAF bug when removing the driver
Xiao Ni <[email protected]>
md: update superblock after changing rdev flags in state_store
Luis Chamberlain <[email protected]>
floppy: fix calling platform_device_unregister() on invalid drives
Jens Axboe <[email protected]>
block: bump max plugged deferred size from 16 to 32
Ansuel Smith <[email protected]>
thermal/drivers/tsens: Add timeout to get_temp_tsens_valid
Tim Gardner <[email protected]>
drm/msm: prevent NULL dereference in msm_gpu_crashstate_capture()
Yuanzheng Song <[email protected]>
thermal/core: Fix null pointer dereference in thermal_release()
Kees Cook <[email protected]>
leaking_addresses: Always print a trailing newline
Matthias Schiffer <[email protected]>
net: phy: micrel: make *-skew-ps check more lenient
Yifan Zhang <[email protected]>
drm/amdkfd: fix resume error when iommu disabled in Picasso
Aurabindo Pillai <[email protected]>
drm/amd/display: fix null pointer deref when plugging in display
Rafael J. Wysocki <[email protected]>
ACPI: scan: Release PM resources blocked by unused objects
André Almeida <[email protected]>
ACPI: battery: Accept charges over the design capacity as full
Andreas Gruenbacher <[email protected]>
iov_iter: Fix iov_iter_get_pages{,_alloc} page fault return value
Xin Xiong <[email protected]>
mmc: moxart: Fix reference count leaks in moxart_probe
Will Deacon <[email protected]>
KVM: arm64: Propagate errors from __pkvm_prot_finalize hypercall
Tuo Li <[email protected]>
ath: dfs_pattern_detector: Fix possible null-pointer dereference in channel_detector_create()
Steven Rostedt (VMware) <[email protected]>
tracing: Disable "other" permission bits in the tracefs files
Steven Rostedt (VMware) <[email protected]>
tracefs: Have tracefs directories not set OTH permission bits by default
Alex Sierra <[email protected]>
drm/amdkfd: rm BO resv on validation to avoid deadlock
Antoine Tenart <[email protected]>
net-sysfs: try not to restart the syscall if it will fail eventually
Anant Thazhemadam <[email protected]>
media: usb: dvd-usb: fix uninit-value bug in dibusb_read_eeprom_byte()
Ricardo Ribalda <[email protected]>
media: ipu3-imgu: VIDIOC_QUERYCAP: Fix bus_info
Ricardo Ribalda <[email protected]>
media: ipu3-imgu: imgu_fmt: Handle properly try
Mirela Rabulea <[email protected]>
media: imx-jpeg: Fix possible null pointer dereference
Wojciech Drewek <[email protected]>
ice: Move devlink port to PF/VF struct
Vincent Donnefort <[email protected]>
cpufreq: Make policy min/max hard requirements
Rafael J. Wysocki <[email protected]>
ACPICA: Avoid evaluating methods too early during system resume
Li Zhijian <[email protected]>
kselftests/sched: cleanup the child processes
Josh Don <[email protected]>
fs/proc/uptime.c: Fix idle time reporting in /proc/uptime
Corey Minyard <[email protected]>
ipmi: Disable some operations during a panic
Nadezda Lutovinova <[email protected]>
media: rcar-csi2: Add checking to rcsi2_start_receiver()
Hans de Goede <[email protected]>
brcmfmac: Add DMI nvram filename quirk for Cyberbook T116 tablet
Zong-Zhe Yang <[email protected]>
rtw88: fix RX clock gate setting while fifo dump
Randy Dunlap <[email protected]>
ia64: don't do IA64_CMPXCHG_DEBUG without CONFIG_PRINTK
Rajat Asthana <[email protected]>
media: mceusb: return without resubmitting URB in case of -EPROTO error.
Niklas Söderlund <[email protected]>
media: rcar-vin: Use user provided buffers when starting
Martin Kepplinger <[email protected]>
media: imx: set a media_device bus_info string
Sergey Senozhatsky <[email protected]>
media: videobuf2: rework vb2_mem_ops API
Nadezda Lutovinova <[email protected]>
media: s5p-mfc: Add checking to s5p_mfc_probe().
Tuo Li <[email protected]>
media: s5p-mfc: fix possible null-pointer dereference in s5p_mfc_probe()
Evgeny Novikov <[email protected]>
media: vidtv: Fix memory leak in remove
Ricardo Ribalda <[email protected]>
media: uvcvideo: Set unique vdev name based in type
Ricardo Ribalda <[email protected]>
media: uvcvideo: Return -EIO for control errors
Ricardo Ribalda <[email protected]>
media: uvcvideo: Set capability in s_param
Dmitriy Ulitin <[email protected]>
media: stm32: Potential NULL pointer dereference in dcmi_irq_thread()
Evgeny Novikov <[email protected]>
media: atomisp: Fix error handling in probe
Zheyu Ma <[email protected]>
media: netup_unidvb: handle interrupt properly according to the firmware
Dirk Bender <[email protected]>
media: mt9p031: Fix corrupted frame after restarting stream
Rakesh Babu <[email protected]>
octeontx2-pf: Enable promisc/allmulti match MCAM entries.
Alagu Sankar <[email protected]>
ath10k: high latency fixes for beacon buffer
Baochen Qiang <[email protected]>
ath11k: Change DMA_FROM_DEVICE to DMA_TO_DEVICE when map reinjected packets
Wen Gong <[email protected]>
ath11k: add handler for scan event WMI_SCAN_EVENT_DEQUEUED
Sriram R <[email protected]>
ath11k: Avoid reg rules update during firmware recovery
Johannes Berg <[email protected]>
leds: trigger: use RCU to protect the led_cdevs list
Petr Machata <[email protected]>
selftests: net: fib_nexthops: Wait before checking reported idle time
Herbert Xu <[email protected]>
crypto: api - Fix built-in testing dependency failures
Jimmy Kizito <[email protected]>
drm/amd/display: Fix null pointer dereference for encoders
Andrey Grodzovsky <[email protected]>
drm/amdgpu: Fix MMIO access page fault
Eric Biggers <[email protected]>
fscrypt: allow 256-bit master keys with AES-256-XTS
Mark Brown <[email protected]>
spi: Check we have a spi_device_id for each DT compatible
Jonas Dreßler <[email protected]>
mwifiex: Properly initialize private structure on interface type changes
Jonas Dreßler <[email protected]>
mwifiex: Run SET_BSS_MODE when changing from P2P to STATION vif-type
Peter Zijlstra <[email protected]>
x86: Increase exception stack sizes
Peter Zijlstra <[email protected]>
x86/mm/64: Improve stack overflow warnings
Shreyansh Chouhan <[email protected]>
crypto: aesni - check walk.nbytes instead of err
Seevalamuthu Mariappan <[email protected]>
ath11k: Align bss_chan_info structure with firmware
Pawan Gupta <[email protected]>
smackfs: Fix use-after-free in netlbl_catmap_walk()
Paul E. McKenney <[email protected]>
rcu-tasks: Move RTGS_WAIT_CBS to beginning of rcu_tasks_kthread() loop
Hui Wang <[email protected]>
ACPI: resources: Add DMI-based legacy IRQ override quirk
Jakub Kicinski <[email protected]>
net: sched: update default qdisc visibility after Tx queue cnt changes
Peter Zijlstra <[email protected]>
locking/lockdep: Avoid RCU-induced noinstr fail
Aleksander Jan Bajkowski <[email protected]>
MIPS: lantiq: dma: reset correct number of channel
Aleksander Jan Bajkowski <[email protected]>
MIPS: lantiq: dma: add small delay after reset
James Zhu <[email protected]>
drm/amdgpu: move iommu_resume before ip init/resume
Barnabás Pőcze <[email protected]>
platform/x86: wmi: do not fail if disabling fails
Scott Wood <[email protected]>
rcutorture: Avoid problematic critical section nesting on PREEMPT_RT
Simon Ser <[email protected]>
drm/panel-orientation-quirks: add Valve Steam Deck
Desmond Cheong Zhi Xi <[email protected]>
Bluetooth: call sock_hold earlier in sco_conn_del
Wang ShaoBo <[email protected]>
Bluetooth: fix use-after-free error in lock_sock_nested()
Takashi Iwai <[email protected]>
Bluetooth: sco: Fix lock_sock() blockage by memcpy_from_msg()
Hans de Goede <[email protected]>
drm: panel-orientation-quirks: Add quirk for the Samsung Galaxy Book 10.6
Hans de Goede <[email protected]>
drm: panel-orientation-quirks: Add quirk for KD Kurio Smart C15200 2-in-1
Hans de Goede <[email protected]>
drm: panel-orientation-quirks: Update the Lenovo Ideapad D330 quirk (v2)
Charan Teja Reddy <[email protected]>
dma-buf: WARN on dmabuf release with pending attachments
Kai Vehmanen <[email protected]>
component: do not leave master devres group open after bind
Sebastian Krzyszkowiak <[email protected]>
power: supply: max17042_battery: Clear status bits in interrupt handler
Johan Hovold <[email protected]>
USB: chipidea: fix interrupt deadlock
Johan Hovold <[email protected]>
USB: iowarrior: fix control-message timeouts
Johan Hovold <[email protected]>
most: fix control-message timeouts
Johan Hovold <[email protected]>
Revert "serial: 8250: Fix reporting real baudrate value in c_ospeed field"
Pali Rohár <[email protected]>
serial: 8250: Fix reporting real baudrate value in c_ospeed field
Jens Axboe <[email protected]>
io-wq: serialize hash clear with wakeup
Namjae Jeon <[email protected]>
ksmbd: set unique value to volume serial field in FS_VOLUME_INFORMATION
Johan Hovold <[email protected]>
serial: 8250: fix racy uartclk update
Wang Hai <[email protected]>
USB: serial: keyspan: fix memleak on probe errors
Mihail Chindris <[email protected]>
Documentation:devicetree:bindings:iio:dac: Fix val
Nuno Sá <[email protected]>
iio: ad5770r: make devicetree property reading consistent
Pekka Korpinen <[email protected]>
iio: dac: ad5446: Fix ad5622_write() return value
Mihail Chindris <[email protected]>
drivers: iio: dac: ad5766: Fix dt property name
Yang Yingliang <[email protected]>
iio: buffer: Fix memory leak in iio_buffer_register_legacy_sysfs_groups()
Yang Yingliang <[email protected]>
iio: buffer: Fix memory leak in __iio_buffer_alloc_sysfs_and_mask()
Yang Yingliang <[email protected]>
iio: buffer: Fix memory leak in iio_buffers_alloc_sysfs_and_mask()
Yang Yingliang <[email protected]>
iio: buffer: check return value of kstrdup_const()
Suzuki K Poulose <[email protected]>
coresight: trbe: Defer the probe on offline CPUs
Suzuki K Poulose <[email protected]>
coresight: trbe: Fix incorrect access of the sink specific data
Tao Zhang <[email protected]>
coresight: cti: Correct the parameter for pm_runtime_put
Yang Yingliang <[email protected]>
pinctrl: core: fix possible memory leak in pinctrl_enable()
Robert Marko <[email protected]>
mfd: simple-mfd-i2c: Select MFD_CORE to fix build error
Paulo Alcantara <[email protected]>
cifs: set a minimum of 120s for next dns resolution
Shyam Prasad N <[email protected]>
cifs: To match file servers, make sure the server hostname matches
Zhang Yi <[email protected]>
quota: correct error number in free_dqentry()
Zhang Yi <[email protected]>
quota: check block number when reading the block in quota file
Pali Rohár <[email protected]>
PCI: aardvark: Fix support for PCI_ROM_ADDRESS1 on emulated bridge
Pali Rohár <[email protected]>
PCI: aardvark: Set PCI Bridge Class Code to PCI Bridge
Pali Rohár <[email protected]>
PCI: aardvark: Fix support for PCI_BRIDGE_CTL_BUS_RESET on emulated bridge
Pali Rohár <[email protected]>
PCI: aardvark: Fix support for bus mastering and PCI_COMMAND on emulated bridge
Marek Behún <[email protected]>
PCI: aardvark: Read all 16-bits from PCIE_MSI_PAYLOAD_REG
Marek Behún <[email protected]>
PCI: aardvark: Fix return value of MSI domain .alloc() method
Pali Rohár <[email protected]>
PCI: aardvark: Fix configuring Reference clock
Pali Rohár <[email protected]>
PCI: aardvark: Fix reporting Data Link Layer Link Active
Pali Rohár <[email protected]>
PCI: aardvark: Do not unmask unused interrupts
Pali Rohár <[email protected]>
PCI: aardvark: Fix checking for link up via LTSSM state
Pali Rohár <[email protected]>
PCI: aardvark: Do not clear status bits of masked interrupts
Dan Williams <[email protected]>
cxl/pci: Fix NULL vs ERR_PTR confusion
Li Chen <[email protected]>
PCI: cadence: Add cdns_plat_pcie_probe() missing return
Marek Behún <[email protected]>
PCI: pci-bridge-emul: Fix emulation of W1C bits
Miklos Szeredi <[email protected]>
ovl: fix filattr copy-up failure
yangerkun <[email protected]>
ovl: fix use after free in struct ovl_aio_req
Juergen Gross <[email protected]>
xen/balloon: add late_initcall_sync() for initial ballooning done
Arnd Bergmann <[email protected]>
ifb: fix building without CONFIG_NET_CLS_ACT
Pali Rohár <[email protected]>
serial: core: Fix initializing and restoring termios speed
Steven Rostedt (VMware) <[email protected]>
ring-buffer: Protect ring_buffer_reset() from reentrancy
Pavel Begunkov <[email protected]>
io_uring: honour zeroes as io-wq worker limits
Xiaoming Ni <[email protected]>
powerpc/85xx: Fix oops when mpc85xx_smp_guts_ids node cannot be found
Oleksij Rempel <[email protected]>
iio: adc: tsc2046: fix scan interval warning
Zhang Changzhong <[email protected]>
can: j1939: j1939_tp_cmd_recv(): check the dst address of TP.CM_BAM
Zhang Changzhong <[email protected]>
can: j1939: j1939_can_recv(): ignore messages with invalid source address
Zhang Changzhong <[email protected]>
can: j1939: j1939_tp_cmd_recv(): ignore abort message in the BAM transport
Marc Kleine-Budde <[email protected]>
can: mcp251xfd: mcp251xfd_irq(): add missing can_rx_offload_threaded_irq_finish() in case of bus off
Stephane Grosjean <[email protected]>
can: peak_usb: always ask for BERR reporting for PCAN-USB devices
Sean Christopherson <[email protected]>
KVM: nVMX: Handle dynamic MSR intercept toggling
Sean Christopherson <[email protected]>
KVM: nVMX: Query current VMCS when determining if MSR bitmaps are in use
Sean Christopherson <[email protected]>
KVM: x86: Add helper to consolidate core logic of SET_CPUID{2} flows
David Woodhouse <[email protected]>
KVM: x86: Fix recording of guest steal time / preempted status
Mark Rutland <[email protected]>
KVM: arm64: Extract ESR_ELx.EC only
Yang Yingliang <[email protected]>
iio: core: check return value when calling dev_set_name()
Yang Yingliang <[email protected]>
iio: core: fix double free in iio_device_unregister_sysfs()
Henrik Grimler <[email protected]>
power: supply: max17042_battery: use VFSOC for capacity when no rsns
Sebastian Krzyszkowiak <[email protected]>
power: supply: max17042_battery: Prevent int underflow in set_soc_threshold
Eugene Syromiatnikov <[email protected]>
mctp: handle the struct sockaddr_mctp padding fields
Miquel Raynal <[email protected]>
mtd: rawnand: socrates: Keep the driver compatible with on-die ECC engines
Meng Li <[email protected]>
soc: fsl: dpio: use the combined functions to protect critical zone
Meng Li <[email protected]>
soc: fsl: dpio: replace smp_processor_id with raw_smp_processor_id
David Virag <[email protected]>
soc: samsung: exynos-pmu: Fix compilation when nothing selects CONFIG_MFD_CORE
Eric W. Biederman <[email protected]>
signal: Add SA_IMMUTABLE to ensure forced siganls do not get changed
Eric W. Biederman <[email protected]>
signal/mips: Update (_save|_restore)_fp_context to fail with -EFAULT
Wolfram Sang <[email protected]>
memory: renesas-rpc-if: Correct QSPI data transfer in Manual mode
Eric W. Biederman <[email protected]>
signal: Remove the bogus sigkill_pending in ptrace_stop
Dmitry Osipenko <[email protected]>
ASoC: tegra: Restore AC97 support
Dmitry Osipenko <[email protected]>
ASoC: tegra: Set default card name for Trimslice
Alok Prasad <[email protected]>
RDMA/qedr: Fix NULL deref for query_qp on the GSI QP
Kan Liang <[email protected]>
perf/x86/intel/uncore: Fix Intel ICX IIO event constraints
Kan Liang <[email protected]>
perf/x86/intel/uncore: Fix invalid unit check
Kan Liang <[email protected]>
perf/x86/intel/uncore: Support extra IMC channel on Ice Lake server
Marek Vasut <[email protected]>
rsi: Fix module dev_oper_mode parameter description
Martin Fuzzey <[email protected]>
rsi: fix rate mask set leading to P2P failure
Martin Fuzzey <[email protected]>
rsi: fix key enabled check causing unwanted encryption for vap_id > 0
Martin Fuzzey <[email protected]>
rsi: fix occasional initialisation failure with BT coex
Benjamin Li <[email protected]>
wcn36xx: handle connection loss indication
Christian König <[email protected]>
dma-buf: fix and rework dma_buf_poll v7
Reimar Döffinger <[email protected]>
libata: fix checking of DMA state
Jonas Dreßler <[email protected]>
mwifiex: Try waking the firmware until we get an interrupt
Jonas Dreßler <[email protected]>
mwifiex: Read a PCI register after writing the TX ring write pointer
Rafael J. Wysocki <[email protected]>
PM: sleep: Do not let "syscore" devices runtime-suspend during system transitions
Loic Poulain <[email protected]>
wcn36xx: Fix (QoS) null data frame bitrate/modulation
Loic Poulain <[email protected]>
wcn36xx: Fix tx_status mechanism
Loic Poulain <[email protected]>
wcn36xx: Fix HT40 capability for 2Ghz band
Maximilian Luz <[email protected]>
HID: surface-hid: Allow driver matching for target ID 1 devices
Maximilian Luz <[email protected]>
HID: surface-hid: Use correct event registry for managing HID events
Felix Fietkau <[email protected]>
mt76: mt7615: fix skb use-after-free on mac reset
Maximilian Luz <[email protected]>
platform/surface: aggregator_registry: Add support for Surface Laptop Studio
Lukas Wunner <[email protected]>
ifb: Depend on netfilter alternatively to tc
Austin Kim <[email protected]>
evm: mark evm_fixmode as __ro_after_init
Johan Hovold <[email protected]>
rtl8187: fix control-message timeouts
Ingmar Klein <[email protected]>
PCI: Mark Atheros QCA6174 to avoid bus reset
Johan Hovold <[email protected]>
ath10k: fix division by zero in send path
Johan Hovold <[email protected]>
ath10k: fix control-message timeout
Johan Hovold <[email protected]>
ath6kl: fix control-message timeout
Johan Hovold <[email protected]>
ath6kl: fix division by zero in send path
Johan Hovold <[email protected]>
mwifiex: fix division by zero in fw download path
Eric Badger <[email protected]>
EDAC/sb_edac: Fix top-of-high-memory value for Broadwell/Haswell
Krzysztof Kozlowski <[email protected]>
regulator: dt-bindings: samsung,s5m8767: correct s5m8767,pmic-buck-default-dvs-idx property
Krzysztof Kozlowski <[email protected]>
regulator: s5m8767: do not use reset value as DVS voltage if GPIO DVS is disabled
Zev Weiss <[email protected]>
hwmon: (pmbus/lm25066) Add offset coefficients
Guoqing Jiang <[email protected]>
md/raid1: only allocate write behind bio for WriteMostly device
Corey Minyard <[email protected]>
ipmi:watchdog: Set panic count to proper value on a panic
Ondrej Mosnacek <[email protected]>
selinux: fix race condition when computing ocontext SIDs
Masami Hiramatsu <[email protected]>
ia64: kprobes: Fix to pass correct trampoline address to the handler
Laurent Vivier <[email protected]>
KVM: PPC: Tick accounting should defer vtime accounting 'til after IRQ handling
Andreas Gruenbacher <[email protected]>
powerpc/kvm: Fix kvm_use_magic_page
Sean Christopherson <[email protected]>
KVM: VMX: Unregister posted interrupt wakeup handler on hardware unsetup
Sean Christopherson <[email protected]>
KVM: x86/mmu: Drop a redundant, broken remote TLB flush
Anand Jain <[email protected]>
btrfs: call btrfs_check_rw_degradable only if there is a missing device
Filipe Manana <[email protected]>
btrfs: fix lost error handling when replaying directory deletes
Li Zhang <[email protected]>
btrfs: clear MISSING device status bit in btrfs_close_one_device
Peter Zijlstra <[email protected]>
x86/iopl: Fake iopl(3) CLI/STI usage
Sean Christopherson <[email protected]>
x86/irq: Ensure PI wakeup handler is unregistered before module unload
Jane Malalane <[email protected]>
x86/cpu: Fix migration safety with X86_BUG_NULL_SEL
Tom Lendacky <[email protected]>
x86/sme: Use #define USE_EARLY_PGTABLE_L5 in mem_encrypt_identity.c
Miklos Szeredi <[email protected]>
fuse: fix page stealing
yangerkun <[email protected]>
ext4: refresh the ext4_ext_path struct after dropping i_data_sem.
yangerkun <[email protected]>
ext4: ensure enough credits in ext4_ext_shift_path_extents
Shaoying Xu <[email protected]>
ext4: fix lazy initialization next schedule time computation in more granular unit
Eric Whitney <[email protected]>
Revert "ext4: enforce buffer head state assertion in ext4_da_map_blocks"
Takashi Iwai <[email protected]>
ALSA: timer: Unconditionally unlink slave instances, too
Wang Wensheng <[email protected]>
ALSA: timer: Fix use-after-free problem
Takashi Iwai <[email protected]>
ALSA: PCM: Fix NULL dereference at mmap checks
Takashi Iwai <[email protected]>
ALSA: pci: rme: Fix unaligned buffer addresses
Austin Kim <[email protected]>
ALSA: synth: missing check for possible NULL after the call to kstrdup
Takashi Iwai <[email protected]>
ALSA: hda: Free card instance properly at probe errors
Alexander Tsoy <[email protected]>
ALSA: usb-audio: Add registration quirk for JBL Quantum 400
Jason Ormes <[email protected]>
ALSA: usb-audio: Line6 HX-Stomp XL USB_ID for 48k-fixed quirk
Pavel Skripkin <[email protected]>
ALSA: mixer: fix deadlock in snd_mixer_oss_set_volume
Takashi Iwai <[email protected]>
ALSA: mixer: oss: Fix racy access to slots
Johan Hovold <[email protected]>
ALSA: line6: fix control and interrupt message timeouts
Johan Hovold <[email protected]>
ALSA: 6fire: fix control and bulk message timeouts
Johan Hovold <[email protected]>
ALSA: ua101: fix division by zero at probe
Kai-Heng Feng <[email protected]>
ALSA: hda/realtek: Add quirk for HP EliteBook 840 G7 mute LED
Takashi Iwai <[email protected]>
ALSA: hda/realtek: Add quirk for ASUS UX550VE
Jaroslav Kysela <[email protected]>
ALSA: hda/realtek: Add a quirk for Acer Spin SP513-54N
Jeremy Soller <[email protected]>
ALSA: hda/realtek: Headset fixup for Clevo NH77HJQ
Tim Crawford <[email protected]>
ALSA: hda/realtek: Add quirk for Clevo PC70HS
Takashi Iwai <[email protected]>
ALSA: hda/realtek: Add a quirk for HP OMEN 15 mute LED
Johnathon Clark <[email protected]>
ALSA: hda/realtek: Fix mic mute LED for the HP Spectre x360 14
Ricardo Ribalda <[email protected]>
media: v4l2-ioctl: Fix check_ext_ctrls
Sean Young <[email protected]>
media: ir-kbd-i2c: improve responsiveness of hauppauge zilog receivers
Chen-Yu Tsai <[email protected]>
media: rkvdec: Support dynamic resolution changes
Sean Young <[email protected]>
media: ite-cir: IR receiver stop working after receive overflow
Chen-Yu Tsai <[email protected]>
media: rkvdec: Do not override sizeimage for output format
Tang Bin <[email protected]>
crypto: s5p-sss - Add error handling in s5p_aes_probe()
jing yangyang <[email protected]>
firmware/psci: fix application of sizeof to pointer
Dan Carpenter <[email protected]>
tpm: Check for integer overflow in tpm2_map_response_body()
Helge Deller <[email protected]>
parisc: Fix ptrace check on syscall return
Helge Deller <[email protected]>
parisc: Fix set_fixmap() on PA1.x CPUs
Pavel Begunkov <[email protected]>
io-wq: remove worker to owner tw dependency
Sungjong Seo <[email protected]>
exfat: fix incorrect loading of i_blocks for large files
Christian Löhle <[email protected]>
mmc: dw_mmc: Dont wait for DRTO on Write RSP error
Derong Liu <[email protected]>
mmc: mtk-sd: Add wait dma stop done flow
Ziyang Xuan <[email protected]>
char: xillybus: fix msg_ep UAF in xillyusb_probe()
Ben Skeggs <[email protected]>
ce/gf100: fix incorrect CE0 address calculation on some GPUs
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix use after free in eh_abort path
Arun Easi <[email protected]>
scsi: qla2xxx: Fix kernel crash when accessing port_speed sysfs file
Arun Easi <[email protected]>
scsi: qla2xxx: Fix crash in NVMe abort path
James Smart <[email protected]>
scsi: lpfc: Fix FCP I/O flush functionality for TMF routines
James Smart <[email protected]>
scsi: lpfc: Don't release final kref on Fport node while ABTS outstanding
Tadeusz Struk <[email protected]>
scsi: core: Remove command size deduction from scsi_setup_scsi_cmnd()
Ewan D. Milne <[email protected]>
scsi: core: Avoid leaving shost->last_reset with stale value if EH does not run
Tadeusz Struk <[email protected]>
scsi: scsi_ioctl: Validate command size
Jan Kara <[email protected]>
ocfs2: fix data corruption on truncate
Damien Le Moal <[email protected]>
libata: fix read log timeout value
Takashi Iwai <[email protected]>
Input: i8042 - Add quirk for Fujitsu Lifebook T725
Phoenix Huang <[email protected]>
Input: elantench - fix misreporting trackpoint coordinates
Johan Hovold <[email protected]>
Input: iforce - fix control-message timeout
Nehal Bakulchandra Shah <[email protected]>
usb: xhci: Enable runtime-pm by default on AMD Yellow Carp platform
Mathias Nyman <[email protected]>
xhci: Fix USB 3.1 enumeration issues by increasing roothub power-on-good delay
-------------
Diffstat:
Documentation/admin-guide/kernel-parameters.txt | 7 + .../devicetree/bindings/iio/dac/adi,ad5766.yaml | 2 +- .../bindings/regulator/samsung,s5m8767.txt | 23 +- Documentation/filesystems/fscrypt.rst | 10 +- Makefile | 4 +- arch/alpha/include/asm/processor.h | 2 +- arch/alpha/kernel/process.c | 5 +- arch/arc/include/asm/processor.h | 2 +- arch/arc/kernel/stacktrace.c | 4 +- arch/arm/Makefile | 22 +- arch/arm/boot/dts/at91-tse850-3.dts | 2 +- arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 2 +- arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 2 +- arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 2 +- arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 2 +- arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 2 +- arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 2 +- arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 2 +- arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts | 2 +- arch/arm/boot/dts/bcm53016-meraki-mr32.dts | 2 +- arch/arm/boot/dts/bcm94708.dts | 2 +- arch/arm/boot/dts/bcm94709.dts | 2 +- arch/arm/boot/dts/omap3-gta04.dtsi | 2 +- arch/arm/boot/dts/qcom-msm8974.dtsi | 4 +- arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 8 +- arch/arm/boot/dts/stm32mp151.dtsi | 16 +- arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 2 +- arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 2 +- arch/arm/include/asm/processor.h | 2 +- arch/arm/kernel/process.c | 4 +- arch/arm/kernel/stacktrace.c | 3 +- arch/arm/mach-s3c/irq-s3c24xx.c | 22 +- arch/arm/mm/Kconfig | 2 +- arch/arm/mm/kasan_init.c | 2 +- arch/arm/mm/mmu.c | 4 +- arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 2 +- .../boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 4 +- .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 4 +- arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi | 4 +- .../boot/dts/amlogic/meson-sm1-bananapi-m5.dts | 2 +- .../boot/dts/amlogic/meson-sm1-khadas-vim3l.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 6 +- arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 2 +- arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8916.dtsi | 8 +- arch/arm64/boot/dts/qcom/pm8916.dtsi | 1 - arch/arm64/boot/dts/qcom/pmi8994.dtsi | 2 +- .../arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 2 +- .../arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 8 +- arch/arm64/boot/dts/qcom/sc7180.dtsi | 52 ++--- arch/arm64/boot/dts/qcom/sc7280.dtsi | 8 +- arch/arm64/boot/dts/qcom/sdm845.dtsi | 6 +- .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 1 + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +- arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 6 +- arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 16 +- arch/arm64/include/asm/esr.h | 1 + arch/arm64/include/asm/pgtable.h | 12 +- arch/arm64/include/asm/processor.h | 2 +- arch/arm64/kernel/cpufeature.c | 10 +- arch/arm64/kernel/process.c | 4 +- arch/arm64/kernel/vdso32/Makefile | 3 +- arch/arm64/kvm/arm.c | 30 ++- arch/arm64/kvm/hyp/hyp-entry.S | 2 +- arch/arm64/kvm/hyp/nvhe/host.S | 2 +- arch/arm64/mm/mmu.c | 5 + arch/csky/include/asm/processor.h | 2 +- arch/csky/kernel/stacktrace.c | 5 +- arch/h8300/include/asm/processor.h | 2 +- arch/h8300/kernel/process.c | 5 +- arch/hexagon/include/asm/processor.h | 2 +- arch/hexagon/kernel/process.c | 4 +- arch/ia64/Kconfig.debug | 2 +- arch/ia64/include/asm/processor.h | 2 +- arch/ia64/kernel/kprobes.c | 9 +- arch/ia64/kernel/process.c | 5 +- arch/m68k/Kconfig.machine | 1 + arch/m68k/include/asm/processor.h | 2 +- arch/m68k/kernel/process.c | 4 +- arch/microblaze/include/asm/processor.h | 2 +- arch/microblaze/kernel/process.c | 2 +- arch/mips/Kbuild.platforms | 2 +- arch/mips/Kconfig | 1 + arch/mips/Makefile | 2 + arch/mips/include/asm/cmpxchg.h | 5 +- arch/mips/include/asm/mips-cm.h | 12 +- arch/mips/include/asm/processor.h | 2 +- arch/mips/kernel/mips-cm.c | 21 +- arch/mips/kernel/process.c | 8 +- arch/mips/kernel/r2300_fpu.S | 4 +- arch/mips/kernel/syscall.c | 9 - arch/mips/lantiq/xway/dma.c | 23 +- arch/nds32/include/asm/processor.h | 2 +- arch/nds32/kernel/process.c | 7 +- arch/nios2/include/asm/processor.h | 2 +- arch/nios2/kernel/process.c | 5 +- arch/openrisc/include/asm/processor.h | 2 +- arch/openrisc/kernel/dma.c | 4 +- arch/openrisc/kernel/process.c | 2 +- arch/openrisc/kernel/smp.c | 6 +- arch/parisc/include/asm/pgtable.h | 10 +- arch/parisc/include/asm/processor.h | 2 +- arch/parisc/kernel/cache.c | 4 +- arch/parisc/kernel/entry.S | 2 +- arch/parisc/kernel/process.c | 5 +- arch/parisc/kernel/smp.c | 19 +- arch/parisc/kernel/unwind.c | 21 +- arch/parisc/kernel/vmlinux.lds.S | 3 +- arch/parisc/mm/fixmap.c | 5 +- arch/parisc/mm/init.c | 4 +- arch/powerpc/Kconfig | 6 +- arch/powerpc/include/asm/nohash/32/pgtable.h | 19 +- arch/powerpc/include/asm/nohash/32/pte-8xx.h | 22 ++ arch/powerpc/include/asm/nohash/64/pgtable.h | 5 - arch/powerpc/include/asm/nohash/pte-book3e.h | 18 +- arch/powerpc/include/asm/paravirt.h | 18 +- arch/powerpc/include/asm/processor.h | 2 +- arch/powerpc/kernel/firmware.c | 7 +- arch/powerpc/kernel/head_booke.h | 15 +- arch/powerpc/kernel/interrupt.c | 2 +- arch/powerpc/kernel/kvm.c | 2 +- arch/powerpc/kernel/process.c | 9 +- arch/powerpc/kvm/book3s_hv.c | 30 ++- arch/powerpc/kvm/booke.c | 16 +- arch/powerpc/lib/feature-fixups.c | 11 + arch/powerpc/mm/mem.c | 2 +- arch/powerpc/mm/nohash/tlb_low_64e.S | 8 +- arch/powerpc/mm/pgtable_32.c | 2 +- arch/powerpc/net/bpf_jit_comp.c | 2 +- arch/powerpc/perf/power10-events-list.h | 8 +- arch/powerpc/perf/power10-pmu.c | 44 ++-- arch/powerpc/platforms/44x/fsp2.c | 2 + arch/powerpc/platforms/85xx/Makefile | 4 +- arch/powerpc/platforms/85xx/mpc85xx_pm_ops.c | 7 +- arch/powerpc/platforms/85xx/smp.c | 12 +- arch/powerpc/platforms/book3s/vas-api.c | 4 +- arch/powerpc/platforms/powernv/opal-prd.c | 12 +- arch/powerpc/platforms/pseries/mobility.c | 34 +++ arch/powerpc/xmon/xmon.c | 3 +- arch/riscv/include/asm/processor.h | 2 +- arch/riscv/kernel/stacktrace.c | 12 +- arch/s390/include/asm/processor.h | 2 +- arch/s390/kernel/perf_cpum_cf.c | 4 +- arch/s390/kernel/process.c | 4 +- arch/s390/kernel/uv.c | 2 +- arch/s390/kvm/priv.c | 2 + arch/s390/kvm/pv.c | 21 +- arch/s390/mm/gmap.c | 11 +- arch/s390/mm/pgtable.c | 70 ++++-- arch/sh/include/asm/processor_32.h | 2 +- arch/sh/kernel/cpu/fpu.c | 10 +- arch/sh/kernel/process_32.c | 5 +- arch/sparc/boot/Makefile | 8 +- arch/sparc/include/asm/processor_32.h | 2 +- arch/sparc/include/asm/processor_64.h | 2 +- arch/sparc/kernel/process_32.c | 5 +- arch/sparc/kernel/process_64.c | 5 +- arch/um/include/asm/processor-generic.h | 2 +- arch/um/kernel/process.c | 5 +- arch/x86/crypto/aesni-intel_glue.c | 2 +- arch/x86/events/intel/core.c | 5 +- arch/x86/events/intel/ds.c | 5 +- arch/x86/events/intel/uncore_discovery.h | 2 +- arch/x86/events/intel/uncore_snbep.c | 16 +- arch/x86/hyperv/hv_init.c | 5 +- arch/x86/include/asm/insn-eval.h | 1 + arch/x86/include/asm/irq_stack.h | 37 ++- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/include/asm/page_64_types.h | 2 +- arch/x86/include/asm/processor.h | 3 +- arch/x86/include/asm/stacktrace.h | 10 + arch/x86/include/asm/traps.h | 6 +- arch/x86/kernel/cpu/amd.c | 2 + arch/x86/kernel/cpu/common.c | 44 +++- arch/x86/kernel/cpu/cpu.h | 1 + arch/x86/kernel/cpu/hygon.c | 2 + arch/x86/kernel/cpu/mce/intel.c | 5 +- arch/x86/kernel/dumpstack_64.c | 6 + arch/x86/kernel/irq.c | 4 +- arch/x86/kernel/process.c | 66 ++---- arch/x86/kernel/traps.c | 60 +++-- arch/x86/kvm/cpuid.c | 47 ++-- arch/x86/kvm/mmu/mmu.c | 6 +- arch/x86/kvm/vmx/nested.c | 103 ++++---- arch/x86/kvm/vmx/vmx.c | 68 +----- arch/x86/kvm/vmx/vmx.h | 63 +++++ arch/x86/kvm/x86.c | 108 ++++++--- arch/x86/lib/insn-eval.c | 2 +- arch/x86/lib/insn.c | 5 +- arch/x86/mm/fault.c | 20 +- arch/x86/mm/mem_encrypt_identity.c | 9 + arch/xtensa/include/asm/processor.h | 2 +- arch/xtensa/kernel/process.c | 5 +- block/blk-cgroup.c | 10 + block/blk-mq.c | 5 +- block/blk-wbt.c | 3 + block/blk-zoned.c | 15 +- block/blk.h | 6 + block/genhd.c | 8 +- block/ioctl.c | 24 +- crypto/Kconfig | 2 +- crypto/algapi.c | 73 ++++-- crypto/api.c | 52 ++++- crypto/internal.h | 10 + crypto/pcrypt.c | 12 +- crypto/tcrypt.c | 5 +- drivers/acpi/ac.c | 19 ++ drivers/acpi/acpica/acglobal.h | 2 + drivers/acpi/acpica/hwesleep.c | 8 +- drivers/acpi/acpica/hwsleep.c | 11 +- drivers/acpi/acpica/hwxfsleep.c | 7 + drivers/acpi/battery.c | 2 +- drivers/acpi/glue.c | 25 ++ drivers/acpi/internal.h | 1 + drivers/acpi/pmic/intel_pmic.c | 51 ++-- drivers/acpi/power.c | 86 +++---- drivers/acpi/resource.c | 56 ++++- drivers/acpi/scan.c | 6 + drivers/ata/libata-core.c | 2 +- drivers/ata/libata-eh.c | 8 + drivers/auxdisplay/ht16k33.c | 66 +++--- drivers/auxdisplay/img-ascii-lcd.c | 10 + drivers/base/component.c | 5 +- drivers/base/core.c | 4 +- drivers/base/power/main.c | 93 +++++--- drivers/block/ataflop.c | 141 ++++++----- drivers/block/floppy.c | 9 +- drivers/block/nbd.c | 24 +- drivers/block/zram/zram_drv.c | 2 +- drivers/bluetooth/btmtkuart.c | 13 +- drivers/bluetooth/hci_h5.c | 28 ++- drivers/bus/ti-sysc.c | 65 +++++- drivers/char/hw_random/mtk-rng.c | 9 +- drivers/char/ipmi/ipmi_msghandler.c | 10 +- drivers/char/ipmi/ipmi_watchdog.c | 25 +- drivers/char/ipmi/kcs_bmc_serio.c | 4 +- drivers/char/tpm/tpm2-space.c | 3 + drivers/char/tpm/tpm_tis_core.c | 26 ++- drivers/char/tpm/tpm_tis_core.h | 4 + drivers/char/tpm/tpm_tis_spi_main.c | 1 + drivers/char/xillybus/xillyusb.c | 1 + drivers/clk/at91/clk-master.c | 6 +- drivers/clk/at91/clk-sam9x60-pll.c | 4 +- drivers/clk/at91/pmc.c | 5 + drivers/clk/mvebu/ap-cpu-clk.c | 14 +- drivers/clocksource/Kconfig | 1 + drivers/cpufreq/cpufreq.c | 7 + drivers/cpufreq/intel_pstate.c | 35 ++- drivers/cpuidle/sysfs.c | 5 +- drivers/crypto/caam/caampkc.c | 19 +- drivers/crypto/caam/regs.h | 3 + drivers/crypto/ccree/cc_driver.c | 3 +- drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c | 1 + drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c | 31 +++ drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.h | 10 + drivers/crypto/qat/qat_common/adf_accel_devices.h | 1 + drivers/crypto/qat/qat_common/adf_init.c | 5 + drivers/crypto/qat/qat_common/adf_pf2vf_msg.c | 13 ++ drivers/crypto/qat/qat_common/adf_vf_isr.c | 6 + drivers/crypto/s5p-sss.c | 2 + drivers/cxl/pci.c | 2 +- drivers/dma-buf/dma-buf.c | 153 ++++++------ drivers/dma/at_xdmac.c | 53 +++-- drivers/dma/bestcomm/ata.c | 2 +- drivers/dma/bestcomm/bestcomm.c | 22 +- drivers/dma/bestcomm/fec.c | 4 +- drivers/dma/bestcomm/gen_bd.c | 4 +- drivers/dma/dmaengine.h | 2 +- drivers/dma/idxd/device.c | 3 +- drivers/dma/idxd/dma.c | 5 +- drivers/dma/idxd/init.c | 14 +- drivers/dma/stm32-dma.c | 23 +- drivers/dma/tegra210-adma.c | 2 +- drivers/dma/ti/k3-udma.c | 32 ++- drivers/edac/amd64_edac.c | 22 +- drivers/edac/sb_edac.c | 2 +- drivers/firmware/psci/psci_checker.c | 2 +- drivers/firmware/qcom_scm.c | 2 +- drivers/gpio/gpio-realtek-otto.c | 2 +- drivers/gpu/drm/Kconfig | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 15 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 24 +- drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 24 +- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 24 +- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 24 +- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 32 +-- drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 19 +- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 28 +-- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 44 ++-- drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 17 +- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 1 + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 7 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 2 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 2 +- .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 18 +- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 3 +- .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 6 +- .../display/dc/dml/dcn20/display_rq_dlg_calc_20.h | 4 +- .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 6 +- .../dc/dml/dcn20/display_rq_dlg_calc_20v2.h | 4 +- .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 62 ++--- .../display/dc/dml/dcn21/display_rq_dlg_calc_21.h | 4 +- .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 72 +++--- .../display/dc/dml/dcn30/display_rq_dlg_calc_30.h | 4 +- .../display/dc/dml/dcn31/display_rq_dlg_calc_31.c | 68 +++--- .../display/dc/dml/dcn31/display_rq_dlg_calc_31.h | 4 +- .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 4 +- .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 8 +- .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 10 +- .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 2 + .../gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.h | 13 ++ .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 12 +- .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 4 + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 14 +- drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 89 +++---- drivers/gpu/drm/bridge/analogix/anx7625.c | 12 +- drivers/gpu/drm/bridge/ite-it66121.c | 21 +- drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 9 +- drivers/gpu/drm/bridge/nwl-dsi.c | 35 +++ drivers/gpu/drm/drm_panel_orientation_quirks.c | 35 ++- drivers/gpu/drm/drm_plane_helper.c | 1 - drivers/gpu/drm/i915/display/intel_fb.c | 5 +- drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 2 +- drivers/gpu/drm/imx/imx-drm-core.c | 2 - drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 6 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 8 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 4 + drivers/gpu/drm/msm/dsi/dsi.h | 2 + drivers/gpu/drm/msm/dsi/dsi_host.c | 72 +++--- drivers/gpu/drm/msm/dsi/dsi_manager.c | 16 ++ drivers/gpu/drm/msm/msm_gem.c | 5 +- drivers/gpu/drm/msm/msm_gpu.c | 2 +- drivers/gpu/drm/msm/msm_submitqueue.c | 1 + drivers/gpu/drm/nouveau/nouveau_gem.c | 2 +- drivers/gpu/drm/nouveau/nouveau_svm.c | 4 + drivers/gpu/drm/nouveau/nvkm/engine/ce/gt215.c | 2 +- drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 3 +- drivers/gpu/drm/radeon/radeon_gem.c | 2 +- drivers/gpu/drm/sun4i/sun8i_csc.h | 4 +- drivers/gpu/drm/ttm/ttm_bo_vm.c | 99 +------- drivers/gpu/drm/v3d/v3d_gem.c | 4 +- drivers/gpu/drm/virtio/virtgpu_vq.c | 8 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 4 - drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 72 +----- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 3 - drivers/hid/hid-u2fzero.c | 10 +- drivers/hid/surface-hid/surface_hid.c | 4 +- drivers/hwmon/hwmon.c | 6 +- drivers/hwmon/pmbus/lm25066.c | 25 +- drivers/hwtracing/coresight/coresight-cti-core.c | 2 +- drivers/hwtracing/coresight/coresight-trbe.c | 10 +- drivers/i2c/busses/i2c-i801.c | 5 +- drivers/i2c/busses/i2c-mt65xx.c | 2 +- drivers/i2c/busses/i2c-xlr.c | 6 +- drivers/iio/accel/st_accel_i2c.c | 4 +- drivers/iio/accel/st_accel_spi.c | 4 +- drivers/iio/adc/ti-tsc2046.c | 2 +- drivers/iio/dac/ad5446.c | 9 +- drivers/iio/dac/ad5766.c | 6 +- drivers/iio/dac/ad5770r.c | 2 +- drivers/iio/gyro/st_gyro_i2c.c | 4 +- drivers/iio/gyro/st_gyro_spi.c | 4 +- drivers/iio/imu/adis.c | 4 +- drivers/iio/industrialio-buffer.c | 28 ++- drivers/iio/industrialio-core.c | 9 +- drivers/iio/magnetometer/st_magn_i2c.c | 4 +- drivers/iio/magnetometer/st_magn_spi.c | 4 +- drivers/iio/pressure/st_pressure_i2c.c | 4 +- drivers/iio/pressure/st_pressure_spi.c | 8 +- drivers/infiniband/core/uverbs_cmd.c | 3 - drivers/infiniband/hw/bnxt_re/qplib_fp.c | 3 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 6 +- drivers/infiniband/hw/mlx4/qp.c | 4 +- drivers/infiniband/hw/qedr/verbs.c | 15 +- drivers/infiniband/sw/rxe/rxe_param.h | 2 +- drivers/input/joystick/iforce/iforce-usb.c | 2 +- drivers/input/misc/ariel-pwrbutton.c | 7 + drivers/input/mouse/elantech.c | 13 ++ drivers/input/serio/i8042-x86ia64io.h | 14 ++ drivers/input/touchscreen/st1232.c | 2 +- drivers/iommu/dma-iommu.c | 52 ++--- drivers/iommu/mtk_iommu.c | 4 +- drivers/irqchip/irq-bcm6345-l1.c | 2 +- drivers/irqchip/irq-sifive-plic.c | 8 +- drivers/leds/led-triggers.c | 41 ++-- drivers/mailbox/mtk-cmdq-mailbox.c | 11 +- drivers/md/bcache/btree.c | 2 +- drivers/md/bcache/super.c | 2 +- drivers/md/md.c | 11 +- drivers/md/raid1.c | 2 +- drivers/media/common/videobuf2/videobuf2-core.c | 42 ++-- .../media/common/videobuf2/videobuf2-dma-contig.c | 36 +-- drivers/media/common/videobuf2/videobuf2-dma-sg.c | 33 +-- drivers/media/common/videobuf2/videobuf2-vmalloc.c | 30 +-- drivers/media/dvb-frontends/mn88443x.c | 18 +- drivers/media/i2c/Kconfig | 1 + drivers/media/i2c/imx258.c | 12 +- drivers/media/i2c/ir-kbd-i2c.c | 1 + drivers/media/i2c/mt9p031.c | 28 ++- drivers/media/i2c/tda1997x.c | 8 +- drivers/media/pci/cx23885/cx23885-alsa.c | 3 +- drivers/media/pci/ivtv/ivtvfb.c | 4 +- drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 27 ++- drivers/media/platform/allegro-dvt/allegro-core.c | 9 + drivers/media/platform/atmel/atmel-isc-base.c | 25 +- drivers/media/platform/atmel/atmel-isc.h | 2 + drivers/media/platform/atmel/atmel-sama5d2-isc.c | 39 ++-- drivers/media/platform/atmel/atmel-sama7g5-isc.c | 22 +- drivers/media/platform/imx-jpeg/mxc-jpeg.c | 6 + drivers/media/platform/meson/ge2d/ge2d.c | 6 +- drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 8 +- drivers/media/platform/mtk-vpu/mtk_vpu.c | 5 +- drivers/media/platform/qcom/venus/pm_helpers.c | 8 +- drivers/media/platform/rcar-vin/rcar-csi2.c | 2 + drivers/media/platform/rcar-vin/rcar-dma.c | 3 +- drivers/media/platform/s5p-mfc/s5p_mfc.c | 6 +- drivers/media/platform/stm32/stm32-dcmi.c | 19 +- .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 6 +- drivers/media/radio/radio-wl1273.c | 2 +- drivers/media/radio/si470x/radio-si470x-i2c.c | 2 +- drivers/media/radio/si470x/radio-si470x-usb.c | 2 +- drivers/media/rc/ir_toy.c | 2 +- drivers/media/rc/ite-cir.c | 2 +- drivers/media/rc/mceusb.c | 1 + drivers/media/spi/cxd2880-spi.c | 2 +- drivers/media/test-drivers/vidtv/vidtv_bridge.c | 1 + drivers/media/usb/dvb-usb/az6027.c | 1 + drivers/media/usb/dvb-usb/dibusb-common.c | 2 +- drivers/media/usb/em28xx/em28xx-cards.c | 5 +- drivers/media/usb/em28xx/em28xx-core.c | 5 +- drivers/media/usb/tm6000/tm6000-video.c | 3 +- drivers/media/usb/ttusb-dec/ttusb_dec.c | 10 +- drivers/media/usb/uvc/uvc_driver.c | 7 +- drivers/media/usb/uvc/uvc_v4l2.c | 7 +- drivers/media/usb/uvc/uvc_video.c | 5 + drivers/media/v4l2-core/v4l2-ioctl.c | 67 ++++-- drivers/memory/fsl_ifc.c | 13 +- drivers/memory/renesas-rpc-if.c | 113 ++++++--- drivers/memstick/core/ms_block.c | 2 +- drivers/memstick/host/jmb38x_ms.c | 2 +- drivers/memstick/host/r592.c | 8 +- drivers/mfd/Kconfig | 1 + drivers/mfd/altera-sysmgr.c | 2 +- drivers/mfd/dln2.c | 18 ++ drivers/mfd/mfd-core.c | 2 + drivers/mfd/motorola-cpcap.c | 8 + drivers/mfd/sprd-sc27xx-spi.c | 7 + drivers/mmc/host/dw_mmc.c | 3 +- drivers/mmc/host/moxart-mmc.c | 16 +- drivers/mmc/host/mtk-sd.c | 5 + drivers/mmc/host/mxs-mmc.c | 10 + drivers/mmc/host/sdhci-omap.c | 18 +- drivers/most/most_usb.c | 5 +- drivers/mtd/mtdcore.c | 4 +- drivers/mtd/nand/raw/ams-delta.c | 12 +- drivers/mtd/nand/raw/arasan-nand-controller.c | 15 ++ drivers/mtd/nand/raw/au1550nd.c | 12 +- drivers/mtd/nand/raw/fsmc_nand.c | 4 +- drivers/mtd/nand/raw/gpio.c | 12 +- drivers/mtd/nand/raw/intel-nand-controller.c | 5 + drivers/mtd/nand/raw/mpc5121_nfc.c | 12 +- drivers/mtd/nand/raw/orion_nand.c | 12 +- drivers/mtd/nand/raw/pasemi_nand.c | 12 +- drivers/mtd/nand/raw/plat_nand.c | 12 +- drivers/mtd/nand/raw/socrates_nand.c | 12 +- drivers/mtd/nand/raw/xway_nand.c | 12 +- drivers/mtd/spi-nor/controllers/hisi-sfc.c | 1 - drivers/net/Kconfig | 2 +- drivers/net/bonding/bond_sysfs_slave.c | 36 +-- drivers/net/can/dev/bittiming.c | 2 +- drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 6 +- drivers/net/can/usb/etas_es58x/es58x_core.c | 6 +- drivers/net/can/usb/peak_usb/pcan_usb.c | 17 +- drivers/net/dsa/lantiq_gswip.c | 28 ++- drivers/net/dsa/mv88e6xxx/chip.c | 5 +- drivers/net/dsa/ocelot/felix.c | 9 +- drivers/net/dsa/rtl8366.c | 2 +- drivers/net/dsa/rtl8366rb.c | 2 +- drivers/net/ethernet/amd/xgbe/xgbe-common.h | 8 + drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 20 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 +- drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 13 +- drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h | 13 -- drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 7 +- drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 2 + .../chelsio/inline_crypto/chtls/chtls_cm.c | 2 +- .../chelsio/inline_crypto/chtls/chtls_cm.h | 2 +- drivers/net/ethernet/dec/tulip/winbond-840.c | 2 +- drivers/net/ethernet/fealnx.c | 2 +- drivers/net/ethernet/freescale/enetc/enetc_qos.c | 18 +- drivers/net/ethernet/google/gve/gve.h | 17 +- drivers/net/ethernet/google/gve/gve_adminq.h | 1 + drivers/net/ethernet/google/gve/gve_main.c | 48 +++- drivers/net/ethernet/google/gve/gve_rx.c | 7 +- drivers/net/ethernet/google/gve/gve_tx.c | 23 +- drivers/net/ethernet/google/gve/gve_tx_dqo.c | 84 +++---- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 20 +- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 10 +- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 6 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 77 +++--- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 4 +- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 10 +- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 4 +- drivers/net/ethernet/ibm/ibmvnic.c | 21 +- drivers/net/ethernet/intel/ice/ice.h | 7 +- drivers/net/ethernet/intel/ice/ice_base.c | 2 +- drivers/net/ethernet/intel/ice/ice_devlink.c | 109 ++++++--- drivers/net/ethernet/intel/ice/ice_devlink.h | 6 +- drivers/net/ethernet/intel/ice/ice_lib.c | 3 +- drivers/net/ethernet/intel/ice/ice_main.c | 4 +- drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 22 +- drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 9 + drivers/net/ethernet/intel/igc/igc_ptp.c | 2 +- drivers/net/ethernet/litex/litex_liteeth.c | 1 - drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 38 +-- drivers/net/ethernet/marvell/octeontx2/Kconfig | 1 + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 78 ++++--- drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 18 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 + .../ethernet/mellanox/mlx5/core/sf/dev/driver.c | 2 + .../net/ethernet/netronome/nfp/nfp_net_common.c | 8 +- drivers/net/ethernet/qlogic/qede/qede_main.c | 12 +- drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 2 - drivers/net/ethernet/ti/cpsw_ale.c | 6 +- drivers/net/ethernet/ti/davinci_emac.c | 16 +- drivers/net/ifb.c | 2 + drivers/net/phy/micrel.c | 9 +- drivers/net/phy/phy.c | 7 +- drivers/net/phy/phylink.c | 7 +- drivers/net/vrf.c | 28 ++- drivers/net/wireless/ath/ath10k/core.c | 11 +- drivers/net/wireless/ath/ath10k/coredump.c | 11 +- drivers/net/wireless/ath/ath10k/coredump.h | 7 + drivers/net/wireless/ath/ath10k/mac.c | 37 ++- drivers/net/wireless/ath/ath10k/qmi.c | 3 +- drivers/net/wireless/ath/ath10k/sdio.c | 5 +- drivers/net/wireless/ath/ath10k/snoc.c | 77 ++++++ drivers/net/wireless/ath/ath10k/snoc.h | 5 + drivers/net/wireless/ath/ath10k/usb.c | 7 +- drivers/net/wireless/ath/ath10k/wmi.c | 4 + drivers/net/wireless/ath/ath10k/wmi.h | 3 + drivers/net/wireless/ath/ath11k/dbring.c | 16 +- drivers/net/wireless/ath/ath11k/dp_rx.c | 13 +- drivers/net/wireless/ath/ath11k/mac.c | 2 +- drivers/net/wireless/ath/ath11k/qmi.c | 4 +- drivers/net/wireless/ath/ath11k/reg.c | 11 +- drivers/net/wireless/ath/ath11k/reg.h | 2 +- drivers/net/wireless/ath/ath11k/wmi.c | 40 ++-- drivers/net/wireless/ath/ath11k/wmi.h | 3 +- drivers/net/wireless/ath/ath6kl/usb.c | 7 +- drivers/net/wireless/ath/ath9k/main.c | 4 +- drivers/net/wireless/ath/dfs_pattern_detector.c | 10 +- drivers/net/wireless/ath/wcn36xx/dxe.c | 49 ++-- drivers/net/wireless/ath/wcn36xx/hal.h | 32 +++ drivers/net/wireless/ath/wcn36xx/main.c | 21 +- drivers/net/wireless/ath/wcn36xx/smd.c | 126 +++++++++- drivers/net/wireless/ath/wcn36xx/smd.h | 1 + drivers/net/wireless/ath/wcn36xx/txrx.c | 64 ++--- drivers/net/wireless/ath/wcn36xx/txrx.h | 3 +- drivers/net/wireless/broadcom/b43/phy_g.c | 2 +- drivers/net/wireless/broadcom/b43legacy/radio.c | 2 +- .../net/wireless/broadcom/brcm80211/brcmfmac/dmi.c | 10 + drivers/net/wireless/intel/iwlwifi/fw/pnvm.c | 13 +- drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 5 +- drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 3 + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 6 +- drivers/net/wireless/marvell/libertas/if_usb.c | 2 + drivers/net/wireless/marvell/libertas_tf/if_usb.c | 2 + drivers/net/wireless/marvell/mwifiex/11n.c | 5 +- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 32 +-- drivers/net/wireless/marvell/mwifiex/pcie.c | 36 ++- drivers/net/wireless/marvell/mwifiex/usb.c | 16 ++ drivers/net/wireless/marvell/mwl8k.c | 2 +- drivers/net/wireless/mediatek/mt76/debugfs.c | 10 +- drivers/net/wireless/mediatek/mt76/mt76.h | 8 +- .../net/wireless/mediatek/mt76/mt7615/debugfs.c | 29 ++- drivers/net/wireless/mediatek/mt76/mt7615/init.c | 6 +- drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 60 ++--- drivers/net/wireless/mediatek/mt76/mt7615/main.c | 4 +- drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 18 +- .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 30 ++- .../net/wireless/mediatek/mt76/mt76_connac_mcu.h | 8 +- drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 13 +- drivers/net/wireless/mediatek/mt76/mt7915/init.c | 10 +- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7915/mac.h | 3 +- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 22 +- .../net/wireless/mediatek/mt76/mt7921/debugfs.c | 36 ++- drivers/net/wireless/mediatek/mt76/mt7921/init.c | 13 ++ drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 68 +++++- drivers/net/wireless/mediatek/mt76/mt7921/mac.h | 8 + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 22 +- drivers/net/wireless/mediatek/mt76/mt7921/mcu.h | 10 +- drivers/net/wireless/mediatek/mt76/mt7921/regs.h | 8 +- drivers/net/wireless/microchip/wilc1000/cfg80211.c | 3 +- .../net/wireless/realtek/rtl818x/rtl8187/rtl8225.c | 14 +- drivers/net/wireless/realtek/rtw88/fw.c | 7 +- drivers/net/wireless/realtek/rtw88/reg.h | 1 + drivers/net/wireless/rsi/rsi_91x_core.c | 2 + drivers/net/wireless/rsi/rsi_91x_hal.c | 10 +- drivers/net/wireless/rsi/rsi_91x_mac80211.c | 74 ++---- drivers/net/wireless/rsi/rsi_91x_main.c | 17 +- drivers/net/wireless/rsi/rsi_91x_mgmt.c | 24 +- drivers/net/wireless/rsi/rsi_91x_sdio.c | 5 +- drivers/net/wireless/rsi/rsi_91x_usb.c | 5 +- drivers/net/wireless/rsi/rsi_hal.h | 11 + drivers/net/wireless/rsi/rsi_main.h | 15 +- drivers/nfc/pn533/pn533.c | 6 +- drivers/nvdimm/btt.c | 1 - drivers/nvdimm/pmem.c | 13 +- drivers/nvme/host/multipath.c | 9 +- drivers/nvme/host/rdma.c | 2 + drivers/nvme/target/configfs.c | 2 + drivers/nvme/target/rdma.c | 24 ++ drivers/nvme/target/tcp.c | 16 ++ drivers/of/unittest.c | 16 +- drivers/opp/of.c | 2 +- drivers/pci/controller/cadence/pci-j721e.c | 2 +- drivers/pci/controller/cadence/pcie-cadence-plat.c | 2 + drivers/pci/controller/dwc/pcie-uniphier.c | 26 +-- drivers/pci/controller/pci-aardvark.c | 251 +++++++++++++++++--- drivers/pci/msi.c | 36 +-- drivers/pci/pci-bridge-emul.c | 13 ++ drivers/pci/pci.c | 8 + drivers/pci/quirks.c | 1 + drivers/phy/microchip/sparx5_serdes.c | 4 +- drivers/phy/qualcomm/phy-qcom-qmp.c | 2 +- drivers/phy/qualcomm/phy-qcom-qusb2.c | 16 +- drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c | 2 +- drivers/phy/ti/phy-gmii-sel.c | 2 + drivers/pinctrl/core.c | 2 + drivers/pinctrl/pinctrl-equilibrium.c | 7 +- drivers/pinctrl/renesas/core.c | 2 +- drivers/pinctrl/renesas/pinctrl-rzg2l.c | 2 +- .../platform/surface/surface_aggregator_registry.c | 54 +++++ drivers/platform/x86/thinkpad_acpi.c | 2 +- drivers/platform/x86/wmi.c | 9 +- drivers/power/reset/at91-reset.c | 4 +- drivers/power/supply/bq27xxx_battery_i2c.c | 3 +- drivers/power/supply/max17040_battery.c | 2 + drivers/power/supply/max17042_battery.c | 12 +- drivers/power/supply/rt5033_battery.c | 2 +- drivers/regulator/s5m8767.c | 21 +- drivers/remoteproc/imx_rproc.c | 41 ++-- drivers/remoteproc/remoteproc_core.c | 8 +- drivers/remoteproc/remoteproc_coredump.c | 2 +- drivers/remoteproc/remoteproc_elf_loader.c | 4 +- drivers/rtc/rtc-ds1302.c | 7 + drivers/rtc/rtc-ds1390.c | 7 + drivers/rtc/rtc-mcp795.c | 7 + drivers/rtc/rtc-pcf2123.c | 9 + drivers/rtc/rtc-rv3032.c | 4 +- drivers/s390/char/tape_std.c | 3 +- drivers/s390/cio/css.c | 4 +- drivers/s390/cio/device_ops.c | 12 +- drivers/s390/crypto/ap_queue.c | 2 + drivers/scsi/csiostor/csio_lnode.c | 2 +- drivers/scsi/dc395x.c | 1 + drivers/scsi/hosts.c | 1 + drivers/scsi/lpfc/lpfc_els.c | 12 +- drivers/scsi/lpfc/lpfc_hbadisc.c | 10 +- drivers/scsi/lpfc/lpfc_nvme.c | 5 +- drivers/scsi/lpfc/lpfc_scsi.c | 7 + drivers/scsi/lpfc/lpfc_sli.c | 101 ++++++-- drivers/scsi/megaraid/megaraid_sas_fusion.c | 11 +- drivers/scsi/pm8001/pm8001_hwi.c | 2 +- drivers/scsi/pm8001/pm8001_sas.h | 3 +- drivers/scsi/pm8001/pm80xx_hwi.c | 53 ++++- drivers/scsi/qedf/qedf_main.c | 2 + drivers/scsi/qla2xxx/qla_attr.c | 24 +- drivers/scsi/qla2xxx/qla_edif.c | 259 ++++++++++++--------- drivers/scsi/qla2xxx/qla_edif.h | 3 +- drivers/scsi/qla2xxx/qla_edif_bsg.h | 2 +- drivers/scsi/qla2xxx/qla_gbl.h | 4 +- drivers/scsi/qla2xxx/qla_init.c | 77 ++++-- drivers/scsi/qla2xxx/qla_mr.c | 23 -- drivers/scsi/qla2xxx/qla_nvme.c | 14 +- drivers/scsi/qla2xxx/qla_os.c | 37 +-- drivers/scsi/qla2xxx/qla_target.c | 1 + drivers/scsi/scsi_error.c | 25 ++ drivers/scsi/scsi_ioctl.c | 2 + drivers/scsi/scsi_lib.c | 3 +- drivers/scsi/scsi_sysfs.c | 1 + drivers/scsi/ufs/ufshcd-pltfrm.c | 4 +- drivers/scsi/ufs/ufshcd.c | 186 +-------------- drivers/scsi/ufs/ufshcd.h | 14 -- drivers/scsi/ufs/ufshpb.c | 31 ++- drivers/scsi/ufs/ufshpb.h | 1 - drivers/soc/fsl/dpaa2-console.c | 1 + drivers/soc/fsl/dpio/dpio-service.c | 2 +- drivers/soc/fsl/dpio/qbman-portal.c | 9 +- drivers/soc/qcom/apr.c | 2 + drivers/soc/qcom/llcc-qcom.c | 2 +- drivers/soc/qcom/rpmhpd.c | 20 +- drivers/soc/qcom/socinfo.c | 4 +- drivers/soc/samsung/Kconfig | 1 + drivers/soc/tegra/pmc.c | 2 +- drivers/soundwire/bus.c | 2 +- drivers/soundwire/debugfs.c | 2 +- drivers/spi/atmel-quadspi.c | 2 +- drivers/spi/spi-bcm-qspi.c | 8 +- drivers/spi/spi-mtk-nor.c | 2 +- drivers/spi/spi-rpc-if.c | 4 +- drivers/spi/spi-stm32-qspi.c | 2 +- drivers/spi/spi.c | 41 ++++ drivers/staging/ks7010/Kconfig | 3 + drivers/staging/media/atomisp/i2c/atomisp-lm3554.c | 37 +-- drivers/staging/media/imx/imx-media-dev-common.c | 2 + drivers/staging/media/ipu3/ipu3-v4l2.c | 7 +- drivers/staging/media/rkvdec/rkvdec-h264.c | 5 +- drivers/staging/media/rkvdec/rkvdec.c | 40 ++-- drivers/staging/most/dim2/Makefile | 2 +- drivers/staging/most/dim2/dim2.c | 24 +- drivers/staging/most/dim2/sysfs.c | 49 ---- drivers/staging/most/dim2/sysfs.h | 11 - drivers/staging/r8188eu/core/rtw_mlme.c | 2 + drivers/target/target_core_tmr.c | 17 +- drivers/target/target_core_transport.c | 30 ++- .../intel/int340x_thermal/processor_thermal_mbox.c | 1 + drivers/thermal/qcom/Kconfig | 2 +- drivers/thermal/qcom/tsens.c | 29 ++- drivers/thermal/thermal_core.c | 16 +- drivers/tty/serial/8250/8250_dw.c | 2 +- drivers/tty/serial/8250/8250_port.c | 21 +- drivers/tty/serial/cpm_uart/cpm_uart_core.c | 2 + drivers/tty/serial/imx.c | 4 +- drivers/tty/serial/serial_core.c | 16 +- drivers/tty/serial/xilinx_uartps.c | 3 +- drivers/usb/chipidea/core.c | 23 +- drivers/usb/dwc2/drd.c | 24 +- drivers/usb/dwc3/core.h | 1 + drivers/usb/dwc3/gadget.c | 8 +- drivers/usb/gadget/legacy/hid.c | 4 +- drivers/usb/host/xhci-hub.c | 3 +- drivers/usb/host/xhci-pci.c | 16 ++ drivers/usb/misc/iowarrior.c | 8 +- drivers/usb/musb/Kconfig | 2 +- drivers/usb/serial/keyspan.c | 15 +- drivers/usb/typec/Kconfig | 4 +- drivers/vdpa/mlx5/net/mlx5_vnet.c | 1 - drivers/video/backlight/backlight.c | 6 - drivers/video/fbdev/chipsfb.c | 2 +- drivers/video/fbdev/efifb.c | 21 +- drivers/virtio/virtio_ring.c | 14 +- drivers/watchdog/Kconfig | 2 +- drivers/watchdog/f71808e_wdt.c | 4 +- drivers/xen/balloon.c | 86 +++++-- drivers/xen/xen-pciback/conf_space_capability.c | 2 +- fs/btrfs/disk-io.c | 3 +- fs/btrfs/reflink.c | 2 +- fs/btrfs/tree-log.c | 4 +- fs/btrfs/volumes.c | 14 +- fs/ceph/mdsmap.c | 4 - fs/cifs/cifsglob.h | 3 +- fs/cifs/connect.c | 21 +- fs/cifs/file.c | 35 ++- fs/cifs/fs_context.c | 8 + fs/cifs/fs_context.h | 1 + fs/crypto/fscrypt_private.h | 5 +- fs/crypto/hkdf.c | 11 +- fs/crypto/keysetup.c | 57 ++++- fs/erofs/decompressor.c | 1 - fs/erofs/zdata.c | 13 +- fs/erofs/zpvec.h | 13 +- fs/exfat/inode.c | 2 +- fs/ext4/extents.c | 63 +++-- fs/ext4/inode.c | 15 +- fs/ext4/super.c | 9 +- fs/f2fs/compress.c | 1 + fs/f2fs/inode.c | 2 +- fs/f2fs/namei.c | 2 +- fs/f2fs/super.c | 2 + fs/fuse/dev.c | 14 +- fs/gfs2/glock.c | 24 +- fs/io-wq.c | 88 +++++-- fs/io_uring.c | 4 +- fs/jfs/jfs_mount.c | 51 ++-- fs/ksmbd/Kconfig | 1 + fs/ksmbd/server.c | 1 + fs/ksmbd/smb2misc.c | 6 +- fs/ksmbd/smb2pdu.c | 11 +- fs/nfs/dir.c | 9 +- fs/nfs/direct.c | 2 +- fs/nfs/flexfilelayout/flexfilelayoutdev.c | 4 +- fs/nfs/inode.c | 13 +- fs/nfs/nfs3xdr.c | 2 +- fs/nfs/nfs4idmap.c | 2 +- fs/nfs/nfs4proc.c | 15 +- fs/nfs/pnfs.h | 2 +- fs/nfs/pnfs_nfs.c | 6 +- fs/nfs/proc.c | 2 +- fs/nfs/write.c | 26 +-- fs/ocfs2/file.c | 8 +- fs/open.c | 16 +- fs/orangefs/dcache.c | 4 +- fs/overlayfs/copy_up.c | 23 +- fs/overlayfs/file.c | 16 +- fs/overlayfs/inode.c | 5 +- fs/proc/stat.c | 4 +- fs/proc/uptime.c | 14 +- fs/quota/quota_tree.c | 15 ++ fs/tracefs/inode.c | 3 +- include/drm/ttm/ttm_bo_api.h | 3 +- include/linux/blkdev.h | 2 - include/linux/bpf-cgroup.h | 1 + include/linux/console.h | 2 + include/linux/cpufreq.h | 2 +- include/linux/dma-buf.h | 2 +- include/linux/dsa/ocelot.h | 1 + include/linux/ethtool_netlink.h | 3 + include/linux/filter.h | 5 +- include/linux/fortify-string.h | 5 +- include/linux/kernel_stat.h | 1 + include/linux/leds.h | 2 +- include/linux/libata.h | 2 +- include/linux/msi.h | 2 +- include/linux/nfs_fs.h | 1 + include/linux/posix-timers.h | 2 + include/linux/rpmsg.h | 2 +- include/linux/sched.h | 1 + include/linux/sched/task.h | 3 +- include/linux/sched/task_stack.h | 4 + include/linux/seq_file.h | 2 +- include/linux/signal_types.h | 3 + include/linux/skmsg.h | 18 +- include/linux/surface_aggregator/controller.h | 4 +- include/linux/tpm.h | 1 + include/media/videobuf2-core.h | 37 +-- include/memory/renesas-rpc-if.h | 1 + include/net/inet_connection_sock.h | 2 +- include/net/llc.h | 4 +- include/net/neighbour.h | 12 +- include/net/sch_generic.h | 4 + include/net/sctp/sctp.h | 7 +- include/net/sock.h | 2 +- include/net/strparser.h | 20 +- include/net/tcp.h | 17 +- include/rdma/ib_verbs.h | 7 +- include/scsi/scsi_cmnd.h | 2 +- include/scsi/scsi_host.h | 1 + include/sound/soc-topology.h | 3 +- include/uapi/asm-generic/signal-defs.h | 1 + include/uapi/linux/ethtool_netlink.h | 4 +- include/uapi/linux/pci_regs.h | 6 + init/main.c | 4 +- kernel/bpf/trampoline.c | 6 +- kernel/bpf/verifier.c | 4 +- kernel/cgroup/cgroup.c | 31 ++- kernel/cgroup/rstat.c | 2 - kernel/debug/kdb/kdb_bt.c | 16 +- kernel/debug/kdb/kdb_main.c | 37 +-- kernel/debug/kdb/kdb_private.h | 4 +- kernel/debug/kdb/kdb_support.c | 118 ++-------- kernel/fork.c | 3 +- kernel/irq/msi.c | 4 +- kernel/kprobes.c | 3 +- kernel/locking/lockdep.c | 4 +- kernel/locking/rwsem.c | 53 +++-- kernel/power/energy_model.c | 23 +- kernel/power/swap.c | 7 +- kernel/rcu/rcutorture.c | 48 +++- kernel/rcu/tasks.h | 3 +- kernel/rcu/tree.c | 2 +- kernel/rcu/tree_exp.h | 2 +- kernel/rcu/tree_plugin.h | 8 +- kernel/sched/core.c | 62 +++-- kernel/scs.c | 1 + kernel/signal.c | 26 +-- kernel/time/posix-cpu-timers.c | 19 +- kernel/trace/ftrace.c | 23 +- kernel/trace/ring_buffer.c | 5 + kernel/trace/trace.c | 73 +++--- kernel/trace/trace.h | 3 + kernel/trace/trace_boot.c | 4 + kernel/trace/trace_dynevent.c | 2 +- kernel/trace/trace_event_perf.c | 6 +- kernel/trace/trace_events.c | 42 ++-- kernel/trace/trace_events_synth.c | 4 +- kernel/trace/trace_functions_graph.c | 2 +- kernel/trace/trace_hwlat.c | 6 +- kernel/trace/trace_kprobe.c | 8 +- kernel/trace/trace_osnoise.c | 14 +- kernel/trace/trace_printk.c | 2 +- kernel/trace/trace_recursion_record.c | 4 +- kernel/trace/trace_stack.c | 6 +- kernel/trace/trace_stat.c | 6 +- kernel/trace/trace_uprobe.c | 4 +- kernel/trace/tracing_map.c | 40 ++-- kernel/workqueue.c | 15 +- lib/crypto/sm4.c | 4 +- lib/decompress_unxz.c | 2 +- lib/dynamic_debug.c | 12 + lib/iov_iter.c | 5 +- lib/test_bpf.c | 37 ++- lib/xz/xz_dec_lzma2.c | 21 +- lib/xz/xz_dec_stream.c | 6 +- mm/filemap.c | 1 - mm/memcontrol.c | 27 +-- mm/oom_kill.c | 23 +- mm/zsmalloc.c | 7 +- net/8021q/vlan.c | 3 - net/8021q/vlan_dev.c | 3 + net/9p/client.c | 2 + net/bluetooth/l2cap_sock.c | 10 +- net/bluetooth/sco.c | 36 +-- net/bridge/br_private.h | 2 + net/can/j1939/main.c | 7 + net/can/j1939/transport.c | 11 + net/core/dev.c | 2 + net/core/filter.c | 58 ++++- net/core/neighbour.c | 48 ++-- net/core/net-sysfs.c | 55 +++++ net/core/net_namespace.c | 4 + net/core/skmsg.c | 43 +++- net/core/stream.c | 3 - net/dccp/dccp.h | 2 +- net/dccp/proto.c | 14 +- net/dsa/port.c | 2 + net/dsa/switch.c | 4 +- net/dsa/tag_ocelot.c | 3 + net/ethtool/pause.c | 3 +- net/ipv4/af_inet.c | 16 +- net/ipv4/inet_connection_sock.c | 4 +- net/ipv4/inet_hashtables.c | 2 +- net/ipv4/proc.c | 2 +- net/ipv4/tcp.c | 40 +++- net/ipv4/tcp_bpf.c | 48 +++- net/ipv6/addrconf.c | 3 + net/ipv6/af_inet6.c | 21 +- net/ipv6/udp.c | 2 +- net/mac80211/s1g.c | 8 +- net/mctp/af_mctp.c | 13 ++ net/mptcp/options.c | 8 +- net/mptcp/protocol.c | 43 +++- net/netfilter/nf_conntrack_proto_udp.c | 7 +- net/netfilter/nfnetlink_queue.c | 2 +- net/netfilter/nft_dynset.c | 11 +- net/rxrpc/rtt.c | 2 +- net/sched/sch_generic.c | 9 + net/sched/sch_mq.c | 24 ++ net/sched/sch_mqprio.c | 23 ++ net/sched/sch_taprio.c | 27 ++- net/sctp/output.c | 13 +- net/sctp/transport.c | 11 +- net/smc/af_smc.c | 18 +- net/strparser/strparser.c | 10 +- net/sunrpc/addr.c | 40 ++-- net/sunrpc/xprt.c | 28 +-- net/vmw_vsock/af_vsock.c | 2 + net/wireless/core.c | 10 + samples/bpf/xdp_redirect_cpu_user.c | 6 +- samples/kprobes/kretprobe_example.c | 2 +- scripts/leaking_addresses.pl | 3 +- security/apparmor/label.c | 4 +- security/integrity/evm/evm_main.c | 2 +- security/integrity/ima/ima_policy.c | 27 ++- security/selinux/ss/services.c | 162 ++++++------- security/smack/smackfs.c | 11 +- sound/core/memalloc.c | 7 +- sound/core/oss/mixer_oss.c | 44 +++- sound/core/timer.c | 17 +- sound/firewire/oxfw/oxfw-stream.c | 7 +- sound/firewire/oxfw/oxfw.c | 8 + sound/firewire/oxfw/oxfw.h | 5 + sound/pci/hda/hda_intel.c | 52 ++--- sound/pci/hda/patch_realtek.c | 36 +++ sound/pci/rme9652/hdsp.c | 41 ++-- sound/pci/rme9652/rme9652.c | 41 ++-- sound/soc/codecs/cs42l42.c | 27 ++- sound/soc/codecs/wcd9335.c | 2 +- sound/soc/sh/rcar/core.c | 1 + sound/soc/sof/topology.c | 9 + sound/soc/tegra/tegra_asoc_machine.c | 60 ++++- sound/soc/tegra/tegra_asoc_machine.h | 1 + sound/synth/emux/emux.c | 2 +- sound/usb/6fire/comm.c | 2 +- sound/usb/6fire/firmware.c | 6 +- sound/usb/card.h | 1 + sound/usb/endpoint.c | 7 +- sound/usb/format.c | 1 + sound/usb/line6/driver.c | 14 +- sound/usb/line6/driver.h | 2 +- sound/usb/line6/podhd.c | 6 +- sound/usb/line6/toneport.c | 2 +- sound/usb/misc/ua101.c | 4 +- sound/usb/quirks.c | 1 + tools/arch/x86/lib/insn.c | 5 +- tools/bpf/bpftool/prog.c | 16 +- tools/include/asm-generic/unaligned.h | 23 ++ tools/lib/bpf/bpf.c | 4 +- tools/lib/bpf/bpf_core_read.h | 2 +- tools/lib/bpf/btf.c | 22 +- tools/lib/bpf/libbpf.c | 8 +- tools/lib/bpf/skel_internal.h | 6 +- tools/objtool/arch/x86/decode.c | 20 ++ tools/objtool/check.c | 159 +++++++------ tools/objtool/include/objtool/arch.h | 1 + tools/perf/util/bpf-event.c | 4 +- tools/perf/util/intel-pt-decoder/Build | 2 + .../testing/selftests/bpf/prog_tests/perf_buffer.c | 4 +- tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 4 +- tools/testing/selftests/bpf/prog_tests/test_ima.c | 3 +- tools/testing/selftests/bpf/progs/strobemeta.h | 11 + tools/testing/selftests/bpf/test_progs.c | 4 +- .../selftests/bpf/test_xdp_redirect_multi.sh | 62 ++--- .../testing/selftests/bpf/verifier/array_access.c | 2 +- tools/testing/selftests/bpf/xdp_redirect_multi.c | 4 +- tools/testing/selftests/core/close_range_test.c | 2 +- tools/testing/selftests/kvm/lib/x86_64/svm.c | 14 +- .../selftests/kvm/x86_64/mmio_warning_test.c | 2 +- tools/testing/selftests/net/Makefile | 9 +- tools/testing/selftests/net/fib_nexthops.sh | 1 + .../selftests/net/forwarding/bridge_igmp.sh | 12 +- .../testing/selftests/net/forwarding/bridge_mld.sh | 12 +- tools/testing/selftests/net/gre_gso.sh | 9 +- tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 +- tools/testing/selftests/net/udpgso_bench_rx.c | 11 +- tools/testing/selftests/sched/cs_prctl_test.c | 28 ++- tools/tracing/latency/latency-collector.c | 2 +- 1028 files changed, 8826 insertions(+), 5203 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/917 xhci: Fix USB 3.1 enumeration issues by increasing roothub power-on-good delay
From: Mathias Nyman <[email protected]>
commit e1959faf085b004e6c3afaaaa743381f00e7c015 upstream.
Some USB 3.1 enumeration issues were reported after the hub driver removed the minimum 100ms limit for the power-on-good delay.
Since commit 90d28fb53d4a ("usb: core: reduce power-on-good delay time of root hub") the hub driver sets the power-on-delay based on the bPwrOn2PwrGood value in the hub descriptor.
xhci driver has a 20ms bPwrOn2PwrGood value for both roothubs based on xhci spec section 5.4.8, but it's clearly not enough for the USB 3.1 devices, causing enumeration issues.
Tests indicate full 100ms delay is needed.
--- drivers/usb/host/xhci-hub.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/host/xhci-hub.c +2 -1
@@ -257,7 +257,6 @@ static void xhci_common_hub_descriptor(s {u16 temp; - desc->bPwrOn2PwrGood =10 ;/* xhci section 5.4.9 says 20ms max */ desc->bHubContrCurrent =0 ; desc->bNbrPorts = ports;
@@ -292,6 +291,7 @@ static void xhci_usb2_hub_descriptor(str desc->bDescriptorType =USB_DT_HUB ; temp =1 + (ports /8 ); desc->bDescLength =USB_DT_HUB_NONVAR_SIZE +2 * temp; + desc->bPwrOn2PwrGood =10 ;/* xhci section 5.4.8 says 20ms */ /* The Device Removable bits are reported on a byte granularity. * If the port doesn't exist within that byte, the bit is set to 0.
@@ -344,6 +344,7 @@ static void xhci_usb3_hub_descriptor(strxhci_common_hub_descriptor (xhci, desc, ports); desc->bDescriptorType =USB_DT_SS_HUB ; desc->bDescLength =USB_DT_SS_HUB_SIZE ; + desc->bPwrOn2PwrGood =50 ;/* usb 3.1 may fail if less than 100ms */ /* header decode latency should be zero for roothubs, * see section 4.23.5.2.
Greg Kroah-Hartman
maintainerPATCH 2/917 usb: xhci: Enable runtime-pm by default on AMD Yellow Carp platform
In reply to Greg Kroah-HartmanFrom: Nehal Bakulchandra Shah <[email protected]>
commit 660a92a59b9e831a0407e41ff62875656d30006e upstream.
AMD's Yellow Carp platform supports runtime power management for XHCI Controllers, so enable the same by default for all XHCI Controllers.
[ regrouped and aligned the PCI_DEVICE_ID definitions -Mathias]
--- drivers/usb/host/xhci-pci.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/usb/host/xhci-pci.c +16 -0
@@ -65,6 +65,13 @@#define PCI_DEVICE_ID_AMD_PROMONTORYA_3 0x43ba#define PCI_DEVICE_ID_AMD_PROMONTORYA_2 0x43bb#define PCI_DEVICE_ID_AMD_PROMONTORYA_1 0x43bc +#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_1 0x161a +#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_2 0x161b +#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_3 0x161d +#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_4 0x161e +#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_5 0x15d6 +#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_6 0x15d7 +#define PCI_DEVICE_ID_ASMEDIA_1042_XHCI 0x1042#define PCI_DEVICE_ID_ASMEDIA_1042A_XHCI 0x1142#define PCI_DEVICE_ID_ASMEDIA_1142_XHCI 0x1242
@@ -317,6 +324,15 @@ static void xhci_pci_quirks(struct devic pdev->device == PCI_DEVICE_ID_AMD_PROMONTORYA_4)) xhci->quirks |= XHCI_NO_SOFT_RETRY; +if (pdev->vendor ==PCI_VENDOR_ID_AMD && + (pdev->device ==PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_1 || + pdev->device ==PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_2 || + pdev->device ==PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_3 || + pdev->device ==PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_4 || + pdev->device ==PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_5 || + pdev->device ==PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_6 )) + xhci->quirks |=XHCI_DEFAULT_PM_RUNTIME_ALLOW ; +if (xhci->quirks &XHCI_RESET_ON_RESUME )xhci_dbg_trace (xhci, trace_xhci_dbg_quirks,"QUIRK: Resetting on resume" );
Greg Kroah-Hartman
maintainerPATCH 3/917 Input: iforce - fix control-message timeout
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 744d0090a5f6dfa4c81b53402ccdf08313100429 upstream.
USB control-message timeouts are specified in milliseconds and should specifically not vary with CONFIG_HZ.
--- drivers/input/joystick/iforce/iforce-usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/joystick/iforce/iforce-usb.c +1 -1
@@ -92,7 +92,7 @@ static int iforce_usb_get_id(struct ifor id,USB_TYPE_VENDOR |USB_DIR_IN |USB_RECIP_INTERFACE , - 0, 0, buf, IFORCE_MAX_LENGTH, HZ); + 0, 0, buf, IFORCE_MAX_LENGTH, 1000);if (status <0 ) {dev_err (&iforce_usb->intf->dev,"usb_submit_urb failed: %d\n" , status);
Greg Kroah-Hartman
maintainerPATCH 4/917 Input: elantench - fix misreporting trackpoint coordinates
In reply to Greg Kroah-HartmanFrom: Phoenix Huang <[email protected]>
commit be896bd3b72b44126c55768f14c22a8729b0992e upstream.
Some firmwares occasionally report bogus data from trackpoint, with X or Y displacement being too large (outside of [-127, 127] range). Let's drop such packets so that we do not generate jumps.
--- drivers/input/mouse/elantech.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/input/mouse/elantech.c +13 -0
@@ -517,6 +517,19 @@ static void elantech_report_trackpoint(scase 0x16008020U :case 0x26800010U :case 0x36808000U : + +/* +* This firmware misreport coordinates for trackpoint +* occasionally. Discard packets outside of [-127, 127] range +* to prevent cursor jumps. +*/ +if (packet[4 ] ==0x80 || packet[5 ] ==0x80 || + packet[1 ] >>7 == packet[4 ] >>7 || + packet[2 ] >>7 == packet[5 ] >>7 ) { +elantech_debug ("discarding packet [%6ph]\n" , packet); +break ; + + } x = packet[4 ] - (int )((packet[1 ]^0x80 ) <<1 ); y = (int )((packet[2 ]^0x80 ) <<1 ) - packet[5 ];
Greg Kroah-Hartman
maintainerPATCH 5/917 Input: i8042 - Add quirk for Fujitsu Lifebook T725
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 16e28abb7290c4ca3b3a0f333ba067f34bb18c86 upstream.
Fujitsu Lifebook T725 laptop requires, like a few other similar models, the nomux and notimeout options to probe the touchpad properly. This patch adds the corresponding quirk entries.
--- drivers/input/serio/i8042-x86ia64io.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/input/serio/i8042-x86ia64io.h +14 -0
@@ -273,6 +273,13 @@ static const struct dmi_system_id __init }, }, { +/* Fujitsu Lifebook T725 laptop */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU" ), + DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK T725"), + }, + }, + {/* Fujitsu Lifebook U745 */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
@@ -841,6 +848,13 @@ static const struct dmi_system_id __init }, }, { +/* Fujitsu Lifebook T725 laptop */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"FUJITSU" ), + DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK T725"), + }, + }, + {/* Fujitsu U574 laptop */ /* https://bugzilla.kernel.org/show_bug.cgi?id=69731 */ .matches = {
Greg Kroah-Hartman
maintainerPATCH 6/917 libata: fix read log timeout value
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
commit 68dbbe7d5b4fde736d104cbbc9a2fce875562012 upstream.
Some ATA drives are very slow to respond to READ_LOG_EXT and READ_LOG_DMA_EXT commands issued from ata_dev_configure() when the device is revalidated right after resuming a system or inserting the ATA adapter driver (e.g. ahci). The default 5s timeout (ATA_EH_CMD_DFL_TIMEOUT) used for these commands is too short, causing errors during the device configuration. Ex:
...
ata9: SATA max UDMA/133 abar m524288@0x9d200000 port 0x9d200400 irq 209
ata9: SATA link up 6.0 Gbps (SStatus 133 SControl 300) ata9.00: ATA-9: XXX XXXXXXXXXXXXXXX, XXXXXXXX, max UDMA/133 ata9.00: qc timeout (cmd 0x2f)
ata9.00: Read log page 0x00 failed, Emask 0x4
ata9.00: Read log page 0x00 failed, Emask 0x40
ata9.00: NCQ Send/Recv Log not supported
ata9.00: Read log page 0x08 failed, Emask 0x40
ata9.00: 27344764928 sectors, multi 16: LBA48 NCQ (depth 32), AA ata9.00: Read log page 0x00 failed, Emask 0x40
ata9.00: ATA Identify Device Log not supported
ata9.00: failed to set xfermode (err_mask=0x40)
ata9: SATA link up 6.0 Gbps (SStatus 133 SControl 300) ata9.00: configured for UDMA/133
...
The timeout error causes a soft reset of the drive link, followed in most cases by a successful revalidation as that give enough time to the drive to become fully ready to quickly process the read log commands. However, in some cases, this also fails resulting in the device being dropped.
Fix this by using adding the ata_eh_revalidate_timeouts entries for the READ_LOG_EXT and READ_LOG_DMA_EXT commands. This defines a timeout increased to 15s, retriable one time.
--- drivers/ata/libata-eh.c | 8 ++++++++ include/linux/libata.h | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)
drivers/ata/libata-eh.c +8 -0
@@ -93,6 +93,12 @@ static const unsigned long ata_eh_identi ULONG_MAX, }; +static const unsigned long ata_eh_revalidate_timeouts[] = { +15000 ,/* Some drives are slow to read log pages when waking-up */ +15000 ,/* combined time till here is enough even for media access */ +ULONG_MAX , +}; +static const unsigned long ata_eh_flush_timeouts[] = {15000 ,/* be generous with flush */ 15000 ,/* ditto */
@@ -129,6 +135,8 @@ static const struct ata_eh_cmd_timeout_e ata_eh_cmd_timeout_table[ATA_EH_CMD_TIMEOUT_TABLE_SIZE] = { { .commands = CMDS(ATA_CMD_ID_ATA, ATA_CMD_ID_ATAPI), .timeouts = ata_eh_identify_timeouts, }, + { .commands = CMDS(ATA_CMD_READ_LOG_EXT, ATA_CMD_READ_LOG_DMA_EXT), + .timeouts = ata_eh_revalidate_timeouts, }, { .commands = CMDS(ATA_CMD_READ_NATIVE_MAX, ATA_CMD_READ_NATIVE_MAX_EXT), .timeouts = ata_eh_other_timeouts, }, { .commands = CMDS(ATA_CMD_SET_MAX, ATA_CMD_SET_MAX_EXT),
include/linux/libata.h +1 -1
@@ -394,7 +394,7 @@ enum {/* This should match the actual table size of * ata_eh_cmd_timeout_table in libata-eh.c. */ - ATA_EH_CMD_TIMEOUT_TABLE_SIZE = 6, + ATA_EH_CMD_TIMEOUT_TABLE_SIZE = 7,/* Horkage types. May be set by libata or controller on drives (some horkage may be drive/controller pair dependent */
Greg Kroah-Hartman
maintainerPATCH 7/917 ocfs2: fix data corruption on truncate
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit 839b63860eb3835da165642923120d305925561d upstream.
Patch series "ocfs2: Truncate data corruption fix".
As further testing has shown, commit 5314454ea3f ("ocfs2: fix data corruption after conversion from inline format") didn't fix all the data corruption issues the customer started observing after 6dbf7bb55598 ("fs: Don't invalidate page buffers in block_write_full_page()") This time I have tracked them down to two bugs in ocfs2 truncation code.
One bug (truncating page cache before clearing tail cluster and setting i_size) could cause data corruption even before 6dbf7bb55598, but before that commit it needed a race with page fault, after 6dbf7bb55598 it started to be pretty deterministic.
Another bug (zeroing pages beyond old i_size) used to be harmless inefficiency before commit 6dbf7bb55598. But after commit 6dbf7bb55598 in combination with the first bug it resulted in deterministic data corruption.
Although fixing only the first problem is needed to stop data corruption, I've fixed both issues to make the code more robust.
This patch (of 2):
ocfs2_truncate_file() did unmap invalidate page cache pages before zeroing partial tail cluster and setting i_size. Thus some pages could be left (and likely have left if the cluster zeroing happened) in the page cache beyond i_size after truncate finished letting user possibly see stale data once the file was extended again. Also the tail cluster zeroing was not guaranteed to finish before truncate finished causing possible stale data exposure. The problem started to be particularly easy to hit after commit 6dbf7bb55598 "fs: Don't invalidate page buffers in block_write_full_page()" stopped invalidation of pages beyond i_size from page writeback path.
Fix these problems by unmapping and invalidating pages in the page cache after the i_size is reduced and tail cluster is zeroed out.
--- fs/ocfs2/file.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
fs/ocfs2/file.c +6 -2
@@ -476,10 +476,11 @@ int ocfs2_truncate_file(struct inode *in* greater than page size, so we have to truncate them * anyway. */ -unmap_mapping_range (inode->i_mapping, new_i_size +PAGE_SIZE -1 ,0 ,1 ); -truncate_inode_pages (inode->i_mapping, new_i_size);if (OCFS2_I (inode)->ip_dyn_features &OCFS2_INLINE_DATA_FL ) { +unmap_mapping_range (inode->i_mapping, + new_i_size +PAGE_SIZE -1 ,0 ,1 ); +truncate_inode_pages (inode->i_mapping, new_i_size); status =ocfs2_truncate_inline (inode, di_bh, new_i_size,i_size_read (inode),1 );if (status)
@@ -498,6 +499,9 @@ int ocfs2_truncate_file(struct inode *in goto bail_unlock_sem; } +unmap_mapping_range (inode->i_mapping, new_i_size +PAGE_SIZE -1 ,0 ,1 ); +truncate_inode_pages (inode->i_mapping, new_i_size); + status =ocfs2_commit_truncate (osb, inode, di_bh);if (status <0 ) {mlog_errno (status);
Greg Kroah-Hartman
maintainerPATCH 8/917 scsi: scsi_ioctl: Validate command size
In reply to Greg Kroah-HartmanFrom: Tadeusz Struk <[email protected]>
commit 20aaef52eb08f1d987d46ad26edb8f142f74d83a upstream.
Need to make sure the command size is valid before copying the command from user space.
--- drivers/scsi/scsi_ioctl.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/scsi/scsi_ioctl.c +2 -0
@@ -347,6 +347,8 @@ static int scsi_fill_sghdr_rq(struct scs {struct scsi_request *req =scsi_req (rq); +if (hdr->cmd_len <6 ) +return -EMSGSIZE ;if (copy_from_user (req->cmd, hdr->cmdp, hdr->cmd_len))return -EFAULT ;if (!scsi_cmd_allowed (req->cmd, mode))
Greg Kroah-Hartman
maintainerPATCH 9/917 scsi: core: Avoid leaving shost->last_reset with stale value if EH does not run
In reply to Greg Kroah-HartmanFrom: Ewan D. Milne <[email protected]>
commit 5ae17501bc62a49b0b193dcce003f16375f16654 upstream.
The changes to issue the abort from the scmd->abort_work instead of the EH thread introduced a problem if eh_deadline is used. If aborting the command(s) is successful, and there are never any scmds added to the shost->eh_cmd_q, there is no code path which will reset the ->last_reset value back to zero.
The effect of this is that after a successful abort with no EH thread activity, a subsequent timeout, perhaps a long time later, might immediately be considered past a user-set eh_deadline time, and the host will be reset with no attempt at recovery.
Fix this by resetting ->last_reset back to zero in scmd_eh_abort_handler() if it is determined that the EH thread will not run to do this.
Thanks to Gopinath Marappan for investigating this problem.
--- drivers/scsi/hosts.c | 1 + drivers/scsi/scsi_error.c | 25 +++++++++++++++++++++++++ drivers/scsi/scsi_lib.c | 1 + include/scsi/scsi_cmnd.h | 2 +- include/scsi/scsi_host.h | 1 + 5 files changed, 29 insertions(+), 1 deletion(-)
drivers/scsi/hosts.c +1 -0
@@ -388,6 +388,7 @@ struct Scsi_Host *scsi_host_alloc(struct shost->shost_state =SHOST_CREATED ;INIT_LIST_HEAD (&shost->__devices);INIT_LIST_HEAD (&shost->__targets); +INIT_LIST_HEAD (&shost->eh_abort_list);INIT_LIST_HEAD (&shost->eh_cmd_q);INIT_LIST_HEAD (&shost->starved_list);init_waitqueue_head (&shost->host_wait);
drivers/scsi/scsi_error.c +25 -0
@@ -135,6 +135,23 @@ static bool scsi_eh_should_retry_cmd(strreturn true; } +static void scsi_eh_complete_abort (struct scsi_cmnd *scmd,struct Scsi_Host *shost) +{ +unsigned long flags; + +spin_lock_irqsave (shost->host_lock, flags); +list_del_init (&scmd->eh_entry); +/* +* If the abort succeeds, and there is no further +* EH action, clear the ->last_reset time. +*/ +if (list_empty (&shost->eh_abort_list) && +list_empty (&shost->eh_cmd_q)) +if (shost->eh_deadline !=-1 ) + shost->last_reset =0 ; +spin_unlock_irqrestore (shost->host_lock, flags); +} +/** * scmd_eh_abort_handler - Handle command aborts * @work: command to be aborted.
@@ -152,6 +169,7 @@ scmd_eh_abort_handler(struct work_struct container_of(work, struct scsi_cmnd, abort_work.work);struct scsi_device *sdev = scmd->device;enum scsi_disposition rtn; +unsigned long flags;if (scsi_host_eh_past_deadline (sdev->host)) { SCSI_LOG_ERROR_RECOVERY(3,
@@ -175,12 +193,14 @@ scmd_eh_abort_handler(struct work_structSCSI_LOG_ERROR_RECOVERY (3 ,scmd_printk (KERN_WARNING , scmd,"retry aborted command\n" )); +scsi_eh_complete_abort (scmd, sdev->host);scsi_queue_insert (scmd,SCSI_MLQUEUE_EH_RETRY );return ; }else {SCSI_LOG_ERROR_RECOVERY (3 ,scmd_printk (KERN_WARNING , scmd,"finish aborted command\n" )); +scsi_eh_complete_abort (scmd, sdev->host);scsi_finish_command (scmd);return ; }
@@ -193,6 +213,9 @@ scmd_eh_abort_handler(struct work_struct } } +spin_lock_irqsave (sdev->host->host_lock, flags); +list_del_init (&scmd->eh_entry); +spin_unlock_irqrestore (sdev->host->host_lock, flags);scsi_eh_scmd_add (scmd); }
@@ -223,6 +246,8 @@ scsi_abort_command(struct scsi_cmnd *scmspin_lock_irqsave (shost->host_lock, flags);if (shost->eh_deadline !=-1 && !shost->last_reset) shost->last_reset = jiffies; +BUG_ON (!list_empty (&scmd->eh_entry)); +list_add_tail (&scmd->eh_entry, &shost->eh_abort_list);spin_unlock_irqrestore (shost->host_lock, flags); scmd->eh_eflags |=SCSI_EH_ABORT_SCHEDULED ;
drivers/scsi/scsi_lib.c +1 -0
@@ -1143,6 +1143,7 @@ void scsi_init_command(struct scsi_devic cmd->sense_buffer = buf; cmd->prot_sdb = prot; cmd->flags = flags; +INIT_LIST_HEAD (&cmd->eh_entry);INIT_DELAYED_WORK (&cmd->abort_work, scmd_eh_abort_handler); cmd->jiffies_at_alloc = jiffies_at_alloc; cmd->retries = retries;
include/scsi/scsi_cmnd.h +1 -1
@@ -68,7 +68,7 @@ struct scsi_pointer {struct scsi_cmnd {struct scsi_request req;struct scsi_device *device; -struct list_head eh_entry;/* entry for the host eh_cmd_q */ +struct list_head eh_entry;/* entry for the host eh_abort_list/eh_cmd_q */ struct delayed_work abort_work;struct rcu_head rcu;
include/scsi/scsi_host.h +1 -0
@@ -556,6 +556,7 @@ struct Scsi_Host {struct mutex scan_mutex;/* serialize scanning activity */ +struct list_head eh_abort_list;struct list_head eh_cmd_q;struct task_struct * ehandler;/* Error recovery thread. */ struct completion * eh_action;/* Wait for specific actions on the
Greg Kroah-Hartman
maintainerPATCH 10/917 scsi: core: Remove command size deduction from scsi_setup_scsi_cmnd()
In reply to Greg Kroah-HartmanFrom: Tadeusz Struk <[email protected]>
commit 703535e6ae1e94c89a9c1396b4c7b6b41160ef0c upstream.
No need to deduce command size in scsi_setup_scsi_cmnd() anymore as appropriate checks have been added to scsi_fill_sghdr_rq() function and the cmd_len should never be zero here. The code to do that wasn't correct anyway, as it used uninitialized cmd->cmnd, which caused a null-ptr-deref if the command size was zero as in the trace below. Fix this by removing the unneeded code.
KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007] CPU: 0 PID: 1822 Comm: repro Not tainted 5.15.0 #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.14.0-4.fc34 04/01/2014 Call Trace: blk_mq_dispatch_rq_list+0x7c7/0x12d0 __blk_mq_sched_dispatch_requests+0x244/0x380 blk_mq_sched_dispatch_requests+0xf0/0x160 __blk_mq_run_hw_queue+0xe8/0x160 __blk_mq_delay_run_hw_queue+0x252/0x5d0 blk_mq_run_hw_queue+0x1dd/0x3b0 blk_mq_sched_insert_request+0x1ff/0x3e0 blk_execute_rq_nowait+0x173/0x1e0 blk_execute_rq+0x15c/0x540 sg_io+0x97c/0x1370 scsi_ioctl+0xe16/0x28e0 sd_ioctl+0x134/0x170 blkdev_ioctl+0x362/0x6e0 block_ioctl+0xb0/0xf0 vfs_ioctl+0xa7/0xf0 do_syscall_64+0x3d/0xb0 entry_SYSCALL_64_after_hwframe+0x44/0xae ---[ end trace 8b086e334adef6d2 ]--- Kernel panic - not syncing: Fatal exception
--- drivers/scsi/scsi_lib.c | 2 -- 1 file changed, 2 deletions(-)
drivers/scsi/scsi_lib.c +0 -2
@@ -1175,8 +1175,6 @@ static blk_status_t scsi_setup_scsi_cmnd } cmd->cmd_len =scsi_req (req)->cmd_len; -if (cmd->cmd_len ==0 ) - cmd->cmd_len =scsi_command_size (cmd->cmnd); cmd->cmnd =scsi_req (req)->cmd; cmd->transfersize =blk_rq_bytes (req); cmd->allowed =scsi_req (req)->retries;
Greg Kroah-Hartman
maintainerPATCH 11/917 scsi: lpfc: Dont release final kref on Fport node while ABTS outstanding
In reply to Greg Kroah-HartmanFrom: James Smart <[email protected]>
commit 982fc3965d1350d3332e04046b0e101006184ba9 upstream.
In a rarely executed path, FLOGI failure, there is a refcounting error. If FLOGI completed with an error, typically a timeout, the initial completion handler would remove the job reference. However, the job completion isn't the actual end of the job/exchange as the timeout usually initiates an ABTS, and upon that ABTS completion, a final completion is sent. The driver removes the reference again in the final completion. Thus the imbalance.
In the buggy cases, if there was a link bounce while the delayed response is outstanding, the fport node may be referenced again but there was no additional reference as it is already present. The delayed completion then occurs and removes the last reference freeing the node and causing issues in the link up processed that is using the node.
Fix this scenario by removing the snippet that removed the reference in the initial FLOGI completion. The bad snippet was poorly trying to identify the FLOGI as OK to do so by realizing the node was not registered with either SCSI or NVMe transport.
--- drivers/scsi/lpfc/lpfc_els.c | 11 +++++------ drivers/scsi/lpfc/lpfc_hbadisc.c | 10 ++++++---- drivers/scsi/lpfc/lpfc_nvme.c | 5 +++-- 3 files changed, 14 insertions(+), 12 deletions(-)
drivers/scsi/lpfc/lpfc_els.c +5 -6
@@ -1059,9 +1059,10 @@ stop_rr_fcf_flogi:lpfc_printf_vlog (vport,KERN_WARNING ,LOG_TRACE_EVENT ,"0150 FLOGI failure Status:x%x/x%x " -"xri x%x TMO:x%x\n" , +"xri x%x TMO:x%x refcnt %d\n" , irsp->ulpStatus, irsp->un.ulpWord[4 ], - cmdiocb->sli4_xritag, irsp->ulpTimeout); + cmdiocb->sli4_xritag, irsp->ulpTimeout, +kref_read (&ndlp->kref));/* If this is not a loop open failure, bail out */ if (!(irsp->ulpStatus == IOSTAT_LOCAL_REJECT &&
@@ -1122,12 +1123,12 @@ stop_rr_fcf_flogi:/* FLOGI completes successfully */ lpfc_printf_vlog (vport,KERN_INFO ,LOG_ELS ,"0101 FLOGI completes successfully, I/O tag:x%x, " -"xri x%x Data: x%x x%x x%x x%x x%x x%x x%x\n" , +"xri x%x Data: x%x x%x x%x x%x x%x x%x x%x %d\n" , cmdiocb->iotag, cmdiocb->sli4_xritag, irsp->un.ulpWord[4 ], sp->cmn.e_d_tov, sp->cmn.w2.r_a_tov, sp->cmn.edtovResolution, vport->port_state, vport->fc_flag, - sp->cmn.priority_tagging); + sp->cmn.priority_tagging,kref_read (&ndlp->kref));if (sp->cmn.priority_tagging) vport->vmid_flag |=LPFC_VMID_ISSUE_QFPA ;
@@ -1205,8 +1206,6 @@ flogifail: phba->fcf.fcf_flag &= ~FCF_DISCOVERY ;spin_unlock_irq (&phba->hbalock); -if (!(ndlp->fc4_xpt_flags & (SCSI_XPT_REGD |NVME_XPT_REGD ))) -lpfc_nlp_put (ndlp);if (!lpfc_error_lost_link (irsp)) {/* FLOGI failed, so just use loop map to make discovery list */ lpfc_disc_list_loopmap (vport);
drivers/scsi/lpfc/lpfc_hbadisc.c +6 -4
@@ -4449,8 +4449,9 @@ lpfc_register_remote_port(struct lpfc_vpfc_remote_port_rolechg (rport, rport_ids.roles);lpfc_printf_vlog (ndlp->vport,KERN_INFO ,LOG_NODE , -"3183 %s rport x%px DID x%x, role x%x\n" , - __func__, rport, rport->port_id, rport->roles); +"3183 %s rport x%px DID x%x, role x%x refcnt %d\n" , + __func__, rport, rport->port_id, rport->roles, +kref_read (&ndlp->kref));if ((rport->scsi_target_id !=-1 ) && (rport->scsi_target_id <LPFC_MAX_TARGET )) {
@@ -4475,8 +4476,9 @@ lpfc_unregister_remote_port(struct lpfc_lpfc_printf_vlog (vport,KERN_INFO ,LOG_NODE ,"3184 rport unregister x%06x, rport x%px " -"xptflg x%x\n" , - ndlp->nlp_DID, rport, ndlp->fc4_xpt_flags); +"xptflg x%x refcnt %d\n" , + ndlp->nlp_DID, rport, ndlp->fc4_xpt_flags, +kref_read (&ndlp->kref));fc_remote_port_delete (rport);lpfc_nlp_put (ndlp);
drivers/scsi/lpfc/lpfc_nvme.c +3 -2
@@ -209,8 +209,9 @@ lpfc_nvme_remoteport_delete(struct nvme_* calling state machine to remove the node. */ lpfc_printf_vlog (vport,KERN_INFO ,LOG_NVME_DISC , -"6146 remoteport delete of remoteport x%px\n" , - remoteport); +"6146 remoteport delete of remoteport x%px, ndlp x%px " +"DID x%x xflags x%x\n" , + remoteport, ndlp, ndlp->nlp_DID, ndlp->fc4_xpt_flags);spin_lock_irq (&ndlp->lock);/* The register rebind might have occurred before the delete
Greg Kroah-Hartman
maintainerPATCH 12/917 scsi: lpfc: Fix FCP I/O flush functionality for TMF routines
In reply to Greg Kroah-HartmanFrom: James Smart <[email protected]>
commit cd8a36a90babf958082b87bc6b4df5dd70901eba upstream.
A prior patch inadvertently caused lpfc_sli_sum_iocb() to exclude counting of outstanding aborted I/Os and ABORT IOCBs. Thus, lpfc_reset_flush_io_context() called from any TMF routine does not properly wait to flush all outstanding FCP IOCBs leading to a block layer crash on an invalid scsi_cmnd->request pointer.
kernel BUG at ../block/blk-core.c:1489!
RIP: 0010:blk_requeue_request+0xaf/0xc0 ... Call Trace: <IRQ> __scsi_queue_insert+0x90/0xe0 [scsi_mod] blk_done_softirq+0x7e/0x90 __do_softirq+0xd2/0x280 irq_exit+0xd5/0xe0 do_IRQ+0x4c/0xd0 common_interrupt+0x87/0x87 </IRQ>
Fix by separating out the LPFC_IO_FCP, LPFC_IO_ON_TXCMPLQ, LPFC_DRIVER_ABORTED, and CMD_ABORT_XRI_CN || CMD_CLOSE_XRI_CN checks into a new lpfc_sli_validate_fcp_iocb_for_abort() routine when determining to build an ABORT iocb.
Restore lpfc_reset_flush_io_context() functionality by including counting of outstanding aborted IOCBs and ABORT IOCBs in lpfc_sli_sum_iocb().
--- drivers/scsi/lpfc/lpfc_sli.c | 101 +++++++++++++++++++++++++++++++++---------- 1 file changed, 78 insertions(+), 23 deletions(-)
drivers/scsi/lpfc/lpfc_sli.c +78 -23
@@ -12488,15 +12488,54 @@ lpfc_sli_hba_iocb_abort(struct lpfc_hba }/** -* lpfc_sli_validate_fcp_iocb - find commands associated with a vport or LUN +* lpfc_sli_validate_fcp_iocb_for_abort - filter iocbs appropriate for FCP aborts +* @iocbq: Pointer to iocb object. +* @vport: Pointer to driver virtual port object. +* +* This function acts as an iocb filter for functions which abort FCP iocbs. +* +* Return values +* -ENODEV, if a null iocb or vport ptr is encountered +* -EINVAL, if the iocb is not an FCP I/O, not on the TX cmpl queue, premarked as +* driver already started the abort process, or is an abort iocb itself +* 0, passes criteria for aborting the FCP I/O iocb +**/ +static int +lpfc_sli_validate_fcp_iocb_for_abort (struct lpfc_iocbq *iocbq, +struct lpfc_vport *vport) +{ +IOCB_t *icmd =NULL ; + +/* No null ptr vports */ +if (!iocbq || iocbq->vport != vport) +return -ENODEV ; + +/* iocb must be for FCP IO, already exists on the TX cmpl queue, +* can't be premarked as driver aborted, nor be an ABORT iocb itself +*/ + icmd = &iocbq->iocb; +if (!(iocbq->iocb_flag &LPFC_IO_FCP ) || + !(iocbq->iocb_flag &LPFC_IO_ON_TXCMPLQ ) || + (iocbq->iocb_flag &LPFC_DRIVER_ABORTED ) || + (icmd->ulpCommand ==CMD_ABORT_XRI_CN || + icmd->ulpCommand ==CMD_CLOSE_XRI_CN )) +return -EINVAL ; + +return 0 ; +} + +/** +* lpfc_sli_validate_fcp_iocb - validate commands associated with a SCSI target * @iocbq: Pointer to driver iocb object. * @vport: Pointer to driver virtual port object. * @tgt_id: SCSI ID of the target. * @lun_id: LUN ID of the scsi device. * @ctx_cmd: LPFC_CTX_LUN/LPFC_CTX_TGT/LPFC_CTX_HOST * -* This function acts as an iocb filter for functions which abort or count -* all FCP iocbs pending on a lun/SCSI target/SCSI host. It will return +* This function acts as an iocb filter for validating a lun/SCSI target/SCSI +* host. +* +* It will return * 0 if the filtering criteria is met for the given iocb and will return * 1 if the filtering criteria is not met. * If ctx_cmd == LPFC_CTX_LUN, the function returns 0 only if the
@@ -12515,22 +12554,8 @@ lpfc_sli_validate_fcp_iocb(struct lpfc_i lpfc_ctx_cmd ctx_cmd) {struct lpfc_io_buf *lpfc_cmd; -IOCB_t *icmd =NULL ;int rc =1 ; -if (!iocbq || iocbq->vport != vport) -return rc; - -if (!(iocbq->iocb_flag &LPFC_IO_FCP ) || - !(iocbq->iocb_flag &LPFC_IO_ON_TXCMPLQ ) || - iocbq->iocb_flag &LPFC_DRIVER_ABORTED ) -return rc; - - icmd = &iocbq->iocb; -if (icmd->ulpCommand ==CMD_ABORT_XRI_CN || - icmd->ulpCommand ==CMD_CLOSE_XRI_CN ) -return rc; - lpfc_cmd = container_of(iocbq, struct lpfc_io_buf, cur_iocbq);if (lpfc_cmd->pCmd ==NULL )
@@ -12585,17 +12610,33 @@ lpfc_sli_sum_iocb(struct lpfc_vport *vpo {struct lpfc_hba *phba = vport->phba;struct lpfc_iocbq *iocbq; +IOCB_t *icmd =NULL ;int sum, i; +unsigned long iflags; -spin_lock_irq (&phba->hbalock); +spin_lock_irqsave (&phba->hbalock, iflags);for (i =1 , sum =0 ; i <= phba->sli.last_iotag; i++) { iocbq = phba->sli.iocbq_lookup[i]; -if (lpfc_sli_validate_fcp_iocb (iocbq, vport, tgt_id, lun_id, - ctx_cmd) ==0 ) +if (!iocbq || iocbq->vport != vport) +continue ; +if (!(iocbq->iocb_flag &LPFC_IO_FCP ) || + !(iocbq->iocb_flag &LPFC_IO_ON_TXCMPLQ )) +continue ; + +/* Include counting outstanding aborts */ + icmd = &iocbq->iocb; +if (icmd->ulpCommand ==CMD_ABORT_XRI_CN || + icmd->ulpCommand ==CMD_CLOSE_XRI_CN ) { + sum++; +continue ; + } + +if (lpfc_sli_validate_fcp_iocb (iocbq, vport, tgt_id, lun_id, + ctx_cmd) ==0 ) sum++; } -spin_unlock_irq (&phba->hbalock); +spin_unlock_irqrestore (&phba->hbalock, iflags);return sum; }
@@ -12662,7 +12703,11 @@ lpfc_sli_abort_fcp_cmpl(struct lpfc_hba* * This function sends an abort command for every SCSI command * associated with the given virtual port pending on the ring -* filtered by lpfc_sli_validate_fcp_iocb function. +* filtered by lpfc_sli_validate_fcp_iocb_for_abort and then +* lpfc_sli_validate_fcp_iocb function. The ordering for validation before +* submitting abort iocbs must be lpfc_sli_validate_fcp_iocb_for_abort +* followed by lpfc_sli_validate_fcp_iocb. +* * When abort_cmd == LPFC_CTX_LUN, the function sends abort only to the * FCP iocbs associated with lun specified by tgt_id and lun_id * parameters
@@ -12694,6 +12739,9 @@ lpfc_sli_abort_iocb(struct lpfc_vport *vfor (i =1 ; i <= phba->sli.last_iotag; i++) { iocbq = phba->sli.iocbq_lookup[i]; +if (lpfc_sli_validate_fcp_iocb_for_abort (iocbq, vport)) +continue ; +if (lpfc_sli_validate_fcp_iocb (iocbq, vport, tgt_id, lun_id, abort_cmd) !=0 )continue ;
@@ -12726,7 +12774,11 @@ lpfc_sli_abort_iocb(struct lpfc_vport *v* * This function sends an abort command for every SCSI command * associated with the given virtual port pending on the ring -* filtered by lpfc_sli_validate_fcp_iocb function. +* filtered by lpfc_sli_validate_fcp_iocb_for_abort and then +* lpfc_sli_validate_fcp_iocb function. The ordering for validation before +* submitting abort iocbs must be lpfc_sli_validate_fcp_iocb_for_abort +* followed by lpfc_sli_validate_fcp_iocb. +* * When taskmgmt_cmd == LPFC_CTX_LUN, the function sends abort only to the * FCP iocbs associated with lun specified by tgt_id and lun_id * parameters
@@ -12764,6 +12816,9 @@ lpfc_sli_abort_taskmgmt(struct lpfc_vporfor (i =1 ; i <= phba->sli.last_iotag; i++) { iocbq = phba->sli.iocbq_lookup[i]; +if (lpfc_sli_validate_fcp_iocb_for_abort (iocbq, vport)) +continue ; +if (lpfc_sli_validate_fcp_iocb (iocbq, vport, tgt_id, lun_id, cmd) !=0 )continue ;
Greg Kroah-Hartman
maintainerPATCH 13/917 scsi: qla2xxx: Fix crash in NVMe abort path
In reply to Greg Kroah-HartmanFrom: Arun Easi <[email protected]>
commit e6e22e6cc2962d3f3d71914b47f7fbc454670e8a upstream.
System crash was seen when I/O was run against an NVMe target and aborts were occurring.
Crash stack is:
-- relevant crash stack --
BUG: kernel NULL pointer dereference, address: 0000000000000010
:
#6 [ffffae1f8666bdd0] page_fault at ffffffffa740122e
[exception RIP: qla_nvme_abort_work+339]
RIP: ffffffffc0f592e3 RSP: ffffae1f8666be80 RFLAGS: 00010297
RAX: 0000000000000000 RBX: ffff9b581fc8af80 RCX: ffffffffc0f83bd0
RDX: 0000000000000001 RSI: ffff9b5839c6c7c8 RDI: 0000000008000000
RBP: ffff9b6832f85000 R8: ffffffffc0f68160 R9: ffffffffc0f70652
R10: ffffae1f862ffdc8 R11: 0000000000000300 R12: 000000000000010d
R13: 0000000000000000 R14: ffff9b5839cea000 R15: 0ffff9b583fab170
ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018
#7 [ffffae1f8666be98] process_one_work at ffffffffa6aba184
#8 [ffffae1f8666bed8] worker_thread at ffffffffa6aba39d
#9 [ffffae1f8666bf10] kthread at ffffffffa6ac06edThe crash was due to a stale SRB structure access after it was aborted. Fix the issue by removing stale access.
--- drivers/scsi/qla2xxx/qla_nvme.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_nvme.c +12 -2
@@ -228,6 +228,8 @@ static void qla_nvme_abort_work(struct wfc_port_t *fcport = sp->fcport;struct qla_hw_data *ha = fcport->vha->hw;int rval, abts_done_called =1 ; +bool io_wait_for_abort_done; +uint32_t handle; ql_dbg(ql_dbg_io, fcport->vha, 0xffff, "%s called for sp=%p, hndl=%x on fcport=%p desc=%p deleted=%d\n",
@@ -244,12 +246,20 @@ static void qla_nvme_abort_work(struct w goto out; } +/* +* sp may not be valid after abort_command if return code is either +* SUCCESS or ERR_FROM_FW codes, so cache the value here. +*/ + io_wait_for_abort_done = ql2xabts_wait_nvme && +QLA_ABTS_WAIT_ENABLED (sp); + handle = sp->handle; + rval = ha->isp_ops->abort_command (sp);ql_dbg (ql_dbg_io, fcport->vha,0x212b ,"%s: %s command for sp=%p, handle=%x on fcport=%p rval=%x\n" , __func__, (rval !=QLA_SUCCESS ) ?"Failed to abort" :"Aborted" , - sp, sp->handle, fcport, rval); + sp, handle, fcport, rval);/* * If async tmf is enabled, the abort callback is called only on
@@ -264,7 +274,7 @@ static void qla_nvme_abort_work(struct w* are waited until ABTS complete. This kref is decreased * at qla24xx_abort_sp_done function. */ -if (abts_done_called && ql2xabts_wait_nvme &&QLA_ABTS_WAIT_ENABLED (sp)) +if (abts_done_called && io_wait_for_abort_done)return ; out:/* kref_get was done before work was schedule. */
Greg Kroah-Hartman
maintainerPATCH 14/917 scsi: qla2xxx: Fix kernel crash when accessing port_speed sysfs file
In reply to Greg Kroah-HartmanFrom: Arun Easi <[email protected]>
commit 3ef68d4f0c9e7cb589ae8b70f07d77f528105331 upstream.
Kernel crashes when accessing port_speed sysfs file. The issue happens on a CNA when the local array was accessed beyond bounds. Fix this by changing the lookup.
BUG: unable to handle kernel paging request at 0000000000004000 PGD 0 P4D 0 Oops: 0000 [#1] SMP PTI CPU: 15 PID: 455213 Comm: sosreport Kdump: loaded Not tainted 4.18.0-305.7.1.el8_4.x86_64 #1 RIP: 0010:string_nocheck+0x12/0x70 Code: 00 00 4c 89 e2 be 20 00 00 00 48 89 ef e8 86 9a 00 00 4c 01 e3 eb 81 90 49 89 f2 48 89 ce 48 89 f8 48 c1 fe 30 66 85 f6 74 4f <44> 0f b6 0a 45 84 c9 74 46 83 ee 01 41 b8 01 00 00 00 48 8d 7c 37 RSP: 0018:ffffb5141c1afcf0 EFLAGS: 00010286 RAX: ffff8bf4009f8000 RBX: ffff8bf4009f9000 RCX: ffff0a00ffffff04 RDX: 0000000000004000 RSI: ffffffffffffffff RDI: ffff8bf4009f8000 RBP: 0000000000004000 R08: 0000000000000001 R09: ffffb5141c1afb84 R10: ffff8bf4009f9000 R11: ffffb5141c1afce6 R12: ffff0a00ffffff04 R13: ffffffffc08e21aa R14: 0000000000001000 R15: ffffffffc08e21aa FS: 00007fc4ebfff700(0000) GS:ffff8c717f7c0000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000004000 CR3: 000000edfdee6006 CR4: 00000000001706e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: string+0x40/0x50 vsnprintf+0x33c/0x520 scnprintf+0x4d/0x90 qla2x00_port_speed_show+0xb5/0x100 [qla2xxx] dev_attr_show+0x1c/0x40 sysfs_kf_seq_show+0x9b/0x100 seq_read+0x153/0x410 vfs_read+0x91/0x140 ksys_read+0x4f/0xb0 do_syscall_64+0x5b/0x1a0 entry_SYSCALL_64_after_hwframe+0x65/0xca
--- drivers/scsi/qla2xxx/qla_attr.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_attr.c +22 -2
@@ -1868,6 +1868,18 @@ qla2x00_port_speed_store(struct device *return strlen (buf); } +static const struct { +u16 rate; +char *str; +} port_speed_str[] = { + {PORT_SPEED_4GB ,"4" }, + {PORT_SPEED_8GB ,"8" }, + {PORT_SPEED_16GB ,"16" }, + {PORT_SPEED_32GB ,"32" }, + {PORT_SPEED_64GB ,"64" }, + {PORT_SPEED_10GB ,"10" }, +}; +static ssize_t qla2x00_port_speed_show (struct device *dev,struct device_attribute *attr,char *buf)
@@ -1875,7 +1887,8 @@ qla2x00_port_speed_show(struct device *dstruct scsi_qla_host *vha =shost_priv (dev_to_shost (dev));struct qla_hw_data *ha = vha->hw;ssize_t rval; -char *spd[7 ] = {"0" ,"0" ,"0" ,"4" ,"8" ,"16" ,"32" }; +u16 i; +char *speed ="Unknown" ; rval =qla2x00_get_data_rate (vha);if (rval !=QLA_SUCCESS ) {
@@ -1884,7 +1897,14 @@ qla2x00_port_speed_show(struct device *dreturn -EINVAL ; } -return scnprintf (buf,PAGE_SIZE ,"%s\n" , spd[ha->link_data_rate]); +for (i =0 ; i <ARRAY_SIZE (port_speed_str); i++) { +if (port_speed_str[i].rate != ha->link_data_rate) +continue ; + speed = port_speed_str[i].str; +break ; + } + +return scnprintf (buf,PAGE_SIZE ,"%s\n" , speed); } static ssize_t
Greg Kroah-Hartman
maintainerPATCH 15/917 scsi: qla2xxx: Fix use after free in eh_abort path
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
commit 3d33b303d4f3b74a71bede5639ebba3cfd2a2b4d upstream.
In eh_abort path driver prematurely exits the call to upper layer. Check whether command is aborted / completed by firmware before exiting the call.
9 [ffff8b1ebf803c00] page_fault at ffffffffb0389778
[exception RIP: qla2x00_status_entry+0x48d]
RIP: ffffffffc04fa62d RSP: ffff8b1ebf803cb0 RFLAGS: 00010082 RAX: 00000000ffffffff RBX: 00000000000e0000 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 00000000000013d8 RDI: fffff3253db78440 RBP: ffff8b1ebf803dd0 R8: ffff8b1ebcd9b0c0 R9: 0000000000000000 R10: ffff8b1e38a30808 R11: 0000000000001000 R12: 00000000000003e9 R13: 0000000000000000 R14: ffff8b1ebcd9d740 R15: 0000000000000028 ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018
10 [ffff8b1ebf803cb0] enqueue_entity at ffffffffafce708f
11 [ffff8b1ebf803d00] enqueue_task_fair at ffffffffafce7b88 12 [ffff8b1ebf803dd8] qla24xx_process_response_queue at ffffffffc04fc9a6 [qla2xxx]
13 [ffff8b1ebf803e78] qla24xx_msix_rsp_q at ffffffffc04ff01b [qla2xxx] 14 [ffff8b1ebf803eb0] __handle_irq_event_percpu at ffffffffafd50714
--- drivers/scsi/qla2xxx/qla_os.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/scsi/qla2xxx/qla_os.c +5 -3
@@ -1258,6 +1258,7 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)uint32_t ratov_j;struct qla_qpair *qpair;unsigned long flags; +int fast_fail_status =SUCCESS ;if (qla2x00_isp_reg_stat (ha)) { ql_log(ql_log_info, vha, 0x8042,
@@ -1266,9 +1267,10 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)return FAILED ; } +/* Save any FAST_IO_FAIL value to return later if abort succeeds */ ret =fc_block_scsi_eh (cmd);if (ret !=0 ) -return ret; + fast_fail_status = ret; sp =scsi_cmd_priv (cmd); qpair = sp->qpair;
@@ -1276,7 +1278,7 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd) vha->cmd_timeout_cnt++;if ((sp->fcport && sp->fcport->deleted) || !qpair) -return SUCCESS ; +return fast_fail_status !=SUCCESS ? fast_fail_status :FAILED ;spin_lock_irqsave (qpair->qp_lock_ptr, flags); sp->comp = ∁
@@ -1311,7 +1313,7 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd) __func__, ha->r_a_tov/10); ret =FAILED ; }else { - ret =SUCCESS ; + ret = fast_fail_status; }break ;default :
Greg Kroah-Hartman
maintainerPATCH 16/917 ce/gf100: fix incorrect CE0 address calculation on some GPUs
In reply to Greg Kroah-HartmanFrom: Ben Skeggs <[email protected]>
commit 93f43ed81abec8c805e1b77eb1d20dbc51a24dc4 upstream.
The code which constructs the modules for each engine present on the GPU passes -1 for 'instance' on non-instanced engines, which affects how the name for a sub-device is generated. This is then stored as 'instance 0' in nvkm_subdev.inst, so code can potentially be shared with earlier GPUs that only had a single instance of an engine.
However, GF100's CE constructor uses this value to calculate the address of its falcon before it's translated, resulting in CE0 getting the wrong address.
This slightly modifies the approach, always passing a valid instance for engines that *can* have multiple copies, and having the code for earlier GPUs explicitly ask for non-instanced name generation.
--- drivers/gpu/drm/nouveau/nvkm/engine/ce/gt215.c | 2 +- drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/nouveau/nvkm/engine/ce/gt215.c +1 -1
@@ -78,6 +78,6 @@ int gt215_ce_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst, struct nvkm_engine **pengine) { - return nvkm_falcon_new_(>215_ce, device, type, inst, + return nvkm_falcon_new_(>215_ce, device, type, -1, (device->chipset != 0xaf), 0x104000, pengine); }
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +1 -2
@@ -3147,8 +3147,7 @@ nvkm_device_ctor(const struct nvkm_devicWARN_ON (device->chip->ptr.inst & ~((1 <<ARRAY_SIZE (device->ptr)) -1 )); \for (j =0 ; device->chip->ptr.inst && j <ARRAY_SIZE (device->ptr); j++) { \if ((device->chip->ptr.inst &BIT (j)) && (subdev_mask &BIT_ULL (type))) { \ -int inst = (device->chip->ptr.inst ==1 ) ?-1 : (j); \ - ret = device->chip->ptr.ctor (device, (type), inst, &device->ptr[j]); \ + ret = device->chip->ptr.ctor (device, (type), (j), &device->ptr[j]); \ subdev =nvkm_device_subdev (device, (type), (j)); \if (ret) { \nvkm_subdev_del (&subdev); \
Greg Kroah-Hartman
maintainerPATCH 17/917 char: xillybus: fix msg_ep UAF in xillyusb_probe()
In reply to Greg Kroah-HartmanFrom: Ziyang Xuan <[email protected]>
commit 15c9a359094ec6251578b02387436bc64f11a477 upstream.
When endpoint_alloc() return failed in xillyusb_setup_base_eps(), 'xdev->msg_ep' will be freed but not set to NULL. That lets program enter fail handling to cleanup_dev() in xillyusb_probe(). Check for 'xdev->msg_ep' is invalid in cleanup_dev() because 'xdev->msg_ep' did not set to NULL when was freed. So the UAF problem for 'xdev->msg_ep' is triggered.
==================================================================
BUG: KASAN: use-after-free in fifo_mem_release+0x1f4/0x210 CPU: 0 PID: 166 Comm: kworker/0:2 Not tainted 5.15.0-rc5+ #19 Call Trace: dump_stack_lvl+0xe2/0x152 print_address_description.constprop.0+0x21/0x140 ? fifo_mem_release+0x1f4/0x210 kasan_report.cold+0x7f/0x11b ? xillyusb_probe+0x530/0x700 ? fifo_mem_release+0x1f4/0x210 fifo_mem_release+0x1f4/0x210 ? __sanitizer_cov_trace_pc+0x1d/0x50 endpoint_dealloc+0x35/0x2b0 cleanup_dev+0x90/0x120 xillyusb_probe+0x59a/0x700
...
Freed by task 166: kasan_save_stack+0x1b/0x40 kasan_set_track+0x1c/0x30 kasan_set_free_info+0x20/0x30 __kasan_slab_free+0x109/0x140 kfree+0x117/0x4c0 xillyusb_probe+0x606/0x700
Set 'xdev->msg_ep' to NULL after being freed in xillyusb_setup_base_eps() to fix the UAF problem.
--- drivers/char/xillybus/xillyusb.c | 1 + 1 file changed, 1 insertion(+)
drivers/char/xillybus/xillyusb.c +1 -0
@@ -1912,6 +1912,7 @@ static int xillyusb_setup_base_eps(struc dealloc:endpoint_dealloc (xdev->msg_ep);/* Also frees FIFO mem if allocated */ + xdev->msg_ep =NULL ;return -ENOMEM ; }
Greg Kroah-Hartman
maintainerPATCH 18/917 mmc: mtk-sd: Add wait dma stop done flow
In reply to Greg Kroah-HartmanFrom: Derong Liu <[email protected]>
commit 43e5fee317f4b0a48992b8b07935b1a3ac20ce84 upstream.
We found this issue on a 5G platform, during CMDQ error handling, if DMA status is active when it call msdc_reset_hw(), it means mmc host hw reset and DMA transfer will be parallel, mmc host may access sram region unexpectedly. According to the programming guide of mtk-sd host, it needs to wait for dma stop done after set dma stop.
This change should be applied to all SoCs.
--- drivers/mmc/host/mtk-sd.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/mmc/host/mtk-sd.c +5 -0
@@ -8,6 +8,7 @@#include <linux/clk.h> #include <linux/delay.h> #include <linux/dma-mapping.h> +#include <linux/iopoll.h> #include <linux/ioport.h> #include <linux/irq.h> #include <linux/of_address.h>
@@ -2330,6 +2331,7 @@ static void msdc_cqe_enable(struct mmc_hstatic void msdc_cqe_disable (struct mmc_host *mmc,bool recovery) {struct msdc_host *host =mmc_priv (mmc); +unsigned int val =0 ;/* disable cmdq irq */ sdr_clr_bits (host->base +MSDC_INTEN ,MSDC_INT_CMDQ );
@@ -2339,6 +2341,9 @@ static void msdc_cqe_disable(struct mmc_if (recovery) {sdr_set_field (host->base +MSDC_DMA_CTRL ,MSDC_DMA_CTRL_STOP ,1 ); +if (WARN_ON (readl_poll_timeout (host->base +MSDC_DMA_CFG , val, + !(val &MSDC_DMA_CFG_STS ),1 ,3000 ))) +return ;msdc_reset_hw (host); } }
Greg Kroah-Hartman
maintainerPATCH 19/917 mmc: dw_mmc: Dont wait for DRTO on Write RSP error
In reply to Greg Kroah-HartmanFrom: Christian Löhle <[email protected]>
commit 43592c8736e84025d7a45e61a46c3fa40536a364 upstream.
Only wait for DRTO on reads, otherwise the driver hangs.
The driver prevents sending CMD12 on response errors like CRCs. According to the comment this is because some cards have problems with this during the UHS tuning sequence. Unfortunately this workaround currently also applies for any command with data. On reads this will set the drto timer, which then triggers after a while. On writes this will not set any timer and the tasklet will not be scheduled again.
I cannot test for the UHS workarounds need, but even if so, it should at most apply to reads. I have observed many hangs when CMD25 response contained a CRC error. This patch fixes this without touching the actual UHS tuning workaround.
--- drivers/mmc/host/dw_mmc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/host/dw_mmc.c +2 -1
@@ -2086,7 +2086,8 @@ static void dw_mci_tasklet_func(struct t* delayed. Allowing the transfer to take place * avoids races and keeps things simple. */ -if (err != -ETIMEDOUT ) { +if (err != -ETIMEDOUT && + host->dir_status ==DW_MCI_RECV_STATUS ) { state =STATE_SENDING_DATA ;continue ; }
Greg Kroah-Hartman
maintainerPATCH 20/917 exfat: fix incorrect loading of i_blocks for large files
In reply to Greg Kroah-HartmanFrom: Sungjong Seo <[email protected]>
commit 0c336d6e33f4bedc443404c89f43c91c8bd9ee11 upstream.
When calculating i_blocks, there was a mistake that was masked with a 32-bit variable. So i_blocks for files larger than 4 GiB had incorrect values. Mask with a 64-bit variable instead of 32-bit one.
--- fs/exfat/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/exfat/inode.c +1 -1
@@ -604,7 +604,7 @@ static int exfat_fill_inode(struct inodeexfat_save_attr (inode, info->attr); inode->i_blocks = ((i_size_read (inode) + (sbi->cluster_size -1 )) & - ~(sbi->cluster_size -1 )) >> inode->i_blkbits; + ~((loff_t )sbi->cluster_size -1 )) >> inode->i_blkbits; inode->i_mtime = info->mtime; inode->i_ctime = info->mtime; ei->i_crtime = info->crtime;
Greg Kroah-Hartman
maintainerPATCH 21/917 io-wq: remove worker to owner tw dependency
In reply to Greg Kroah-HartmanFrom: Pavel Begunkov <[email protected]>
commit 1d5f5ea7cb7d15b9fb1cc82673ebb054f02cd7d2 upstream.
INFO: task iou-wrk-6609:6612 blocked for more than 143 seconds.
Not tainted 5.15.0-rc5-syzkaller #0
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
task:iou-wrk-6609 state:D stack:27944 pid: 6612 ppid: 6526 flags:0x00004006
Call Trace:
context_switch kernel/sched/core.c:4940 [inline]
__schedule+0xb44/0x5960 kernel/sched/core.c:6287
schedule+0xd3/0x270 kernel/sched/core.c:6366
schedule_timeout+0x1db/0x2a0 kernel/time/timer.c:1857
do_wait_for_common kernel/sched/completion.c:85 [inline]
__wait_for_common kernel/sched/completion.c:106 [inline]
wait_for_common kernel/sched/completion.c:117 [inline]
wait_for_completion+0x176/0x280 kernel/sched/completion.c:138
io_worker_exit fs/io-wq.c:183 [inline]
io_wqe_worker+0x66d/0xc40 fs/io-wq.c:597
ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:295io-wq worker may submit a task_work to the master task and upon io_worker_exit() wait for the tw to get executed. The problem appears when the master task is waiting in coredump.c:
468 freezer_do_not_count(); 469 wait_for_completion(&core_state->startup); 470 freezer_count();
Apparently having some dependency on children threads getting everything stuck. Workaround it by cancelling the taks_work callback that causes it before going into io_worker_exit() waiting.
p.s. probably a better option is to not submit tw elevating the refcount in the first place, but let's leave this excercise for the future.
--- fs/io-wq.c | 46 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 9 deletions(-)
fs/io-wq.c +37 -9
@@ -140,6 +140,7 @@ static void io_wqe_dec_running(struct iostatic bool io_acct_cancel_pending_work (struct io_wqe *wqe,struct io_wqe_acct *acct,struct io_cb_cancel_data *match); +static void create_worker_cb (struct callback_head *cb);static bool io_worker_get (struct io_worker *worker) {
@@ -174,9 +175,44 @@ static void io_worker_ref_put(struct io_complete (&wq->worker_done); } +static void io_worker_cancel_cb (struct io_worker *worker) +{ +struct io_wqe_acct *acct =io_wqe_get_acct (worker); +struct io_wqe *wqe = worker->wqe; +struct io_wq *wq = wqe->wq; + +atomic_dec (&acct->nr_running); +raw_spin_lock (&worker->wqe->lock); + acct->nr_workers--; +raw_spin_unlock (&worker->wqe->lock); +io_worker_ref_put (wq); +clear_bit_unlock (0 , &worker->create_state); +io_worker_release (worker); +} + +static bool io_task_worker_match (struct callback_head *cb,void *data) +{ +struct io_worker *worker; + +if (cb->func != create_worker_cb) +return false; + worker = container_of(cb, struct io_worker, create_work); +return worker == data; +} +static void io_worker_exit (struct io_worker *worker) {struct io_wqe *wqe = worker->wqe; +struct io_wq *wq = wqe->wq; + +while (1 ) { +struct callback_head *cb =task_work_cancel_match (wq->task, + io_task_worker_match, worker); + +if (!cb) +break ; +io_worker_cancel_cb (worker); + }if (refcount_dec_and_test (&worker->ref))complete (&worker->ref_done);
@@ -1150,17 +1186,9 @@ static void io_wq_exit_workers(struct iowhile ((cb =task_work_cancel_match (wq->task, io_task_work_match, wq)) !=NULL ) {struct io_worker *worker; -struct io_wqe_acct *acct; worker = container_of(cb, struct io_worker, create_work); - acct =io_wqe_get_acct (worker); -atomic_dec (&acct->nr_running); -raw_spin_lock (&worker->wqe->lock); - acct->nr_workers--; -raw_spin_unlock (&worker->wqe->lock); -io_worker_ref_put (wq); -clear_bit_unlock (0 , &worker->create_state); -io_worker_release (worker); +io_worker_cancel_cb (worker); }rcu_read_lock ();
Greg Kroah-Hartman
maintainerPATCH 22/917 parisc: Fix set_fixmap() on PA1.x CPUs
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
commit 6e866a462867b60841202e900f10936a0478608c upstream.
Fix a kernel crash which happens on PA1.x CPUs while initializing the FTRACE/KPROBE breakpoints. The PTE table entries for the fixmap area were not created correctly.
--- arch/parisc/mm/fixmap.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
arch/parisc/mm/fixmap.c +1 -4
@@ -20,12 +20,9 @@ void notrace set_fixmap(enum fixed_addrepte_t *pte;if (pmd_none (*pmd)) - pmd =pmd_alloc (NULL , pud, vaddr); - - pte =pte_offset_kernel (pmd, vaddr); -if (pte_none (*pte)) pte =pte_alloc_kernel (pmd, vaddr); + pte =pte_offset_kernel (pmd, vaddr);set_pte_at (&init_mm, vaddr, pte,__mk_pte (phys,PAGE_KERNEL_RWX ));flush_tlb_kernel_range (vaddr, vaddr +PAGE_SIZE ); }
Greg Kroah-Hartman
maintainerPATCH 23/917 parisc: Fix ptrace check on syscall return
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
commit 8779e05ba8aaffec1829872ef9774a71f44f6580 upstream.
The TIF_XXX flags are stored in the flags field in the thread_info struct (TI_FLAGS), not in the flags field of the task_struct structure (TASK_FLAGS).
It seems this bug didn't generate any important side-effects, otherwise it wouldn't have went unnoticed for 12 years (since v2.6.32).
--- arch/parisc/kernel/entry.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/parisc/kernel/entry.S +1 -1
@@ -1834,7 +1834,7 @@ syscall_restore: LDREG TI_TASK-THREAD_SZ_ALGN-FRAME_SIZE(%r30),%r1 /* Are we being ptraced? */ - ldw TASK_FLAGS(%r1),%r19 + LDREG TI_FLAGS-THREAD_SZ_ALGN-FRAME_SIZE(%r30),%r19 ldi _TIF_SYSCALL_TRACE_MASK,%r2 and,COND(=) %r19,%r2,%r0 b,n syscall_restore_rfi
Greg Kroah-Hartman
maintainerPATCH 24/917 tpm: Check for integer overflow in tpm2_map_response_body()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit a0bcce2b2a169e10eb265c8f0ebdd5ae4c875670 upstream.
The "4 * be32_to_cpu(data->count)" multiplication can potentially overflow which would lead to memory corruption. Add a check for that.
--- drivers/char/tpm/tpm2-space.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/char/tpm/tpm2-space.c +3 -0
@@ -455,6 +455,9 @@ static int tpm2_map_response_body(structif (be32_to_cpu (data->capability) !=TPM2_CAP_HANDLES )return 0 ; +if (be32_to_cpu (data->count) > (UINT_MAX -TPM_HEADER_SIZE -9 ) /4 ) +return -EFAULT ; +if (len !=TPM_HEADER_SIZE +9 +4 *be32_to_cpu (data->count))return -EFAULT ;
Greg Kroah-Hartman
maintainerPATCH 25/917 firmware/psci: fix application of sizeof to pointer
In reply to Greg Kroah-HartmanFrom: jing yangyang <[email protected]>
commit 2ac5fb35cd520ab1851c9a4816c523b65276052f upstream.
sizeof when applied to a pointer typed expression gives the size of the pointer.
./drivers/firmware/psci/psci_checker.c:158:41-47: ERROR application of sizeof to pointer
This issue was detected with the help of Coccinelle.
--- drivers/firmware/psci/psci_checker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/psci/psci_checker.c +1 -1
@@ -155,7 +155,7 @@ static int alloc_init_cpu_groups(cpumaskif (!alloc_cpumask_var (&tmp,GFP_KERNEL ))return -ENOMEM ; - cpu_groups =kcalloc (nb_available_cpus,sizeof (cpu_groups), + cpu_groups =kcalloc (nb_available_cpus,sizeof (*cpu_groups),GFP_KERNEL );if (!cpu_groups) {free_cpumask_var (tmp);
Greg Kroah-Hartman
maintainerPATCH 26/917 crypto: s5p-sss - Add error handling in s5p_aes_probe()
In reply to Greg Kroah-HartmanFrom: Tang Bin <[email protected]>
commit a472cc0dde3eb057db71c80f102556eeced03805 upstream.
The function s5p_aes_probe() does not perform sufficient error checking after executing platform_get_resource(), thus fix it.
--- drivers/crypto/s5p-sss.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/crypto/s5p-sss.c +2 -0
@@ -2171,6 +2171,8 @@ static int s5p_aes_probe(struct platform variant =find_s5p_sss_version (pdev); res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!res) +return -EINVAL ;/* * Note: HASH and PRNG uses the same registers in secss, avoid
Greg Kroah-Hartman
maintainerPATCH 27/917 media: rkvdec: Do not override sizeimage for output format
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
commit 298d8e8f7bcf023aceb60232d59b983255fec0df upstream.
The rkvdec H.264 decoder currently overrides sizeimage for the output format. This causes issues when userspace requires and requests a larger buffer, but ends up with one of insufficient size.
Instead, only provide a default size if none was requested. This fixes the video_decode_accelerator_tests from Chromium failing on the first frame due to insufficient buffer space. It also aligns the behavior of the rkvdec driver with the Hantro and Cedrus drivers.
--- drivers/staging/media/rkvdec/rkvdec-h264.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/staging/media/rkvdec/rkvdec-h264.c +3 -2
@@ -1015,8 +1015,9 @@ static int rkvdec_h264_adjust_fmt(structstruct v4l2_pix_format_mplane *fmt = &f->fmt.pix_mp; fmt->num_planes =1 ; - fmt->plane_fmt[0 ].sizeimage = fmt->width * fmt->height * -RKVDEC_H264_MAX_DEPTH_IN_BYTES ; +if (!fmt->plane_fmt[0 ].sizeimage) + fmt->plane_fmt[0 ].sizeimage = fmt->width * fmt->height * +RKVDEC_H264_MAX_DEPTH_IN_BYTES ;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 28/917 media: ite-cir: IR receiver stop working after receive overflow
In reply to Greg Kroah-HartmanFrom: Sean Young <[email protected]>
commit fdc881783099c6343921ff017450831c8766d12a upstream.
On an Intel NUC6iSYK, no IR is reported after a receive overflow.
When a receiver overflow occurs, this condition is only cleared by reading the fifo. Make sure we read anything in the fifo.
--- drivers/media/rc/ite-cir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/rc/ite-cir.c +1 -1
@@ -242,7 +242,7 @@ static irqreturn_t ite_cir_isr(int irq, }/* check for the receive interrupt */ -if (iflags &ITE_IRQ_RX_FIFO ) { +if (iflags & (ITE_IRQ_RX_FIFO |ITE_IRQ_RX_FIFO_OVERRUN )) {/* read the FIFO bytes */ rx_bytes = dev->params->get_rx_bytes (dev, rx_buf,ITE_RX_FIFO_LEN );
Greg Kroah-Hartman
maintainerPATCH 29/917 media: rkvdec: Support dynamic resolution changes
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
commit 0887e9e152efbd3601d6c907e90033d25067277d upstream.
The mem-to-mem stateless decoder API specifies support for dynamic resolution changes. In particular, the decoder should accept format changes on the OUTPUT queue even when buffers have been allocated, as long as it is not streaming.
Relax restrictions for S_FMT as described in the previous paragraph, and as long as the codec format remains the same. This aligns it with the Hantro and Cedrus decoders. This change was mostly based on commit ae02d49493b5 ("media: hantro: Fix s_fmt for dynamic resolution changes").
Since rkvdec_s_fmt() is now just a wrapper around the output/capture variants without any additional shared functionality, drop the wrapper and call the respective functions directly.
--- drivers/staging/media/rkvdec/rkvdec.c | 40 +++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-)
drivers/staging/media/rkvdec/rkvdec.c +20 -20
@@ -280,31 +280,20 @@ static int rkvdec_try_output_fmt(structreturn 0 ; } -static int rkvdec_s_fmt (struct file *file,void *priv, -struct v4l2_format *f, -int (*try_fmt)(struct file *,void *, -struct v4l2_format *)) +static int rkvdec_s_capture_fmt (struct file *file,void *priv, +struct v4l2_format *f) {struct rkvdec_ctx *ctx =fh_to_rkvdec_ctx (priv);struct vb2_queue *vq; +int ret; -if (!try_fmt) -return -EINVAL ; - - vq =v4l2_m2m_get_vq (ctx->fh.m2m_ctx, f->type); +/* Change not allowed if queue is busy */ + vq =v4l2_m2m_get_vq (ctx->fh.m2m_ctx, +V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE );if (vb2_is_busy (vq))return -EBUSY ; -return try_fmt (file, priv, f); -} - -static int rkvdec_s_capture_fmt (struct file *file,void *priv, -struct v4l2_format *f) -{ -struct rkvdec_ctx *ctx =fh_to_rkvdec_ctx (priv); -int ret; - - ret =rkvdec_s_fmt (file, priv, f, rkvdec_try_capture_fmt); + ret =rkvdec_try_capture_fmt (file, priv, f);if (ret)return ret;
@@ -319,10 +308,21 @@ static int rkvdec_s_output_fmt(struct fistruct v4l2_m2m_ctx *m2m_ctx = ctx->fh.m2m_ctx;const struct rkvdec_coded_fmt_desc *desc;struct v4l2_format *cap_fmt; -struct vb2_queue *peer_vq; +struct vb2_queue *peer_vq, *vq;int ret;/* +* In order to support dynamic resolution change, the decoder admits +* a resolution change, as long as the pixelformat remains. Can't be +* done if streaming. +*/ + vq =v4l2_m2m_get_vq (m2m_ctx,V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE ); +if (vb2_is_streaming (vq) || + (vb2_is_busy (vq) && + f->fmt.pix_mp.pixelformat != ctx->coded_fmt.fmt.pix_mp.pixelformat)) +return -EBUSY ; + +/* * Since format change on the OUTPUT queue will reset the CAPTURE * queue, we can't allow doing so when the CAPTURE queue has buffers * allocated.
@@ -331,7 +331,7 @@ static int rkvdec_s_output_fmt(struct fiif (vb2_is_busy (peer_vq))return -EBUSY ; - ret =rkvdec_s_fmt (file, priv, f, rkvdec_try_output_fmt); + ret =rkvdec_try_output_fmt (file, priv, f);if (ret)return ret;
Greg Kroah-Hartman
maintainerPATCH 30/917 media: ir-kbd-i2c: improve responsiveness of hauppauge zilog receivers
In reply to Greg Kroah-HartmanFrom: Sean Young <[email protected]>
commit c73ba202a851c0b611ef2c25e568fadeff5e667f upstream.
The IR receiver has two issues:
- Sometimes there is no response to a button press
- Sometimes a button press is repeated when it should not have been
Hanging the polling interval fixes this behaviour.
--- drivers/media/i2c/ir-kbd-i2c.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/i2c/ir-kbd-i2c.c +1 -0
@@ -791,6 +791,7 @@ static int ir_probe(struct i2c_client *c rc_proto =RC_PROTO_BIT_RC5 |RC_PROTO_BIT_RC6_MCE |RC_PROTO_BIT_RC6_6A_32 ; ir_codes =RC_MAP_HAUPPAUGE ; + ir->polling_interval =125 ; probe_tx = true;break ; }
Greg Kroah-Hartman
maintainerPATCH 31/917 media: v4l2-ioctl: Fix check_ext_ctrls
In reply to Greg Kroah-HartmanFrom: Ricardo Ribalda <[email protected]>
commit 861f92cb9160b14beef0ada047384c2340701ee2 upstream.
Drivers that do not use the ctrl-framework use this function instead.
Fix the following issues:
- Do not check for multiple classes when getting the DEF_VAL.
- Return -EINVAL for request_api calls
- Default value cannot be changed, return EINVAL as soon as possible.
- Return the right error_idx
[If an error is found when validating the list of controls passed with VIDIOC_G_EXT_CTRLS, then error_idx shall be set to ctrls->count to indicate to userspace that no actual hardware was touched. It would have been much nicer of course if error_idx could point to the control index that failed the validation, but sadly that's not how the API was designed.]
Fixes v4l2-compliance:
Control ioctls (Input 0):
warn: v4l2-test-controls.cpp(834): error_idx should be equal to count
warn: v4l2-test-controls.cpp(855): error_idx should be equal to count
fail: v4l2-test-controls.cpp(813): doioctl(node, VIDIOC_G_EXT_CTRLS, &ctrls)
test VIDIOC_G/S/TRY_EXT_CTRLS: FAIL
Buffer ioctls (Input 0):
fail: v4l2-test-buffers.cpp(1994): ret != EINVAL && ret != EBADR && ret != ENOTTY test Requests: FAIL
--- drivers/media/v4l2-core/v4l2-ioctl.c | 60 ++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 21 deletions(-)
drivers/media/v4l2-core/v4l2-ioctl.c +39 -21
@@ -869,7 +869,7 @@ static void v4l_print_default(const voidpr_cont ("driver-specific ioctl\n" ); } -static int check_ext_ctrls (struct v4l2_ext_controls *c,int allow_priv) +static bool check_ext_ctrls (struct v4l2_ext_controls *c,unsigned long ioctl) {__u32 i;
@@ -878,23 +878,41 @@ static int check_ext_ctrls(struct v4l2_efor (i =0 ; i < c->count; i++) c->controls[i].reserved2[0 ] =0 ; -/* V4L2_CID_PRIVATE_BASE cannot be used as control class -when using extended controls. -Only when passed in through VIDIOC_G_CTRL and VIDIOC_S_CTRL -is it allowed for backwards compatibility. -*/ -if (!allow_priv && c->which ==V4L2_CID_PRIVATE_BASE ) -return 0 ; -if (!c->which) -return 1 ; +switch (c->which) { +case V4L2_CID_PRIVATE_BASE : +/* +* V4L2_CID_PRIVATE_BASE cannot be used as control class +* when using extended controls. +* Only when passed in through VIDIOC_G_CTRL and VIDIOC_S_CTRL +* is it allowed for backwards compatibility. +*/ +if (ioctl ==VIDIOC_G_CTRL || ioctl ==VIDIOC_S_CTRL ) +return false; +break ; +case V4L2_CTRL_WHICH_DEF_VAL : +/* Default value cannot be changed */ +if (ioctl ==VIDIOC_S_EXT_CTRLS || + ioctl ==VIDIOC_TRY_EXT_CTRLS ) { + c->error_idx = c->count; +return false; + } +return true; +case V4L2_CTRL_WHICH_CUR_VAL : +return true; +case V4L2_CTRL_WHICH_REQUEST_VAL : + c->error_idx = c->count; +return false; + } +/* Check that all controls are from the same control class. */ for (i =0 ; i < c->count; i++) {if (V4L2_CTRL_ID2WHICH (c->controls[i].id) != c->which) { - c->error_idx = i; -return 0 ; + c->error_idx = ioctl ==VIDIOC_TRY_EXT_CTRLS ? i : + c->count; +return false; } } -return 1 ; +return true; }static int check_fmt (struct file *file,enum v4l2_buf_type type)
@@ -2187,7 +2205,7 @@ static int v4l_g_ctrl(const struct v4l2_ ctrls.controls = &ctrl; ctrl.id = p->id; ctrl.value = p->value; -if (check_ext_ctrls (&ctrls,1 )) { +if (check_ext_ctrls (&ctrls,VIDIOC_G_CTRL )) {int ret = ops->vidioc_g_ext_ctrls (file, fh, &ctrls);if (ret ==0 )
@@ -2221,7 +2239,7 @@ static int v4l_s_ctrl(const struct v4l2_ ctrls.controls = &ctrl; ctrl.id = p->id; ctrl.value = p->value; -if (check_ext_ctrls (&ctrls,1 )) +if (check_ext_ctrls (&ctrls,VIDIOC_S_CTRL ))return ops->vidioc_s_ext_ctrls (file, fh, &ctrls);return -EINVAL ; }
@@ -2243,8 +2261,8 @@ static int v4l_g_ext_ctrls(const struct vfd, vfd->v4l2_dev->mdev, p);if (ops->vidioc_g_ext_ctrls ==NULL )return -ENOTTY ; -return check_ext_ctrls (p,0 ) ? ops->vidioc_g_ext_ctrls (file, fh, p) : - -EINVAL ; +return check_ext_ctrls (p,VIDIOC_G_EXT_CTRLS ) ? + ops->vidioc_g_ext_ctrls (file, fh, p) : -EINVAL ; } static int v4l_s_ext_ctrls(const struct v4l2_ioctl_ops *ops,
@@ -2264,8 +2282,8 @@ static int v4l_s_ext_ctrls(const struct vfd, vfd->v4l2_dev->mdev, p);if (ops->vidioc_s_ext_ctrls ==NULL )return -ENOTTY ; -return check_ext_ctrls (p,0 ) ? ops->vidioc_s_ext_ctrls (file, fh, p) : - -EINVAL ; +return check_ext_ctrls (p,VIDIOC_S_EXT_CTRLS ) ? + ops->vidioc_s_ext_ctrls (file, fh, p) : -EINVAL ; } static int v4l_try_ext_ctrls(const struct v4l2_ioctl_ops *ops,
@@ -2285,8 +2303,8 @@ static int v4l_try_ext_ctrls(const struc vfd, vfd->v4l2_dev->mdev, p);if (ops->vidioc_try_ext_ctrls ==NULL )return -ENOTTY ; -return check_ext_ctrls (p,0 ) ? ops->vidioc_try_ext_ctrls (file, fh, p) : - -EINVAL ; +return check_ext_ctrls (p,VIDIOC_TRY_EXT_CTRLS ) ? + ops->vidioc_try_ext_ctrls (file, fh, p) : -EINVAL ; }/*
Greg Kroah-Hartman
maintainerPATCH 32/917 ALSA: hda/realtek: Fix mic mute LED for the HP Spectre x360 14
In reply to Greg Kroah-HartmanFrom: Johnathon Clark <[email protected]>
commit 5fc462c3aaad601d5089fd5588a5799896a6937d upstream.
On the 'HP Spectre x360 Convertible 14-ea0xx' the microphone mute led is controlled by GPIO 0x04. The speaker mute LED does not seem to be exposed by GPIO and is there not set.
[ a slight coding-style fix by tiwai ]
--- sound/pci/hda/patch_realtek.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
sound/pci/hda/patch_realtek.c +17 -0
@@ -4355,6 +4355,16 @@ static void alc287_fixup_hp_gpio_led(stralc_fixup_hp_gpio_led (codec, action,0x10 ,0 ); } +static void alc245_fixup_hp_gpio_led (struct hda_codec *codec, +const struct hda_fixup *fix,int action) +{ +struct alc_spec *spec = codec->spec; + +if (action ==HDA_FIXUP_ACT_PRE_PROBE ) + spec->micmute_led_polarity =1 ; +alc_fixup_hp_gpio_led (codec, action,0 ,0x04 ); +} +/* turn on/off mic-mute LED per capture hook via VREF change */ static int vref_micmute_led_set (struct led_classdev *led_cdev,enum led_brightness brightness)
@@ -6709,6 +6719,7 @@ enum {ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK ,ALC287_FIXUP_HP_GPIO_LED ,ALC256_FIXUP_HP_HEADSET_MIC , +ALC245_FIXUP_HP_GPIO_LED ,ALC236_FIXUP_DELL_AIO_HEADSET_MIC ,ALC282_FIXUP_ACER_DISABLE_LINEOUT , ALC255_FIXUP_ACER_LIMIT_INT_MIC_BOOST,
@@ -7333,6 +7344,8 @@ static const struct hda_fixup alc269_fix [ALC245_FIXUP_HP_X360_AMP] = { .type = HDA_FIXUP_FUNC, .v.func = alc245_fixup_hp_x360_amp, + .chained = true, + .chain_id =ALC245_FIXUP_HP_GPIO_LED }, [ALC288_FIXUP_DELL_HEADSET_MODE] = { .type = HDA_FIXUP_FUNC,
@@ -8432,6 +8445,10 @@ static const struct hda_fixup alc269_fix .type = HDA_FIXUP_FUNC, .v.func = alc256_fixup_tongfang_reset_persistent_settings, }, + [ALC245_FIXUP_HP_GPIO_LED] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc245_fixup_hp_gpio_led, + }, }; static const struct snd_pci_quirk alc269_fixup_tbl[] = {
Greg Kroah-Hartman
maintainerPATCH 33/917 ALSA: hda/realtek: Add a quirk for HP OMEN 15 mute LED
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 375f8426ed994addd2be4d76febc946a6fdd8280 upstream.
HP OMEN 15 laptop requires the quirk to fiddle with COEF 0x0b bit 2 for toggling the mute LED. It's already implemented for other HP laptops, and we just need to add a proper fixup entry.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -8634,6 +8634,7 @@ static const struct snd_pci_quirk alc269 ALC285_FIXUP_HP_GPIO_AMP_INIT),SND_PCI_QUIRK (0x103c ,0x8783 ,"HP ZBook Fury 15 G7 Mobile Workstation" ,ALC285_FIXUP_HP_GPIO_AMP_INIT ), +SND_PCI_QUIRK (0x103c ,0x8788 ,"HP OMEN 15" ,ALC285_FIXUP_HP_MUTE_LED ),SND_PCI_QUIRK (0x103c ,0x87c8 ,"HP" ,ALC287_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x87e5 ,"HP ProBook 440 G8 Notebook PC" ,ALC236_FIXUP_HP_GPIO_LED ), SND_PCI_QUIRK(0x103c, 0x87e7, "HP ProBook 450 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
Greg Kroah-Hartman
maintainerPATCH 34/917 ALSA: hda/realtek: Add quirk for Clevo PC70HS
In reply to Greg Kroah-HartmanFrom: Tim Crawford <[email protected]>
commit dbfe83507cf4ea66ce4efee2ac14c5ad420e31d3 upstream.
Apply the PB51ED PCI quirk to the Clevo PC70HS. Fixes audio output from the internal speakers.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -2539,6 +2539,7 @@ static const struct snd_pci_quirk alc882SND_PCI_QUIRK (0x1558 ,0x67d1 ,"Clevo PB71[ER][CDF]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ),SND_PCI_QUIRK (0x1558 ,0x67e1 ,"Clevo PB71[DE][CDF]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ),SND_PCI_QUIRK (0x1558 ,0x67e5 ,"Clevo PC70D[PRS](?:-D|-G)?" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ), +SND_PCI_QUIRK (0x1558 ,0x67f1 ,"Clevo PC70H[PRS]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ),SND_PCI_QUIRK (0x1558 ,0x70d1 ,"Clevo PC70[ER][CDF]" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ),SND_PCI_QUIRK (0x1558 ,0x7714 ,"Clevo X170SM" ,ALC1220_FIXUP_CLEVO_PB51ED_PINS ), SND_PCI_QUIRK(0x1558, 0x7715, "Clevo X170KM-G", ALC1220_FIXUP_CLEVO_PB51ED),
Greg Kroah-Hartman
maintainerPATCH 35/917 ALSA: hda/realtek: Headset fixup for Clevo NH77HJQ
In reply to Greg Kroah-HartmanFrom: Jeremy Soller <[email protected]>
commit 1278cc5ac2f96bab50dd55c8c05e0a6a77ce323e upstream.
On Clevo NH77HJ, NH77HP, and their 15" variants, there is a headset microphone input attached to 0x19 that does not have a jack detect. In order to get it working, the pin configuration needs to be set correctly, and a new ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE fixup is applied. This is similar to the existing System76 quirk for ALC293, but for ALC256.
--- sound/pci/hda/patch_realtek.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
sound/pci/hda/patch_realtek.c +14 -0
@@ -6739,6 +6739,7 @@ enum {ALC287_FIXUP_YOGA7_14ITL_SPEAKERS ,ALC287_FIXUP_13S_GEN2_SPEAKERS ,ALC256_FIXUP_TONGFANG_RESET_PERSISTENT_SETTINGS , + ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE, }; static const struct hda_fixup alc269_fixups[] = {
@@ -8450,6 +8451,15 @@ static const struct hda_fixup alc269_fix .type = HDA_FIXUP_FUNC, .v.func = alc245_fixup_hp_gpio_led, }, + [ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl []) { + {0x19 ,0x03a11120 },/* use as headset mic, without its own jack detect */ + { } + }, + .chained = true, + .chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC, + }, };static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -8750,11 +8760,15 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1558 ,0x40a1 ,"Clevo NL40GU" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x40c1 ,"Clevo NL40[CZ]U" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x40d1 ,"Clevo NL41DU" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ), +SND_PCI_QUIRK (0x1558 ,0x5015 ,"Clevo NH5[58]H[HJK]Q" ,ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE ), +SND_PCI_QUIRK (0x1558 ,0x5017 ,"Clevo NH7[79]H[HJK]Q" ,ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x50a3 ,"Clevo NJ51GU" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x50b3 ,"Clevo NK50S[BEZ]" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x50b6 ,"Clevo NK50S5" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x50b8 ,"Clevo NK50SZ" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x50d5 ,"Clevo NP50D5" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ), +SND_PCI_QUIRK (0x1558 ,0x50e1 ,"Clevo NH5[58]HPQ" ,ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE ), +SND_PCI_QUIRK (0x1558 ,0x50e2 ,"Clevo NH7[79]HPQ" ,ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x50f0 ,"Clevo NH50A[CDF]" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x50f2 ,"Clevo NH50E[PR]" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x1558, 0x50f3, "Clevo NH58DPQ", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
Greg Kroah-Hartman
maintainerPATCH 36/917 ALSA: hda/realtek: Add a quirk for Acer Spin SP513-54N
In reply to Greg Kroah-HartmanFrom: Jaroslav Kysela <[email protected]>
commit 2a5bb694488bb6593066d46881bfd9d07edd1628 upstream.
Another model requires ALC255_FIXUP_ACER_MIC_NO_PRESENCE fixup.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -8496,6 +8496,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1025 ,0x1308 ,"Acer Aspire Z24-890" ,ALC286_FIXUP_ACER_AIO_HEADSET_MIC ),SND_PCI_QUIRK (0x1025 ,0x132a ,"Acer TravelMate B114-21" ,ALC233_FIXUP_ACER_HEADSET_MIC ),SND_PCI_QUIRK (0x1025 ,0x1330 ,"Acer TravelMate X514-51T" ,ALC255_FIXUP_ACER_HEADSET_MIC ), +SND_PCI_QUIRK (0x1025 ,0x141f ,"Acer Spin SP513-54N" ,ALC255_FIXUP_ACER_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1025 ,0x142b ,"Acer Swift SF314-42" ,ALC255_FIXUP_ACER_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1025 ,0x1430 ,"Acer TravelMate B311R-31" ,ALC256_FIXUP_ACER_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x1025, 0x1466, "Acer Aspire A515-56", ALC255_FIXUP_ACER_HEADPHONE_AND_MIC),
Greg Kroah-Hartman
maintainerPATCH 37/917 ALSA: hda/realtek: Add quirk for ASUS UX550VE
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 4fad4fb9871b43389e4f4bead18ec693064697bb upstream.
ASUS UX550VE (SSID 1043:1970) requires a similar workaround for managing the routing of the 4 speakers like some other ASUS models. Add a corresponding quirk entry for fixing it.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -8698,6 +8698,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1043 ,0x18b1 ,"Asus MJ401TA" ,ALC256_FIXUP_ASUS_HEADSET_MIC ),SND_PCI_QUIRK (0x1043 ,0x18f1 ,"Asus FX505DT" ,ALC256_FIXUP_ASUS_HEADSET_MIC ),SND_PCI_QUIRK (0x1043 ,0x194e ,"ASUS UX563FD" ,ALC294_FIXUP_ASUS_HPE ), +SND_PCI_QUIRK (0x1043 ,0x1970 ,"ASUS UX550VE" ,ALC289_FIXUP_ASUS_GA401 ),SND_PCI_QUIRK (0x1043 ,0x1982 ,"ASUS B1400CEPE" ,ALC256_FIXUP_ASUS_HPE ),SND_PCI_QUIRK (0x1043 ,0x19ce ,"ASUS B9450FA" ,ALC294_FIXUP_ASUS_HPE ), SND_PCI_QUIRK(0x1043, 0x19e1, "ASUS UX581LV", ALC295_FIXUP_ASUS_MIC_NO_PRESENCE),
Greg Kroah-Hartman
maintainerPATCH 38/917 ALSA: hda/realtek: Add quirk for HP EliteBook 840 G7 mute LED
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
commit c058493df7edcef8f48c1494d9a84218519f966b upstream.
The mute and micmute LEDs don't work on HP EliteBook 840 G7. The same quirk for other HP laptops can let LEDs work, so apply it.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -8636,6 +8636,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x103c ,0x8716 ,"HP Elite Dragonfly G2 Notebook PC" ,ALC285_FIXUP_HP_GPIO_AMP_INIT ),SND_PCI_QUIRK (0x103c ,0x8720 ,"HP EliteBook x360 1040 G8 Notebook PC" ,ALC285_FIXUP_HP_GPIO_AMP_INIT ),SND_PCI_QUIRK (0x103c ,0x8724 ,"HP EliteBook 850 G7" ,ALC285_FIXUP_HP_GPIO_LED ), +SND_PCI_QUIRK (0x103c ,0x8728 ,"HP EliteBook 840 G7" ,ALC285_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8729 ,"HP" ,ALC285_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8730 ,"HP ProBook 445 G7" ,ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF ), SND_PCI_QUIRK(0x103c, 0x8736, "HP", ALC285_FIXUP_HP_GPIO_AMP_INIT),
Greg Kroah-Hartman
maintainerPATCH 39/917 ALSA: ua101: fix division by zero at probe
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 55f261b73a7e1cb254577c3536cef8f415de220a upstream.
Add the missing endpoint max-packet sanity check to probe() to avoid division by zero in alloc_stream_buffers() in case a malicious device has broken descriptors (or when doing descriptor fuzz testing).
Note that USB core will reject URBs submitted for endpoints with zero wMaxPacketSize but that drivers doing packet-size calculations still need to handle this (cf. commit 2548288b4fb0 ("USB: Fix: Don't skip endpoint descriptors with maxpacket=0")).
--- sound/usb/misc/ua101.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/usb/misc/ua101.c +2 -2
@@ -1000,7 +1000,7 @@ static int detect_usb_format(struct ua10 fmt_playback->bSubframeSize * ua->playback.channels; epd = &ua->intf[INTF_CAPTURE ]->altsetting[1 ].endpoint[0 ].desc; -if (!usb_endpoint_is_isoc_in (epd)) { +if (!usb_endpoint_is_isoc_in (epd) ||usb_endpoint_maxp (epd) ==0 ) {dev_err (&ua->dev->dev,"invalid capture endpoint\n" );return -ENXIO ; }
@@ -1008,7 +1008,7 @@ static int detect_usb_format(struct ua10 ua->capture.max_packet_bytes =usb_endpoint_maxp (epd); epd = &ua->intf[INTF_PLAYBACK ]->altsetting[1 ].endpoint[0 ].desc; -if (!usb_endpoint_is_isoc_out (epd)) { +if (!usb_endpoint_is_isoc_out (epd) ||usb_endpoint_maxp (epd) ==0 ) {dev_err (&ua->dev->dev,"invalid playback endpoint\n" );return -ENXIO ; }
Greg Kroah-Hartman
maintainerPATCH 40/917 ALSA: 6fire: fix control and bulk message timeouts
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 9b371c6cc37f954360989eec41c2ddc5a6b83917 upstream.
USB control and bulk message timeouts are specified in milliseconds and should specifically not vary with CONFIG_HZ.
--- sound/usb/6fire/comm.c | 2 +- sound/usb/6fire/firmware.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
sound/usb/6fire/comm.c +1 -1
@@ -95,7 +95,7 @@ static int usb6fire_comm_send_buffer(u8int actual_len; ret =usb_interrupt_msg (dev,usb_sndintpipe (dev,COMM_EP ), - buffer, buffer[1 ] +2 , &actual_len,HZ ); + buffer, buffer[1 ] +2 , &actual_len,1000 );if (ret <0 )return ret;else if (actual_len != buffer[1 ] +2 )
sound/usb/6fire/firmware.c +3 -3
@@ -160,7 +160,7 @@ static int usb6fire_fw_ezusb_write(struc {return usb_control_msg_send (device,0 , type,USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_DEVICE , - value,0 , data, len,HZ ,GFP_KERNEL ); + value,0 , data, len,1000 ,GFP_KERNEL ); } static int usb6fire_fw_ezusb_read(struct usb_device *device,
@@ -168,7 +168,7 @@ static int usb6fire_fw_ezusb_read(struct {return usb_control_msg_recv (device,0 , type,USB_DIR_IN |USB_TYPE_VENDOR |USB_RECIP_DEVICE , - value,0 , data, len,HZ ,GFP_KERNEL ); + value,0 , data, len,1000 ,GFP_KERNEL ); } static int usb6fire_fw_fpga_write(struct usb_device *device,
@@ -178,7 +178,7 @@ static int usb6fire_fw_fpga_write(structint ret; ret =usb_bulk_msg (device,usb_sndbulkpipe (device,FPGA_EP ), data, len, - &actual_len,HZ ); + &actual_len,1000 );if (ret <0 )return ret;else if (actual_len != len)
Greg Kroah-Hartman
maintainerPATCH 41/917 ALSA: line6: fix control and interrupt message timeouts
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit f4000b58b64344871d7b27c05e73932f137cfef6 upstream.
USB control and interrupt message timeouts are specified in milliseconds and should specifically not vary with CONFIG_HZ.
--- sound/usb/line6/driver.c | 14 +++++++------- sound/usb/line6/driver.h | 2 +- sound/usb/line6/podhd.c | 6 +++--- sound/usb/line6/toneport.c | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-)
sound/usb/line6/driver.c +7 -7
@@ -113,12 +113,12 @@ int line6_send_raw_message(struct usb_li retval =usb_interrupt_msg (line6->usbdev,usb_sndintpipe (line6->usbdev, properties->ep_ctrl_w), (char *)frag_buf, frag_size, - &partial,LINE6_TIMEOUT *HZ ); + &partial,LINE6_TIMEOUT ); }else { retval =usb_bulk_msg (line6->usbdev,usb_sndbulkpipe (line6->usbdev, properties->ep_ctrl_w), (char *)frag_buf, frag_size, - &partial,LINE6_TIMEOUT *HZ ); + &partial,LINE6_TIMEOUT ); }if (retval) {
@@ -347,7 +347,7 @@ int line6_read_data(struct usb_line6 *li ret =usb_control_msg_send (usbdev,0 ,0x67 ,USB_TYPE_VENDOR |USB_RECIP_DEVICE |USB_DIR_OUT , (datalen <<8 ) |0x21 , address,NULL ,0 , -LINE6_TIMEOUT *HZ ,GFP_KERNEL ); +LINE6_TIMEOUT ,GFP_KERNEL );if (ret) {dev_err (line6->ifcdev,"read request failed (error %d)\n" , ret); goto exit;
@@ -360,7 +360,7 @@ int line6_read_data(struct usb_line6 *li ret =usb_control_msg_recv (usbdev,0 ,0x67 ,USB_TYPE_VENDOR |USB_RECIP_DEVICE |USB_DIR_IN ,0x0012 ,0x0000 , &len,1 , -LINE6_TIMEOUT *HZ ,GFP_KERNEL ); +LINE6_TIMEOUT ,GFP_KERNEL );if (ret) {dev_err (line6->ifcdev,"receive length failed (error %d)\n" , ret);
@@ -387,7 +387,7 @@ int line6_read_data(struct usb_line6 *li/* receive the result: */ ret =usb_control_msg_recv (usbdev,0 ,0x67 ,USB_TYPE_VENDOR |USB_RECIP_DEVICE |USB_DIR_IN , -0x0013 ,0x0000 , data, datalen,LINE6_TIMEOUT *HZ , +0x0013 ,0x0000 , data, datalen,LINE6_TIMEOUT ,GFP_KERNEL );if (ret)dev_err (line6->ifcdev,"read failed (error %d)\n" , ret);
@@ -417,7 +417,7 @@ int line6_write_data(struct usb_line6 *l ret =usb_control_msg_send (usbdev,0 ,0x67 ,USB_TYPE_VENDOR |USB_RECIP_DEVICE |USB_DIR_OUT , -0x0022 , address, data, datalen,LINE6_TIMEOUT *HZ , +0x0022 , address, data, datalen,LINE6_TIMEOUT ,GFP_KERNEL );if (ret) { dev_err(line6->ifcdev,
@@ -430,7 +430,7 @@ int line6_write_data(struct usb_line6 *l ret =usb_control_msg_recv (usbdev,0 ,0x67 ,USB_TYPE_VENDOR |USB_RECIP_DEVICE |USB_DIR_IN , -0x0012 ,0x0000 , status,1 ,LINE6_TIMEOUT *HZ , +0x0012 ,0x0000 , status,1 ,LINE6_TIMEOUT ,GFP_KERNEL );if (ret) { dev_err(line6->ifcdev,
sound/usb/line6/driver.h +1 -1
@@ -27,7 +27,7 @@#define LINE6_FALLBACK_INTERVAL 10#define LINE6_FALLBACK_MAXPACKETSIZE 16 -#define LINE6_TIMEOUT 1 +#define LINE6_TIMEOUT 1000#define LINE6_BUFSIZE_LISTEN 64#define LINE6_MIDI_MESSAGE_MAXLEN 256
sound/usb/line6/podhd.c +3 -3
@@ -190,7 +190,7 @@ static int podhd_dev_start(struct usb_li ret =usb_control_msg_send (usbdev,0 ,0x67 ,USB_TYPE_VENDOR |USB_RECIP_DEVICE |USB_DIR_OUT ,0x11 ,0 , -NULL ,0 ,LINE6_TIMEOUT *HZ ,GFP_KERNEL ); +NULL ,0 ,LINE6_TIMEOUT ,GFP_KERNEL );if (ret) {dev_err (pod->line6.ifcdev,"read request failed (error %d)\n" , ret); goto exit;
@@ -200,7 +200,7 @@ static int podhd_dev_start(struct usb_li ret =usb_control_msg_recv (usbdev,0 ,0x67 ,USB_TYPE_VENDOR |USB_RECIP_DEVICE |USB_DIR_IN ,0x11 ,0x0 , - init_bytes,3 ,LINE6_TIMEOUT *HZ ,GFP_KERNEL ); + init_bytes,3 ,LINE6_TIMEOUT ,GFP_KERNEL );if (ret) {dev_err (pod->line6.ifcdev,"receive length failed (error %d)\n" , ret);
@@ -220,7 +220,7 @@ static int podhd_dev_start(struct usb_liUSB_REQ_SET_FEATURE ,USB_TYPE_STANDARD |USB_RECIP_DEVICE |USB_DIR_OUT ,1 ,0 , - NULL, 0, LINE6_TIMEOUT * HZ, GFP_KERNEL); + NULL, 0, LINE6_TIMEOUT, GFP_KERNEL); exit:return ret; }
sound/usb/line6/toneport.c +1 -1
@@ -128,7 +128,7 @@ static int toneport_send_cmd(struct usb_ ret =usb_control_msg_send (usbdev,0 ,0x67 ,USB_TYPE_VENDOR |USB_RECIP_DEVICE |USB_DIR_OUT , - cmd1, cmd2,NULL ,0 ,LINE6_TIMEOUT *HZ , + cmd1, cmd2,NULL ,0 ,LINE6_TIMEOUT ,GFP_KERNEL );if (ret) {
Greg Kroah-Hartman
maintainerPATCH 42/917 ALSA: mixer: oss: Fix racy access to slots
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 411cef6adfb38a5bb6bd9af3941b28198e7fb680 upstream.
The OSS mixer can reassign the mapping slots dynamically via proc file. Although the addition and deletion of those slots are protected by mixer->reg_mutex, the access to slots aren't, hence this may cause UAF when the slots in use are deleted concurrently.
This patch applies the mixer->reg_mutex in all appropriate code paths (i.e. the ioctl functions) that may access slots.
--- sound/core/oss/mixer_oss.c | 44 +++++++++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 11 deletions(-)
sound/core/oss/mixer_oss.c +33 -11
@@ -130,11 +130,13 @@ static int snd_mixer_oss_devmask(structif (mixer ==NULL )return -EIO ; +mutex_lock (&mixer->reg_mutex);for (chn =0 ; chn <31 ; chn++) { pslot = &mixer->slots[chn];if (pslot->put_volume || pslot->put_recsrc) result |=1 << chn; } +mutex_unlock (&mixer->reg_mutex);return result; }
@@ -146,11 +148,13 @@ static int snd_mixer_oss_stereodevs(struif (mixer ==NULL )return -EIO ; +mutex_lock (&mixer->reg_mutex);for (chn =0 ; chn <31 ; chn++) { pslot = &mixer->slots[chn];if (pslot->put_volume && pslot->stereo) result |=1 << chn; } +mutex_unlock (&mixer->reg_mutex);return result; }
@@ -161,6 +165,7 @@ static int snd_mixer_oss_recmask(structif (mixer ==NULL )return -EIO ; +mutex_lock (&mixer->reg_mutex);if (mixer->put_recsrc && mixer->get_recsrc) {/* exclusive */ result = mixer->mask_recsrc; }else {
@@ -172,6 +177,7 @@ static int snd_mixer_oss_recmask(struct result |=1 << chn; } } +mutex_unlock (&mixer->reg_mutex);return result; }
@@ -182,12 +188,12 @@ static int snd_mixer_oss_get_recsrc(struif (mixer ==NULL )return -EIO ; +mutex_lock (&mixer->reg_mutex);if (mixer->put_recsrc && mixer->get_recsrc) {/* exclusive */ -int err;unsigned int index; - err = mixer->get_recsrc (fmixer, &index); -if (err <0 ) -return err; + result = mixer->get_recsrc (fmixer, &index); +if (result <0 ) + goto unlock; result =1 << index; }else {struct snd_mixer_oss_slot *pslot;
@@ -202,7 +208,10 @@ static int snd_mixer_oss_get_recsrc(stru } } } -return mixer->oss_recsrc = result; + mixer->oss_recsrc = result; + unlock: +mutex_unlock (&mixer->reg_mutex); +return result; }static int snd_mixer_oss_set_recsrc (struct snd_mixer_oss_file *fmixer,int recsrc)
@@ -215,6 +224,7 @@ static int snd_mixer_oss_set_recsrc(struif (mixer ==NULL )return -EIO ; +mutex_lock (&mixer->reg_mutex);if (mixer->get_recsrc && mixer->put_recsrc) {/* exclusive input */ if (recsrc & ~mixer->oss_recsrc) recsrc &= ~mixer->oss_recsrc;
@@ -240,6 +250,7 @@ static int snd_mixer_oss_set_recsrc(stru } } } +mutex_unlock (&mixer->reg_mutex);return result; }
@@ -251,6 +262,7 @@ static int snd_mixer_oss_get_volume(struif (mixer ==NULL || slot >30 )return -EIO ; +mutex_lock (&mixer->reg_mutex); pslot = &mixer->slots[slot]; left = pslot->volume[0 ]; right = pslot->volume[1 ];
@@ -258,15 +270,21 @@ static int snd_mixer_oss_get_volume(stru result = pslot->get_volume (fmixer, pslot, &left, &right);if (!pslot->stereo) right = left; -if (snd_BUG_ON (left <0 || left >100 )) -return -EIO ; -if (snd_BUG_ON (right <0 || right >100 )) -return -EIO ; +if (snd_BUG_ON (left <0 || left >100 )) { + result = -EIO ; + goto unlock; + } +if (snd_BUG_ON (right <0 || right >100 )) { + result = -EIO ; + goto unlock; + }if (result >=0 ) { pslot->volume[0 ] = left; pslot->volume[1 ] = right; result = (left &0xff ) | ((right &0xff ) <<8 ); } + unlock: +mutex_unlock (&mixer->reg_mutex);return result; }
@@ -279,6 +297,7 @@ static int snd_mixer_oss_set_volume(struif (mixer ==NULL || slot >30 )return -EIO ; +mutex_lock (&mixer->reg_mutex); pslot = &mixer->slots[slot];if (left >100 ) left =100 ;
@@ -289,10 +308,13 @@ static int snd_mixer_oss_set_volume(struif (pslot->put_volume) result = pslot->put_volume (fmixer, pslot, left, right);if (result <0 ) -return result; + goto unlock; pslot->volume[0 ] = left; pslot->volume[1 ] = right; -return (left &0xff ) | ((right &0xff ) <<8 ); + result = (left &0xff ) | ((right &0xff ) <<8 ); + unlock: +mutex_lock (&mixer->reg_mutex); +return result; }static int snd_mixer_oss_ioctl1 (struct snd_mixer_oss_file *fmixer,unsigned int cmd,unsigned long arg)
Greg Kroah-Hartman
maintainerPATCH 43/917 ALSA: mixer: fix deadlock in snd_mixer_oss_set_volume
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
commit 3ab7992018455ac63c33e9b3eaa7264e293e40f4 upstream.
In commit 411cef6adfb3 ("ALSA: mixer: oss: Fix racy access to slots") added mutex protection in snd_mixer_oss_set_volume(). Second mutex_lock() in same function looks like typo, fix it.
--- sound/core/oss/mixer_oss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/core/oss/mixer_oss.c +1 -1
@@ -313,7 +313,7 @@ static int snd_mixer_oss_set_volume(stru pslot->volume[1 ] = right; result = (left &0xff ) | ((right &0xff ) <<8 ); unlock: -mutex_lock (&mixer->reg_mutex); +mutex_unlock (&mixer->reg_mutex);return result; }
Greg Kroah-Hartman
maintainerPATCH 44/917 ALSA: usb-audio: Line6 HX-Stomp XL USB_ID for 48k-fixed quirk
In reply to Greg Kroah-HartmanFrom: Jason Ormes <[email protected]>
commit 8f27b689066113a3e579d4df171c980c54368c4e upstream.
Adding the Line6 HX-Stomp XL USB_ID as it needs this fixed frequency quirk as well.
The device is basically just the HX-Stomp with some more buttons on the face. I've done some recording with it after adding it, and it seems to function properly with this fix. The Midi features appear to be working as well.
[ a coding style fix and patch reformat by tiwai ]
--- sound/usb/format.c | 1 + 1 file changed, 1 insertion(+)
sound/usb/format.c +1 -0
@@ -414,6 +414,7 @@ static int line6_parse_audio_format_ratecase USB_ID (0x0e41 ,0x4242 ):/* Line6 Helix Rack */ case USB_ID (0x0e41 ,0x4244 ):/* Line6 Helix LT */ case USB_ID (0x0e41 ,0x4246 ):/* Line6 HX-Stomp */ +case USB_ID (0x0e41 ,0x4253 ):/* Line6 HX-Stomp XL */ case USB_ID (0x0e41 ,0x4247 ):/* Line6 Pod Go */ case USB_ID (0x0e41 ,0x4248 ):/* Line6 Helix >= fw 2.82 */ case USB_ID (0x0e41 ,0x4249 ):/* Line6 Helix Rack >= fw 2.82 */
Greg Kroah-Hartman
maintainerPATCH 45/917 ALSA: usb-audio: Add registration quirk for JBL Quantum 400
In reply to Greg Kroah-HartmanFrom: Alexander Tsoy <[email protected]>
commit 763d92ed5dece7d439fc28a88b2d2728d525ffd9 upstream.
Add another device ID for JBL Quantum 400. It requires the same quirk as other JBL Quantum devices.
--- sound/usb/quirks.c | 1 + 1 file changed, 1 insertion(+)
sound/usb/quirks.c +1 -0
@@ -1749,6 +1749,7 @@ static const struct registration_quirk rREG_QUIRK_ENTRY (0x0951 ,0x16ea ,2 ),/* Kingston HyperX Cloud Flight S */ REG_QUIRK_ENTRY (0x0ecb ,0x1f46 ,2 ),/* JBL Quantum 600 */ REG_QUIRK_ENTRY (0x0ecb ,0x1f47 ,2 ),/* JBL Quantum 800 */ +REG_QUIRK_ENTRY (0x0ecb ,0x1f4c ,2 ),/* JBL Quantum 400 */ REG_QUIRK_ENTRY (0x0ecb ,0x2039 ,2 ),/* JBL Quantum 400 */ REG_QUIRK_ENTRY (0x0ecb ,0x203c ,2 ),/* JBL Quantum 600 */ REG_QUIRK_ENTRY(0x0ecb, 0x203e, 2), /* JBL Quantum 800 */
Greg Kroah-Hartman
maintainerPATCH 46/917 ALSA: hda: Free card instance properly at probe errors
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 39173303c83859723dab32c2abfb97296d6af3bf upstream.
The recent change in hda-intel driver to allow repeated probes surfaced a problem that has been hidden until; the probe process in the work calls azx_free() at the error path, and this skips the card free process that eventually releases codec instances. As a result, we get a kernel WARNING like:
snd_hda_intel 0000:00:1f.3: Cannot probe codecs, giving up
------------[ cut here ]------------ WARNING: CPU: 14 PID: 186 at sound/hda/hdac_bus.c:73 ....
For fixing this, we need to call snd_card_free() instead of azx_free(). Additionally, the device drvdata has to be cleared, as the driver binding itself is still active. Then the PM and other driver callbacks will ignore the procedure.
--- sound/pci/hda/hda_intel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/pci/hda/hda_intel.c +2 -1
@@ -2330,7 +2330,8 @@ static int azx_probe_continue(struct azx out_free:if (err <0 ) { -azx_free (chip); +pci_set_drvdata (pci,NULL ); +snd_card_free (chip->card);return err; }
Greg Kroah-Hartman
maintainerPATCH 47/917 ALSA: synth: missing check for possible NULL after the call to kstrdup
In reply to Greg Kroah-HartmanFrom: Austin Kim <[email protected]>
commit d159037abbe3412285c271bdfb9cdf19e62678ff upstream.
If kcalloc() return NULL due to memory starvation, it is possible for kstrdup() to return NULL in similar case. So add null check after the call to kstrdup() is made.
[ minor coding-style fix by tiwai ]
--- sound/synth/emux/emux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/synth/emux/emux.c +1 -1
@@ -88,7 +88,7 @@ int snd_emux_register(struct snd_emux *e emu->name =kstrdup (name,GFP_KERNEL ); emu->voices =kcalloc (emu->max_voices,sizeof (struct snd_emux_voice ),GFP_KERNEL ); -if (emu->voices ==NULL ) +if (emu->name ==NULL || emu->voices ==NULL )return -ENOMEM ;/* create soundfont list */
Greg Kroah-Hartman
maintainerPATCH 48/917 ALSA: pci: rme: Fix unaligned buffer addresses
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 43d35ccc36dad52377dd349b2e3ea803b72c3906 upstream.
The recent fix for setting up the DMA buffer type on RME drivers tried to address the non-standard memory managements and changed the DMA buffer information to the standard snd_dma_buffer object that is allocated at the probe time. However, I overlooked that the RME drivers handle the buffer addresses based on 64k alignment, and the previous conversion broke that silently.
This patch is an attempt to fix the regression. The snd_dma_buffer objects are copied to the original data with the correction to the aligned accesses, and those are passed to snd_pcm_set_runtime_buffer() helpers instead. The original snd_dma_buffer objects are managed by devres, hence they'll be released automagically.
--- sound/pci/rme9652/hdsp.c | 41 +++++++++++++++++++++++------------------ sound/pci/rme9652/rme9652.c | 41 +++++++++++++++++++++++------------------ 2 files changed, 46 insertions(+), 36 deletions(-)
sound/pci/rme9652/hdsp.c +23 -18
@@ -468,8 +468,11 @@ struct hdsp {unsigned char ss_out_channels;u32 io_loopback;/* output loopback channel states*/ -struct snd_dma_buffer *capture_dma_buf; -struct snd_dma_buffer *playback_dma_buf; +/* DMA buffers; those are copied instances from the original snd_dma_buf +* objects (which are managed via devres) for the address alignments +*/ +struct snd_dma_buffer capture_dma_buf; +struct snd_dma_buffer playback_dma_buf;unsigned char *capture_buffer;/* suitably aligned address */ unsigned char *playback_buffer;/* suitably aligned address */
@@ -3764,30 +3767,32 @@ static void snd_hdsp_proc_init(struct hdstatic int snd_hdsp_initialize_memory (struct hdsp *hdsp) { -unsigned long pb_bus, cb_bus; +struct snd_dma_buffer *capture_dma, *playback_dma; - hdsp->capture_dma_buf = -snd_hammerfall_get_buffer (hdsp->pci,HDSP_DMA_AREA_BYTES ); - hdsp->playback_dma_buf = -snd_hammerfall_get_buffer (hdsp->pci,HDSP_DMA_AREA_BYTES ); -if (!hdsp->capture_dma_buf || !hdsp->playback_dma_buf) { + capture_dma =snd_hammerfall_get_buffer (hdsp->pci,HDSP_DMA_AREA_BYTES ); + playback_dma =snd_hammerfall_get_buffer (hdsp->pci,HDSP_DMA_AREA_BYTES ); +if (!capture_dma || !playback_dma) {dev_err (hdsp->card->dev,"%s: no buffers available\n" , hdsp->card_name);return -ENOMEM ; } -/* Align to bus-space 64K boundary */ +/* copy to the own data for alignment */ + hdsp->capture_dma_buf = *capture_dma; + hdsp->playback_dma_buf = *playback_dma; - cb_bus =ALIGN (hdsp->capture_dma_buf->addr,0x10000ul ); - pb_bus =ALIGN (hdsp->playback_dma_buf->addr,0x10000ul ); +/* Align to bus-space 64K boundary */ + hdsp->capture_dma_buf.addr =ALIGN (capture_dma->addr,0x10000ul ); + hdsp->playback_dma_buf.addr =ALIGN (playback_dma->addr,0x10000ul );/* Tell the card where it is */ +hdsp_write (hdsp, HDSP_inputBufferAddress, hdsp->capture_dma_buf.addr); +hdsp_write (hdsp, HDSP_outputBufferAddress, hdsp->playback_dma_buf.addr); -hdsp_write (hdsp, HDSP_inputBufferAddress, cb_bus); -hdsp_write (hdsp, HDSP_outputBufferAddress, pb_bus); - - hdsp->capture_buffer = hdsp->capture_dma_buf->area + (cb_bus - hdsp->capture_dma_buf->addr); - hdsp->playback_buffer = hdsp->playback_dma_buf->area + (pb_bus - hdsp->playback_dma_buf->addr); + hdsp->capture_dma_buf.area += hdsp->capture_dma_buf.addr - capture_dma->addr; + hdsp->playback_dma_buf.area += hdsp->playback_dma_buf.addr - playback_dma->addr; + hdsp->capture_buffer = hdsp->capture_dma_buf.area; + hdsp->playback_buffer = hdsp->playback_dma_buf.area;return 0 ; }
@@ -4507,7 +4512,7 @@ static int snd_hdsp_playback_open(structsnd_pcm_set_sync (substream); runtime->hw = snd_hdsp_playback_subinfo; -snd_pcm_set_runtime_buffer (substream, hdsp->playback_dma_buf); +snd_pcm_set_runtime_buffer (substream, &hdsp->playback_dma_buf); hdsp->playback_pid = current->pid; hdsp->playback_substream = substream;
@@ -4583,7 +4588,7 @@ static int snd_hdsp_capture_open(structsnd_pcm_set_sync (substream); runtime->hw = snd_hdsp_capture_subinfo; -snd_pcm_set_runtime_buffer (substream, hdsp->capture_dma_buf); +snd_pcm_set_runtime_buffer (substream, &hdsp->capture_dma_buf); hdsp->capture_pid = current->pid; hdsp->capture_substream = substream;
sound/pci/rme9652/rme9652.c +23 -18
75 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 49/917 ALSA: PCM: Fix NULL dereference at mmap checks
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 8e537d5dec34cac746dd6abf6a83e5de3aa471fc upstream.
The recent refactoring of mmap handling caused Oops on some devices that don't use the standard memory allocations. This patch addresses it by allowing snd_dma_buffer_mmap() helper to receive the NULL pointer dmab argument (and return an error appropriately).
--- sound/core/memalloc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/core/memalloc.c +4 -1
@@ -176,8 +176,11 @@ EXPORT_SYMBOL_GPL(snd_devm_alloc_pages);int snd_dma_buffer_mmap (struct snd_dma_buffer *dmab,struct vm_area_struct *area) { -const struct snd_malloc_ops *ops =snd_dma_get_ops (dmab); +const struct snd_malloc_ops *ops; +if (!dmab) +return -ENOENT ; + ops =snd_dma_get_ops (dmab);if (ops && ops->mmap)return ops->mmap (dmab, area);else
Greg Kroah-Hartman
maintainerPATCH 50/917 ALSA: timer: Fix use-after-free problem
In reply to Greg Kroah-HartmanFrom: Wang Wensheng <[email protected]>
commit c0317c0e87094f5b5782b6fdef5ae0a4b150496c upstream.
When the timer instance was add into ack_list but was not currently in process, the user could stop it via snd_timer_stop1() without delete it from the ack_list. Then the user could free the timer instance and when it was actually processed UAF occurred.
This issue could be reproduced via testcase snd_timer01 in ltp - running several instances of that testcase at the same time.
What I actually met was that the ack_list of the timer broken and the kernel went into deadloop with irqoff. That could be detected by hardlockup detector on board or when we run it on qemu, we could use gdb to dump the ack_list when the console has no response.
To fix this issue, we delete the timer instance from ack_list and active_list unconditionally in snd_timer_stop1().
--- sound/core/timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/core/timer.c +2 -2
@@ -624,13 +624,13 @@ static int snd_timer_stop1(struct snd_tiif (!timer)return -EINVAL ;spin_lock_irqsave (&timer->lock, flags); +list_del_init (&timeri->ack_list); +list_del_init (&timeri->active_list);if (!(timeri->flags & (SNDRV_TIMER_IFLG_RUNNING |SNDRV_TIMER_IFLG_START ))) { result = -EBUSY ; goto unlock; } -list_del_init (&timeri->ack_list); -list_del_init (&timeri->active_list);if (timer->card && timer->card->shutdown) goto unlock;if (stop) {
Greg Kroah-Hartman
maintainerPATCH 51/917 ALSA: timer: Unconditionally unlink slave instances, too
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit ffdd98277f0a1d15a67a74ae09bee713df4c0dbc upstream.
Like the previous fix (commit c0317c0e8709 "ALSA: timer: Fix use-after-free problem"), we have to unlink slave timer instances immediately at snd_timer_stop(), too. Otherwise it may leave a stale entry in the list if the slave instance is freed before actually running.
--- sound/core/timer.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
sound/core/timer.c +6 -7
@@ -665,23 +665,22 @@ static int snd_timer_stop1(struct snd_tistatic int snd_timer_stop_slave (struct snd_timer_instance *timeri,bool stop) {unsigned long flags; +bool running;spin_lock_irqsave (&slave_active_lock, flags); -if (!(timeri->flags &SNDRV_TIMER_IFLG_RUNNING )) { -spin_unlock_irqrestore (&slave_active_lock, flags); -return -EBUSY ; - } + running = timeri->flags &SNDRV_TIMER_IFLG_RUNNING ; timeri->flags &= ~SNDRV_TIMER_IFLG_RUNNING ;if (timeri->timer) {spin_lock (&timeri->timer->lock);list_del_init (&timeri->ack_list);list_del_init (&timeri->active_list); -snd_timer_notify1 (timeri, stop ?SNDRV_TIMER_EVENT_STOP : -SNDRV_TIMER_EVENT_PAUSE ); +if (running) +snd_timer_notify1 (timeri, stop ?SNDRV_TIMER_EVENT_STOP : +SNDRV_TIMER_EVENT_PAUSE );spin_unlock (&timeri->timer->lock); }spin_unlock_irqrestore (&slave_active_lock, flags); -return 0 ; +return running ?0 : -EBUSY ; }/*
Greg Kroah-Hartman
maintainerPATCH 52/917 Revert "ext4: enforce buffer head state assertion in ext4_da_map_blocks"
In reply to Greg Kroah-HartmanFrom: Eric Whitney <[email protected]>
commit 3eda41df05d6ad5c825cbc7fef03d563597b1afa upstream.
This reverts commit 948ca5f30e1df0c11eb5b0f410b9ceb97fa77ad9.
Two crash reports from users running variations on 5.15-rc4 kernels suggest that it is premature to enforce the state assertion in the original commit. Both crashes were triggered by BUG calls in that code, indicating that under some rare circumstance the buffer head state did not match a delayed allocated block at the time the block was written out. No reproducer is available. Resolving this problem will require more time than remains in the current release cycle, so reverting the original patch for the time being is necessary to avoid any instability it may cause.
--- fs/ext4/inode.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
fs/ext4/inode.c +6 -9
@@ -1711,16 +1711,13 @@ static int ext4_da_map_blocks(struct ino }/* -* the buffer head associated with a delayed and not unwritten -* block found in the extent status cache must contain an -* invalid block number and have its BH_New and BH_Delay bits -* set, reflecting the state assigned when the block was -* initially delayed allocated +* Delayed extent could be allocated by fallocate. +* So we need to check it. */ -if (ext4_es_is_delonly (&es)) { -BUG_ON (bh->b_blocknr != invalid_block); -BUG_ON (!buffer_new (bh)); -BUG_ON (!buffer_delay (bh)); +if (ext4_es_is_delayed (&es) && !ext4_es_is_unwritten (&es)) { +map_bh (bh, inode->i_sb, invalid_block); +set_buffer_new (bh); +set_buffer_delay (bh);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 53/917 ext4: fix lazy initialization next schedule time computation in more granular unit
In reply to Greg Kroah-HartmanFrom: Shaoying Xu <[email protected]>
commit 39fec6889d15a658c3a3ebb06fd69d3584ddffd3 upstream.
Ext4 file system has default lazy inode table initialization setup once it is mounted. However, it has issue on computing the next schedule time that makes the timeout same amount in jiffies but different real time in secs if with various HZ values. Therefore, fix by measuring the current time in a more granular unit nanoseconds and make the next schedule time independent of the HZ value.
--- fs/ext4/super.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
fs/ext4/super.c +4 -5
@@ -3263,9 +3263,9 @@ static int ext4_run_li_request(struct exstruct super_block *sb = elr->lr_super;ext4_group_t ngroups =EXT4_SB (sb)->s_groups_count;ext4_group_t group = elr->lr_next_group; -unsigned long timeout =0 ;unsigned int prefetch_ios =0 ;int ret =0 ; +u64 start_time;if (elr->lr_mode ==EXT4_LI_MODE_PREFETCH_BBITMAP ) { elr->lr_next_group = ext4_mb_prefetch(sb, group,
@@ -3302,14 +3302,13 @@ static int ext4_run_li_request(struct ex ret =1 ;if (!ret) { - timeout = jiffies; + start_time =ktime_get_real_ns (); ret =ext4_init_inode_table (sb, group, elr->lr_timeout ?0 :1 );trace_ext4_lazy_itable_init (sb, group);if (elr->lr_timeout ==0 ) { - timeout = (jiffies - timeout) * -EXT4_SB (elr->lr_super)->s_li_wait_mult; - elr->lr_timeout = timeout; + elr->lr_timeout =nsecs_to_jiffies ((ktime_get_real_ns () - start_time) * +EXT4_SB (elr->lr_super)->s_li_wait_mult); } elr->lr_next_sched = jiffies + elr->lr_timeout; elr->lr_next_group = group +1 ;
Greg Kroah-Hartman
maintainerPATCH 54/917 ext4: ensure enough credits in ext4_ext_shift_path_extents
In reply to Greg Kroah-HartmanFrom: yangerkun <[email protected]>
commit 4268496e48dc681cfa53b92357314b5d7221e625 upstream.
Like ext4_ext_rm_leaf, we can ensure that there are enough credits before every call that will consume credits. As part of this fix we fold the functionality of ext4_access_path() into ext4_ext_shift_path_extents(). This change is needed as a preparation for the next bugfix patch.
--- fs/ext4/extents.c | 49 +++++++++++++++---------------------------------- 1 file changed, 15 insertions(+), 34 deletions(-)
fs/ext4/extents.c +15 -34
@@ -4978,36 +4978,6 @@ int ext4_get_es_cache(struct inode *inod }/* -* ext4_access_path: -* Function to access the path buffer for marking it dirty. -* It also checks if there are sufficient credits left in the journal handle -* to update path. -*/ -static int -ext4_access_path (handle_t *handle,struct inode *inode, -struct ext4_ext_path *path) -{ -int credits, err; - -if (!ext4_handle_valid (handle)) -return 0 ; - -/* -* Check if need to extend journal credits -* 3 for leaf, sb, and inode plus 2 (bmap and group -* descriptor) for each block group; assume two block -* groups -*/ - credits =ext4_writepage_trans_blocks (inode); - err =ext4_datasem_ensure_credits (handle, inode,7 , credits,0 ); -if (err <0 ) -return err; - - err =ext4_ext_get_access (handle, inode, path); -return err; -} - -/* * ext4_ext_shift_path_extents: * Shift the extents of a path structure lying between path[depth].p_ext * and EXT_LAST_EXTENT(path[depth].p_hdr), by @shift blocks. @SHIFT tells
@@ -5021,6 +4991,7 @@ ext4_ext_shift_path_extents(struct ext4_int depth, err =0 ;struct ext4_extent *ex_start, *ex_last;bool update = false; +int credits, restart_credits; depth = path->p_depth;while (depth >=0 ) {
@@ -5030,13 +5001,23 @@ ext4_ext_shift_path_extents(struct ext4_return -EFSCORRUPTED ; ex_last =EXT_LAST_EXTENT (path[depth].p_hdr); +/* leaf + sb + inode */ + credits =3 ; +if (ex_start ==EXT_FIRST_EXTENT (path[depth].p_hdr)) { + update = true; +/* extent tree + sb + inode */ + credits = depth +2 ; + } - err =ext4_access_path (handle, inode, path + depth); + restart_credits =ext4_writepage_trans_blocks (inode); + err =ext4_datasem_ensure_credits (handle, inode, credits, + restart_credits,0 );if (err) goto out; -if (ex_start ==EXT_FIRST_EXTENT (path[depth].p_hdr)) - update = true; + err =ext4_ext_get_access (handle, inode, path + depth); +if (err) + goto out;while (ex_start <= ex_last) {if (SHIFT ==SHIFT_LEFT ) {
@@ -5067,7 +5048,7 @@ ext4_ext_shift_path_extents(struct ext4_ }/* Update index too */ - err =ext4_access_path (handle, inode, path + depth); + err =ext4_ext_get_access (handle, inode, path + depth);if (err) goto out;
Greg Kroah-Hartman
maintainerPATCH 55/917 ext4: refresh the ext4_ext_path struct after dropping i_data_sem.
In reply to Greg Kroah-HartmanFrom: yangerkun <[email protected]>
commit 1811bc401aa58c7bdb0df3205aa6613b49d32127 upstream.
After we drop i_data sem, we need to reload the ext4_ext_path structure since the extent tree can change once i_data_sem is released.
This addresses the BUG:
[52117.465187] ------------[ cut here ]------------ [52117.465686] kernel BUG at fs/ext4/extents.c:1756! ... [52117.478306] Call Trace: [52117.478565] ext4_ext_shift_extents+0x3ee/0x710 [52117.479020] ext4_fallocate+0x139c/0x1b40 [52117.479405] ? __do_sys_newfstat+0x6b/0x80 [52117.479805] vfs_fallocate+0x151/0x4b0 [52117.480177] ksys_fallocate+0x4a/0xa0 [52117.480533] __x64_sys_fallocate+0x22/0x30 [52117.480930] do_syscall_64+0x35/0x80 [52117.481277] entry_SYSCALL_64_after_hwframe+0x44/0xae [52117.481769] RIP: 0033:0x7fa062f855ca
--- fs/ext4/extents.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
fs/ext4/extents.c +13 -1
@@ -5012,8 +5012,11 @@ ext4_ext_shift_path_extents(struct ext4_ restart_credits =ext4_writepage_trans_blocks (inode); err =ext4_datasem_ensure_credits (handle, inode, credits, restart_credits,0 ); -if (err) +if (err) { +if (err >0 ) + err = -EAGAIN ; goto out; + } err =ext4_ext_get_access (handle, inode, path + depth);if (err)
@@ -5087,6 +5090,7 @@ ext4_ext_shift_extents(struct inode *inoint ret =0 , depth;struct ext4_extent *extent;ext4_lblk_t stop, *iterator, ex_start, ex_end; +ext4_lblk_t tmp =EXT_MAX_BLOCKS ;/* Let path point to the last extent */ path = ext4_find_extent(inode, EXT_MAX_BLOCKS - 1, NULL,
@@ -5140,11 +5144,15 @@ ext4_ext_shift_extents(struct inode *ino* till we reach stop. In case of right shift, iterator points to stop * and it is decreased till we reach start. */ +again:if (SHIFT ==SHIFT_LEFT ) iterator = &start;else iterator = &stop; +if (tmp !=EXT_MAX_BLOCKS ) + *iterator = tmp; +/* * Its safe to start updating extents. Start and stop are unsigned, so * in case of right shift if extent with 0 block is reached, iterator
@@ -5173,6 +5181,7 @@ ext4_ext_shift_extents(struct inode *ino } } + tmp = *iterator;if (SHIFT ==SHIFT_LEFT ) { extent =EXT_LAST_EXTENT (path[depth].p_hdr); *iterator = le32_to_cpu(extent->ee_block) +
@@ -5191,6 +5200,9 @@ ext4_ext_shift_extents(struct inode *ino } ret =ext4_ext_shift_path_extents (path, shift, inode, handle,SHIFT ); +/* iterator can be NULL which means we should break */ +if (ret == -EAGAIN ) + goto again;if (ret)break ; }
Greg Kroah-Hartman
maintainerPATCH 56/917 fuse: fix page stealing
In reply to Greg Kroah-HartmanFrom: Miklos Szeredi <[email protected]>
commit 712a951025c0667ff00b25afc360f74e639dfabe upstream.
It is possible to trigger a crash by splicing anon pipe bufs to the fuse device.
The reason for this is that anon_pipe_buf_release() will reuse buf->page if the refcount is 1, but that page might have already been stolen and its flags modified (e.g. PG_lru added).
This happens in the unlikely case of fuse_dev_splice_write() getting around to calling pipe_buf_release() after a page has been stolen, added to the page cache and removed from the page cache.
Fix by calling pipe_buf_release() right after the page was inserted into the page cache. In this case the page has an elevated refcount so any release function will know that the page isn't reusable.
--- fs/fuse/dev.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
fs/fuse/dev.c +12 -2
@@ -847,6 +847,12 @@ static int fuse_try_move_page(struct fusreplace_page_cache_page (oldpage, newpage); +/* +* Release while we have extra ref on stolen page. Otherwise +* anon_pipe_buf_release() might think the page can be reused. +*/ +pipe_buf_release (cs->pipe, buf); +get_page (newpage);if (!(buf->flags &PIPE_BUF_FLAG_LRU ))
@@ -2031,8 +2037,12 @@ static ssize_t fuse_dev_splice_write(strpipe_lock (pipe); out_free: -for (idx =0 ; idx < nbuf; idx++) -pipe_buf_release (pipe, &bufs[idx]); +for (idx =0 ; idx < nbuf; idx++) { +struct pipe_buffer *buf = &bufs[idx]; + +if (buf->ops) +pipe_buf_release (pipe, buf); + }pipe_unlock (pipe);kvfree (bufs);
Re: [PATCH 5.15 056/917] fuse: fix page stealing
Quoted 20 lines · Greg Kroah-Hartman
From: Miklos Szeredi <[email protected]>
commit
712a951025c0667ff00b25afc360f74e639dfabeupstream.It is possible to trigger a crash by splicing anon pipe bufs to the fuse device.
The reason for this is that
anon_pipe_buf_release()will reusebuf->pageif the refcount is 1, but that page might have already been stolen and its flags modified (e.g.PG_lruadded).This happens in the unlikely case of
fuse_dev_splice_write()getting around to callingpipe_buf_release()after a page has been stolen, added to the page cache and removed from the page cache.Fix by calling
pipe_buf_release()right after the page was inserted into the page cache. In this case the page has an elevated refcount so any release function will know that the page isn't reusable.
Quoted 6 lines
Reported-by Frank Dinoff <[email protected]>Link https://lore.kernel.org/r/CAAmZXrsGg2xsP1CK+cbuEMumtrqdvD-NKnWzhNcvn71RV3c1yw@mail.gmail.com/ open hereFixes dd3bb14f44a6 ("fuse: support splice() writing to fuse device")Cc <[email protected]> # v2.6.35Signed-off-by Miklos Szeredi <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
It appears this patch causes a rather serious regression in flatpacks using portals to access files. Reverting this patch restores expected behavior. I have asked users in the Fedora bug to test with 5.16-rc2 to see if we are just missing a dependent patch in stable, or if this is broken there as well, but no response yet.:
https://bugzilla.redhat.com/show_bug.cgi?id=2025285
https://github.com/flatpak/flatpak/issues/4595
Justin
Justin
Re: [PATCH 5.15 056/917] fuse: fix page stealing
Quoted 30 lines · Justin Forbes
Quoted 20 lines · Greg Kroah-Hartman
From: Miklos Szeredi <[email protected]>
commit
712a951025c0667ff00b25afc360f74e639dfabeupstream.It is possible to trigger a crash by splicing anon pipe bufs to the fuse device.
The reason for this is that
anon_pipe_buf_release()will reusebuf->pageif the refcount is 1, but that page might have already been stolen and its flags modified (e.g.PG_lruadded).This happens in the unlikely case of
fuse_dev_splice_write()getting around to callingpipe_buf_release()after a page has been stolen, added to the page cache and removed from the page cache.Fix by calling
pipe_buf_release()right after the page was inserted into the page cache. In this case the page has an elevated refcount so any release function will know that the page isn't reusable.Quoted 6 lines
Reported-by Frank Dinoff <[email protected]>Link https://lore.kernel.org/r/CAAmZXrsGg2xsP1CK+cbuEMumtrqdvD-NKnWzhNcvn71RV3c1yw@mail.gmail.com/ open hereFixes dd3bb14f44a6 ("fuse: support splice() writing to fuse device")Cc <[email protected]> # v2.6.35Signed-off-by Miklos Szeredi <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 8 lines
It appears this patch causes a rather serious regression in flatpacks using portals to access files. Reverting this patch restores expected behavior. I have asked users in the Fedora bug to test with 5.16-rc2 to see if we are just missing a dependent patch in stable, or if this is broken there as well, but no response yet.:
https://bugzilla.redhat.com/show_bug.cgi?id=2025285
https://github.com/flatpak/flatpak/issues/4595
Hi,
Thanks for the report. Can someone with the reproducer try the attached patch?
I think the race there is unlikely but possible.
Thanks,
Miklos
fs/fuse/dev.c +2 -2
@@ -847,14 +847,14 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep)replace_page_cache_page (oldpage, newpage); +get_page (newpage); +/* * Release while we have extra ref on stolen page. Otherwise * anon_pipe_buf_release() might think the page can be reused. */ pipe_buf_release (cs->pipe, buf); -get_page (newpage); -if (!(buf->flags &PIPE_BUF_FLAG_LRU ))lru_cache_add (newpage);
Re: [PATCH 5.15 056/917] fuse: fix page stealing
Quoted 38 lines · Miklos Szeredi
Quoted 36 lines · Justin Forbes
Quoted 20 lines · Greg Kroah-Hartman
From: Miklos Szeredi <[email protected]>
commit
712a951025c0667ff00b25afc360f74e639dfabeupstream.It is possible to trigger a crash by splicing anon pipe bufs to the fuse device.
The reason for this is that
anon_pipe_buf_release()will reusebuf->pageif the refcount is 1, but that page might have already been stolen and its flags modified (e.g.PG_lruadded).This happens in the unlikely case of
fuse_dev_splice_write()getting around to callingpipe_buf_release()after a page has been stolen, added to the page cache and removed from the page cache.Fix by calling
pipe_buf_release()right after the page was inserted into the page cache. In this case the page has an elevated refcount so any release function will know that the page isn't reusable.Quoted 6 lines
Reported-by Frank Dinoff <[email protected]>Link https://lore.kernel.org/r/CAAmZXrsGg2xsP1CK+cbuEMumtrqdvD-NKnWzhNcvn71RV3c1yw@mail.gmail.com/ open hereFixes dd3bb14f44a6 ("fuse: support splice() writing to fuse device")Cc <[email protected]> # v2.6.35Signed-off-by Miklos Szeredi <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>It appears this patch causes a rather serious regression in flatpacks using portals to access files. Reverting this patch restores expected behavior. I have asked users in the Fedora bug to test with 5.16-rc2 to see if we are just missing a dependent patch in stable, or if this is broken there as well, but no response yet.:
Quoted 9 lines
Quoted 2 lines
https://bugzilla.redhat.com/show_bug.cgi?id=2025285
https://github.com/flatpak/flatpak/issues/4595Hi,
Thanks for the report. Can someone with the reproducer try the attached patch?
I think the race there is unlikely but possible.
Thanks, did a scratch build for that and dropped it in the bug. Only one user has reported back, but the report was that it did not fix the issue. I have also gotten confirmation now that the issue is occuring with 5.16-rc2.
Thanks,
Justin
Re: [PATCH 5.15 056/917] fuse: fix page stealing
Quoted 4 lines · Justin Forbes
Thanks, did a scratch build for that and dropped it in the bug. Only one user has reported back, but the report was that it did not fix the issue. I have also gotten confirmation now that the issue is occuring with 5.16-rc2.
Okay.
Morning light brings clarity to the mind. Here's a patch that should definitely fix this bug, as well as the very unlikely race of the page being truncated from the page cache before pipe_buf_release() is called.
Please test.
Thanks,
Miklos
From: Miklos Szeredi <[email protected]>
Subject: fuse: release pipe buf after last use
Checking buf->flags should be done before the pipe_buf_release() is called on the pipe buffer, since releasing the buffer might modify the flags.
This is exactly what page_cache_pipe_buf_release() does, and which results in the same VM_BUG_ON_PAGE(PageLRU(page)) that the original patch was trying to fix.
--- fs/fuse/dev.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
fs/fuse/dev.c +5 -5
@@ -847,17 +847,17 @@ static int fuse_try_move_page(struct fusreplace_page_cache_page (oldpage, newpage); +get_page (newpage); + +if (!(buf->flags &PIPE_BUF_FLAG_LRU )) +lru_cache_add (newpage); +/* * Release while we have extra ref on stolen page. Otherwise * anon_pipe_buf_release() might think the page can be reused. */ pipe_buf_release (cs->pipe, buf); -get_page (newpage); - -if (!(buf->flags &PIPE_BUF_FLAG_LRU )) -lru_cache_add (newpage); - err =0 ;spin_lock (&cs->req->waitq.lock);if (test_bit (FR_ABORTED , &cs->req->flags))
Re: [PATCH 5.15 056/917] fuse: fix page stealing
Quoted 7 lines · Miklos Szeredi
Quoted 4 lines · Justin Forbes
Thanks, did a scratch build for that and dropped it in the bug. Only one user has reported back, but the report was that it did not fix the issue. I have also gotten confirmation now that the issue is occuring with 5.16-rc2.
Quoted 8 lines
Okay.
Morning light brings clarity to the mind. Here's a patch that should definitely fix this bug, as well as the very unlikely race of the page being truncated from the page cache before
pipe_buf_release()is called.Please test.
Thanks, did a scratch build. and multiple users have reported back saying that this patch does in fact fix the issue.
Justin
Greg Kroah-Hartman
maintainerPATCH 57/917 x86/sme: Use #define USE_EARLY_PGTABLE_L5 in mem_encrypt_identity.c
In reply to Greg Kroah-HartmanFrom: Tom Lendacky <[email protected]>
commit e7d445ab26db833d6640d4c9a08bee176777cc82 upstream.
When runtime support for converting between 4-level and 5-level pagetables was added to the kernel, the SME code that built pagetables was updated to use the pagetable functions, e.g. p4d_offset(), etc., in order to simplify the code. However, the use of the pagetable functions in early boot code requires the use of the USE_EARLY_PGTABLE_L5 #define in order to ensure that the proper definition of pgtable_l5_enabled() is used.
Without the #define, pgtable_l5_enabled() is #defined as cpu_feature_enabled(X86_FEATURE_LA57). In early boot, the CPU features have not yet been discovered and populated, so pgtable_l5_enabled() will return false even when 5-level paging is enabled. This causes the SME code to always build 4-level pagetables to perform the in-place encryption. If 5-level paging is enabled, switching to the SME pagetables results in a page-fault that kills the boot.
Adding the #define results in pgtable_l5_enabled() using the __pgtable_l5_enabled variable set in early boot and the SME code building pagetables for the proper paging level.
--- arch/x86/mm/mem_encrypt_identity.c | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/x86/mm/mem_encrypt_identity.c +9 -0
@@ -27,6 +27,15 @@#undef CONFIG_PARAVIRT_XXL#undef CONFIG_PARAVIRT_SPINLOCKS +/* +* This code runs before CPU feature bits are set. By default, the +* pgtable_l5_enabled() function uses bit X86_FEATURE_LA57 to determine if +* 5-level paging is active, so that won't work here. USE_EARLY_PGTABLE_L5 +* is provided to handle this situation and, instead, use a variable that +* has been set by the early boot code. +*/ +#define USE_EARLY_PGTABLE_L5 +#include <linux/kernel.h> #include <linux/mm.h> #include <linux/mem_encrypt.h>
Greg Kroah-Hartman
maintainerPATCH 58/917 x86/cpu: Fix migration safety with X86_BUG_NULL_SEL
In reply to Greg Kroah-HartmanFrom: Jane Malalane <[email protected]>
commit 415de44076640483648d6c0f6d645a9ee61328ad upstream.
Currently, Linux probes for X86_BUG_NULL_SEL unconditionally which makes it unsafe to migrate in a virtualised environment as the properties across the migration pool might differ.
To be specific, the case which goes wrong is:
1. Zen1 (or earlier) and Zen2 (or later) in a migration pool
2. Linux boots on Zen2, probes and finds the absence of X86_BUG_NULL_SEL
3. Linux is then migrated to Zen1
Linux is now running on a X86_BUG_NULL_SEL-impacted CPU while believing that the bug is fixed.
The only way to address the problem is to fully trust the "no longer affected" CPUID bit when virtualised, because in the above case it would be clear deliberately to indicate the fact "you might migrate to somewhere which has this behaviour".
Zen3 adds the NullSelectorClearsBase CPUID bit to indicate that loading a NULL segment selector zeroes the base and limit fields, as well as just attributes. Zen2 also has this behaviour but doesn't have the NSCB bit.
[ bp: Minor touchups. ]
--- arch/x86/kernel/cpu/amd.c | 2 + arch/x86/kernel/cpu/common.c | 44 ++++++++++++++++++++++++++++++++++++------- arch/x86/kernel/cpu/cpu.h | 1 arch/x86/kernel/cpu/hygon.c | 2 + 4 files changed, 42 insertions(+), 7 deletions(-)
arch/x86/kernel/cpu/amd.c +2 -0
@@ -989,6 +989,8 @@ static void init_amd(struct cpuinfo_x86if (cpu_has (c,X86_FEATURE_IRPERF ) && !cpu_has_amd_erratum (c, amd_erratum_1054))msr_set_bit (MSR_K7_HWCR ,MSR_K7_HWCR_IRPERF_EN_BIT ); + +check_null_seg_clears_base (c); }#ifdef CONFIG_X86_32
arch/x86/kernel/cpu/common.c +37 -7
64 lines not on this page · raw message
arch/x86/kernel/cpu/cpu.h +1 -0
@@ -75,6 +75,7 @@ extern int detect_extended_topology_earlextern int detect_extended_topology (struct cpuinfo_x86 *c);extern int detect_ht_early (struct cpuinfo_x86 *c);extern void detect_ht (struct cpuinfo_x86 *c); +extern void check_null_seg_clears_base (struct cpuinfo_x86 *c);unsigned int aperfmperf_get_khz (int cpu);
arch/x86/kernel/cpu/hygon.c +2 -0
@@ -335,6 +335,8 @@ static void init_hygon(struct cpuinfo_x8/* Hygon CPUs don't reset SS attributes on SYSRET, Xen does. */ if (!cpu_has (c,X86_FEATURE_XENPV ))set_cpu_bug (c,X86_BUG_SYSRET_SS_ATTRS ); + +check_null_seg_clears_base (c); }static void cpu_detect_tlb_hygon (struct cpuinfo_x86 *c)
Greg Kroah-Hartman
maintainerPATCH 59/917 x86/irq: Ensure PI wakeup handler is unregistered before module unload
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
commit 6ff53f6a438f72998f56e82e76694a1df9d1ea2c upstream.
Add a synchronize_rcu() after clearing the posted interrupt wakeup handler to ensure all readers, i.e. in-flight IRQ handlers, see the new handler before returning to the caller. If the caller is an exiting module and is unregistering its handler, failure to wait could result in the IRQ handler jumping into an unloaded module.
The registration path doesn't require synchronization, as it's the caller's responsibility to not generate interrupts it cares about until after its handler is registered.
Message-Id: <[email protected]>
--- arch/x86/kernel/irq.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/kernel/irq.c +3 -1
@@ -291,8 +291,10 @@ void kvm_set_posted_intr_wakeup_handler( {if (handler) kvm_posted_intr_wakeup_handler = handler; -else +else { kvm_posted_intr_wakeup_handler = dummy_handler; +synchronize_rcu (); + } }EXPORT_SYMBOL_GPL (kvm_set_posted_intr_wakeup_handler);
Greg Kroah-Hartman
maintainerPATCH 60/917 x86/iopl: Fake iopl(3) CLI/STI usage
In reply to Greg Kroah-HartmanFrom: Peter Zijlstra <[email protected]>
commit b968e84b509da593c50dc3db679e1d33de701f78 upstream.
Since commit c8137ace5638 ("x86/iopl: Restrict iopl() permission scope") it's possible to emulate iopl(3) using ioperm(), except for the CLI/STI usage.
Userspace CLI/STI usage is very dubious (read broken), since any exception taken during that window can lead to rescheduling anyway (or worse). The IOPL(2) manpage even states that usage of CLI/STI is highly discouraged and might even crash the system.
Of course, that won't stop people and HP has the dubious honour of being the first vendor to be found using this in their hp-health package.
In order to enable this 'software' to still 'work', have the #GP treat the CLI/STI instructions as NOPs when iopl(3). Warn the user that their program is doing dubious things.
--- arch/x86/include/asm/insn-eval.h | 1 + arch/x86/include/asm/processor.h | 1 + arch/x86/kernel/process.c | 1 + arch/x86/kernel/traps.c | 33 +++++++++++++++++++++++++++++++++ arch/x86/lib/insn-eval.c | 2 +- 5 files changed, 37 insertions(+), 1 deletion(-)
arch/x86/include/asm/insn-eval.h +1 -0
@@ -21,6 +21,7 @@ int insn_get_modrm_rm_off(struct insn *iint insn_get_modrm_reg_off (struct insn *insn,struct pt_regs *regs);unsigned long insn_get_seg_base (struct pt_regs *regs,int seg_reg_idx);int insn_get_code_seg_params (struct pt_regs *regs); +int insn_get_effective_ip (struct pt_regs *regs,unsigned long *ip);int insn_fetch_from_user (struct pt_regs *regs,unsigned char buf[MAX_INSN_SIZE ]); int insn_fetch_from_user_inatomic(struct pt_regs *regs,
arch/x86/include/asm/processor.h +1 -0
@@ -518,6 +518,7 @@ struct thread_struct {*/ unsigned long iopl_emul; + unsigned int iopl_warn:1; unsigned int sig_on_uaccess_err:1;/*
arch/x86/kernel/process.c +1 -0
@@ -132,6 +132,7 @@ int copy_thread(unsigned long clone_flag frame->ret_addr = (unsigned long ) ret_from_fork; p->thread.sp = (unsigned long ) fork_frame; p->thread.io_bitmap =NULL ; + p->thread.iopl_warn =0 ;memset (p->thread.ptrace_bps,0 ,sizeof (p->thread.ptrace_bps));#ifdef CONFIG_X86_64
arch/x86/kernel/traps.c +33 -0
@@ -528,6 +528,36 @@ static enum kernel_gp_hint get_kernel_gp#define GPFSTR "general protection fault" +static bool fixup_iopl_exception (struct pt_regs *regs) +{ +struct thread_struct *t = ¤t->thread; +unsigned char byte; +unsigned long ip; + +if (!IS_ENABLED (CONFIG_X86_IOPL_IOPERM ) || t->iopl_emul !=3 ) +return false; + +if (insn_get_effective_ip (regs, &ip)) +return false; + +if (get_user (byte, (const char __user *)ip)) +return false; + +if (byte !=0xfa && byte !=0xfb ) +return false; + +if (!t->iopl_warn &&printk_ratelimit ()) { +pr_err ("%s[%d] attempts to use CLI/STI, pretending it's a NOP, ip:%lx" , + current->comm,task_pid_nr (current), ip); +print_vma_addr (KERN_CONT " in " , ip); +pr_cont ("\n" ); + t->iopl_warn =1 ; + } + + regs->ip +=1 ; +return true; +} +DEFINE_IDTENTRY_ERRORCODE (exc_general_protection) {char desc[sizeof (GPFSTR ) +50 +2 *sizeof (unsigned long ) +1 ] =GPFSTR ;
@@ -553,6 +583,9 @@ DEFINE_IDTENTRY_ERRORCODE(exc_general_pr tsk = current;if (user_mode (regs)) { +if (fixup_iopl_exception (regs)) + goto exit; + tsk->thread.error_code = error_code; tsk->thread.trap_nr =X86_TRAP_GP ;
arch/x86/lib/insn-eval.c +1 -1
@@ -1417,7 +1417,7 @@ void __user *insn_get_addr_ref(struct in } } -static int insn_get_effective_ip (struct pt_regs *regs,unsigned long *ip) +int insn_get_effective_ip (struct pt_regs *regs,unsigned long *ip) {unsigned long seg_base =0 ;
Greg Kroah-Hartman
maintainerPATCH 61/917 btrfs: clear MISSING device status bit in btrfs_close_one_device
In reply to Greg Kroah-HartmanFrom: Li Zhang <[email protected]>
commit 5d03dbebba2594d2e6fbf3b5dd9060c5a835de3b upstream.
Reported bug: https://github.com/kdave/btrfs-progs/issues/389
There's a problem with scrub reporting aborted status but returning error code 0, on a filesystem with missing and readded device.
Roughly these steps:
- mkfs -d raid1 dev1 dev2
- fill with data
- unmount
- make dev1 disappear
- mount -o degraded
- copy more data
- make dev1 appear again
Running scrub afterwards reports that the command was aborted, but the system log message says the exit code was 0.
It seems that the cause of the error is decrementing fs_devices->missing_devices but not clearing device->dev_state. Every time we umount filesystem, it would call close_ctree, And it would eventually involve btrfs_close_one_device to close the device, but it only decrements fs_devices->missing_devices but does not clear the device BTRFS_DEV_STATE_MISSING bit. Worse, this bug will cause Integer Overflow, because every time umount, fs_devices->missing_devices will decrease. If fs_devices->missing_devices value hit 0, it would overflow.
With added debugging:
loop1: detected capacity change from 0 to 20971520
BTRFS: device fsid 56ad51f1-5523-463b-8547-c19486c51ebb devid 1 transid 21 /dev/loop1 scanned by systemd-udevd (2311)
loop2: detected capacity change from 0 to 20971520
BTRFS: device fsid 56ad51f1-5523-463b-8547-c19486c51ebb devid 2 transid 17 /dev/loop2 scanned by systemd-udevd (2313) BTRFS info (device loop1): flagging fs with big metadata feature
BTRFS info (device loop1): allowing degraded mounts
BTRFS info (device loop1): using free space tree
BTRFS info (device loop1): has skinny extents
BTRFS info (device loop1): before clear_missing.00000000f706684d /dev/loop1 0
BTRFS warning (device loop1): devid 2 uuid 6635ac31-56dd-4852-873b-c60f5e2d53d2 is missing
BTRFS info (device loop1): before clear_missing.0000000000000000 /dev/loop2 1
BTRFS info (device loop1): flagging fs with big metadata feature
BTRFS info (device loop1): allowing degraded mounts
BTRFS info (device loop1): using free space tree
BTRFS info (device loop1): has skinny extents
BTRFS info (device loop1): before clear_missing.00000000f706684d /dev/loop1 0
BTRFS warning (device loop1): devid 2 uuid 6635ac31-56dd-4852-873b-c60f5e2d53d2 is missing
BTRFS info (device loop1): before clear_missing.0000000000000000 /dev/loop2 0
BTRFS info (device loop1): flagging fs with big metadata feature
BTRFS info (device loop1): allowing degraded mounts
BTRFS info (device loop1): using free space tree
BTRFS info (device loop1): has skinny extents
BTRFS info (device loop1): before clear_missing.00000000f706684d /dev/loop1 18446744073709551615 BTRFS warning (device loop1): devid 2 uuid 6635ac31-56dd-4852-873b-c60f5e2d53d2 is missing
BTRFS info (device loop1): before clear_missing.0000000000000000 /dev/loop2 18446744073709551615
If fs_devices->missing_devices is 0, next time it would be 18446744073709551615
After apply this patch, the fs_devices->missing_devices seems to be right:
$ truncate -s 10g test1 $ truncate -s 10g test2 $ losetup /dev/loop1 test1 $ losetup /dev/loop2 test2 $ mkfs.btrfs -draid1 -mraid1 /dev/loop1 /dev/loop2 -f $ losetup -d /dev/loop2 $ mount -o degraded /dev/loop1 /mnt/1 $ umount /mnt/1 $ mount -o degraded /dev/loop1 /mnt/1 $ umount /mnt/1 $ mount -o degraded /dev/loop1 /mnt/1 $ umount /mnt/1 $ dmesg
loop1: detected capacity change from 0 to 20971520
loop2: detected capacity change from 0 to 20971520
BTRFS: device fsid 15aa1203-98d3-4a66-bcae-ca82f629c2cd devid 1 transid 5 /dev/loop1 scanned by mkfs.btrfs (1863)
BTRFS: device fsid 15aa1203-98d3-4a66-bcae-ca82f629c2cd devid 2 transid 5 /dev/loop2 scanned by mkfs.btrfs (1863) BTRFS info (device loop1): flagging fs with big metadata feature
BTRFS info (device loop1): allowing degraded mounts
BTRFS info (device loop1): disk space caching is enabled
BTRFS info (device loop1): has skinny extents
BTRFS info (device loop1): before clear_missing.00000000975bd577 /dev/loop1 0
BTRFS warning (device loop1): devid 2 uuid 8b333791-0b3f-4f57-b449-1c1ab6b51f38 is missing BTRFS info (device loop1): before clear_missing.0000000000000000 /dev/loop2 1
BTRFS info (device loop1): checking UUID tree
BTRFS info (device loop1): flagging fs with big metadata feature
BTRFS info (device loop1): allowing degraded mounts
BTRFS info (device loop1): disk space caching is enabled
BTRFS info (device loop1): has skinny extents
BTRFS info (device loop1): before clear_missing.00000000975bd577 /dev/loop1 0
BTRFS warning (device loop1): devid 2 uuid 8b333791-0b3f-4f57-b449-1c1ab6b51f38 is missing BTRFS info (device loop1): before clear_missing.0000000000000000 /dev/loop2 1
BTRFS info (device loop1): flagging fs with big metadata feature
BTRFS info (device loop1): allowing degraded mounts
BTRFS info (device loop1): disk space caching is enabled
BTRFS info (device loop1): has skinny extents
BTRFS info (device loop1): before clear_missing.00000000975bd577 /dev/loop1 0
BTRFS warning (device loop1): devid 2 uuid 8b333791-0b3f-4f57-b449-1c1ab6b51f38 is missing BTRFS info (device loop1): before clear_missing.0000000000000000 /dev/loop2 1
--- fs/btrfs/volumes.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/btrfs/volumes.c +3 -1
@@ -1122,8 +1122,10 @@ static void btrfs_close_one_device(strucif (device->devid ==BTRFS_DEV_REPLACE_DEVID )clear_bit (BTRFS_DEV_STATE_REPLACE_TGT , &device->dev_state); -if (test_bit (BTRFS_DEV_STATE_MISSING , &device->dev_state)) +if (test_bit (BTRFS_DEV_STATE_MISSING , &device->dev_state)) { +clear_bit (BTRFS_DEV_STATE_MISSING , &device->dev_state); fs_devices->missing_devices--; + }btrfs_close_bdev (device);if (device->bdev) {
Greg Kroah-Hartman
maintainerPATCH 62/917 btrfs: fix lost error handling when replaying directory deletes
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit 10adb1152d957a4d570ad630f93a88bb961616c1 upstream.
At replay_dir_deletes(), if find_dir_range() returns an error we break out of the main while loop and then assign a value of 0 (success) to the 'ret' variable, resulting in completely ignoring that an error happened. Fix that by jumping to the 'out' label when find_dir_range() returns an error (negative value).
--- fs/btrfs/tree-log.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/btrfs/tree-log.c +3 -1
@@ -2500,7 +2500,9 @@ again:else { ret =find_dir_range (log, path, dirid, key_type, &range_start, &range_end); -if (ret !=0 ) +if (ret <0 ) + goto out; +else if (ret >0 )break ; }
Greg Kroah-Hartman
maintainerPATCH 63/917 btrfs: call btrfs_check_rw_degradable only if there is a missing device
In reply to Greg Kroah-HartmanFrom: Anand Jain <[email protected]>
commit 5c78a5e7aa835c4f08a7c90fe02d19f95a776f29 upstream.
In open_ctree() in btrfs_check_rw_degradable() [1], we check each block group individually if at least the minimum number of devices is available for that profile. If all the devices are available, then we don't have to check degradable.
[1]open_ctree()
::
3559 if (!sb_rdonly(sb) && !btrfs_check_rw_degradable(fs_info, NULL)) {
Also before calling btrfs_check_rw_degradable() in open_ctee() at the line number shown below [2] we call btrfs_read_chunk_tree() and down to add_missing_dev() to record number of missing devices.
[2]open_ctree()
::
3454 ret = btrfs_read_chunk_tree(fs_info);
btrfs_read_chunk_tree()
read_one_chunk() / read_one_dev()
add_missing_dev()
So, check if there is any missing device before btrfs_check_rw_degradable() in open_ctree().
Also, with this the mount command could save ~16ms.[3] in the most common case, that is no device is missing.
[3]
1) * 16934.96 us | btrfs_check_rw_degradable [btrfs]();
--- fs/btrfs/disk-io.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/btrfs/disk-io.c +2 -1
@@ -3556,7 +3556,8 @@ int __cold open_ctree(struct super_block goto fail_sysfs; } -if (!sb_rdonly (sb) && !btrfs_check_rw_degradable (fs_info,NULL )) { +if (!sb_rdonly (sb) && fs_info->fs_devices->missing_devices && + !btrfs_check_rw_degradable (fs_info,NULL )) {btrfs_warn (fs_info,"writable mount is not allowed due to too many missing devices" ); goto fail_sysfs;
Greg Kroah-Hartman
maintainerPATCH 64/917 KVM: x86/mmu: Drop a redundant, broken remote TLB flush
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
commit bc3b3c1002ea684e618ff6d8c387b1b8b319f140 upstream.
A recent commit to fix the calls to kvm_flush_remote_tlbs_with_address() in kvm_zap_gfn_range() inadvertantly added yet another flush instead of fixing the existing flush. Drop the redundant flush, and fix the params for the existing flush.
Message-Id: <[email protected]>
--- arch/x86/kvm/mmu/mmu.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
arch/x86/kvm/mmu/mmu.c +2 -4
@@ -5758,13 +5758,11 @@ void kvm_zap_gfn_range(struct kvm *kvm,for (i =0 ; i <KVM_ADDRESS_SPACE_NUM ; i++) flush =kvm_tdp_mmu_zap_gfn_range (kvm, i, gfn_start, gfn_end, flush); -if (flush) -kvm_flush_remote_tlbs_with_address (kvm, gfn_start, - gfn_end - gfn_start); }if (flush) -kvm_flush_remote_tlbs_with_address (kvm, gfn_start, gfn_end); +kvm_flush_remote_tlbs_with_address (kvm, gfn_start, + gfn_end - gfn_start);kvm_dec_notifier_count (kvm, gfn_start, gfn_end);
Greg Kroah-Hartman
maintainerPATCH 65/917 KVM: VMX: Unregister posted interrupt wakeup handler on hardware unsetup
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
commit ec5a4919fa7b7d8c7a2af1c7e799b1fe4be84343 upstream.
Unregister KVM's posted interrupt wakeup handler during unsetup so that a spurious interrupt that arrives after kvm_intel.ko is unloaded doesn't call into freed memory.
Message-Id: <[email protected]>
--- arch/x86/kvm/vmx/vmx.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
arch/x86/kvm/vmx/vmx.c +5 -2
@@ -7551,6 +7551,8 @@ static void vmx_migrate_timers(struct kvstatic void hardware_unsetup (void ) { +kvm_set_posted_intr_wakeup_handler (NULL ); +if (nested)nested_vmx_hardware_unsetup ();
@@ -7879,8 +7881,6 @@ static __init int hardware_setup(void) vmx_x86_ops.request_immediate_exit = __kvm_request_immediate_exit; } -kvm_set_posted_intr_wakeup_handler (pi_wakeup_handler); - kvm_mce_cap_supported |=MCG_LMCE_P ;if (pt_mode !=PT_MODE_SYSTEM && pt_mode !=PT_MODE_HOST_GUEST )
@@ -7904,6 +7904,9 @@ static __init int hardware_setup(void) r =alloc_kvm_area ();if (r)nested_vmx_hardware_unsetup (); + +kvm_set_posted_intr_wakeup_handler (pi_wakeup_handler); +return r; }
Greg Kroah-Hartman
maintainerPATCH 66/917 powerpc/kvm: Fix kvm_use_magic_page
In reply to Greg Kroah-HartmanFrom: Andreas Gruenbacher <[email protected]>
commit 0c8eb2884a42d992c7726539328b7d3568f22143 upstream.
When switching from __get_user to fault_in_pages_readable, commit 9f9eae5ce717 broke kvm_use_magic_page: like __get_user, fault_in_pages_readable returns 0 on success.
--- arch/powerpc/kernel/kvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/kvm.c +1 -1
@@ -669,7 +669,7 @@ static void __init kvm_use_magic_page(voon_each_cpu (kvm_map_magic_page, &features,1 );/* Quick self-test to see if the mapping works */ -if (!fault_in_pages_readable ((const char *)KVM_MAGIC_PAGE ,sizeof (u32))) { +if (fault_in_pages_readable ((const char *)KVM_MAGIC_PAGE ,sizeof (u32))) { kvm_patching_worked = false;return ; }
Greg Kroah-Hartman
maintainerPATCH 67/917 KVM: PPC: Tick accounting should defer vtime accounting til after IRQ handling
In reply to Greg Kroah-HartmanFrom: Laurent Vivier <[email protected]>
commit 235cee162459d96153d63651ce7ff51752528c96 upstream.
Commit 112665286d08 ("KVM: PPC: Book3S HV: Context tracking exit guest context before enabling irqs") moved guest_exit() into the interrupt protected area to avoid wrong context warning (or worse). The problem is that tick-based time accounting has not yet been updated at this point (because it depends on the timer interrupt firing), so the guest time gets incorrectly accounted to system time.
To fix the problem, follow the x86 fix in commit 160457140187 ("Defer vtime accounting 'til after IRQ handling"), and allow host IRQs to run before accounting the guest exit time.
In the case vtime accounting is enabled, this is not required because TB is used directly for accounting.
Before this patch, with CONFIG_TICK_CPU_ACCOUNTING=y in the host and a guest running a kernel compile, the 'guest' fields of /proc/stat are stuck at zero. With the patch they can be observed increasing roughly as expected.
--- arch/powerpc/kvm/book3s_hv.c | 30 ++++++++++++++++++++++++++++-- arch/powerpc/kvm/booke.c | 16 +++++++++++++++- 2 files changed, 43 insertions(+), 3 deletions(-)
arch/powerpc/kvm/book3s_hv.c +28 -2
@@ -3726,7 +3726,20 @@ static noinline void kvmppc_run_core(strkvmppc_set_host_core (pcpu); -guest_exit_irqoff (); +context_tracking_guest_exit (); +if (!vtime_accounting_enabled_this_cpu ()) { +local_irq_enable (); +/* +* Service IRQs here before vtime_account_guest_exit() so any +* ticks that occurred while running the guest are accounted to +* the guest. If vtime accounting is enabled, accounting uses +* TB rather than ticks, so it can be done without enabling +* interrupts here, which has the problem that it accounts +* interrupt processing overhead to the host. +*/ +local_irq_disable (); + } +vtime_account_guest_exit ();local_irq_enable ();
@@ -4510,7 +4523,20 @@ int kvmhv_run_single_vcpu(struct kvm_vcpkvmppc_set_host_core (pcpu); -guest_exit_irqoff (); +context_tracking_guest_exit (); +if (!vtime_accounting_enabled_this_cpu ()) { +local_irq_enable (); +/* +* Service IRQs here before vtime_account_guest_exit() so any +* ticks that occurred while running the guest are accounted to +* the guest. If vtime accounting is enabled, accounting uses +* TB rather than ticks, so it can be done without enabling +* interrupts here, which has the problem that it accounts +* interrupt processing overhead to the host. +*/ +local_irq_disable (); + } +vtime_account_guest_exit ();local_irq_enable ();
arch/powerpc/kvm/booke.c +15 -1
@@ -1042,7 +1042,21 @@ int kvmppc_handle_exit(struct kvm_vcpu * }trace_kvm_exit (exit_nr, vcpu); -guest_exit_irqoff (); + +context_tracking_guest_exit (); +if (!vtime_accounting_enabled_this_cpu ()) { +local_irq_enable (); +/* +* Service IRQs here before vtime_account_guest_exit() so any +* ticks that occurred while running the guest are accounted to +* the guest. If vtime accounting is enabled, accounting uses +* TB rather than ticks, so it can be done without enabling +* interrupts here, which has the problem that it accounts +* interrupt processing overhead to the host. +*/ +local_irq_disable (); + } +vtime_account_guest_exit ();local_irq_enable ();
Greg Kroah-Hartman
maintainerPATCH 68/917 ia64: kprobes: Fix to pass correct trampoline address to the handler
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
commit a7fe2378454cf46cd5e2776d05e72bbe8f0a468c upstream.
The following commit:
Commit e792ff804f49 ("ia64: kprobes: Use generic kretprobe trampoline handler")
Passed the wrong trampoline address to __kretprobe_trampoline_handler(): it passes the descriptor address instead of function entry address.
Pass the right parameter.
Also use correct symbol dereference function to get the function address from 'kretprobe_trampoline' - an IA64 special.
--- arch/ia64/kernel/kprobes.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
arch/ia64/kernel/kprobes.c +5 -4
@@ -398,7 +398,8 @@ static void kretprobe_trampoline(void)int __kprobes trampoline_probe_handler (struct kprobe *p,struct pt_regs *regs) { - regs->cr_iip =__kretprobe_trampoline_handler (regs, kretprobe_trampoline,NULL ); + regs->cr_iip =__kretprobe_trampoline_handler (regs, +dereference_function_descriptor (kretprobe_trampoline),NULL );/* * By returning a non-zero value, we are telling * kprobe_handler() that we don't want the post_handler
@@ -414,7 +415,7 @@ void __kprobes arch_prepare_kretprobe(st ri->fp =NULL ;/* Replace the return addr with trampoline addr */ - regs->b0 = ((struct fnptr *)kretprobe_trampoline)->ip; + regs->b0 = (unsigned long )dereference_function_descriptor (kretprobe_trampoline); }/* Check the instruction in the slot is break */
@@ -902,14 +903,14 @@ static struct kprobe trampoline_p = {int __init arch_init_kprobes (void ) { trampoline_p.addr = - (kprobe_opcode_t *)((struct fnptr *)kretprobe_trampoline)->ip; +dereference_function_descriptor (kretprobe_trampoline);return register_kprobe (&trampoline_p); }int __kprobes arch_trampoline_kprobe (struct kprobe *p) {if (p->addr == - (kprobe_opcode_t *)((struct fnptr *)kretprobe_trampoline)->ip) +dereference_function_descriptor (kretprobe_trampoline))return 1 ;return 0 ;
Greg Kroah-Hartman
maintainerPATCH 69/917 selinux: fix race condition when computing ocontext SIDs
In reply to Greg Kroah-HartmanFrom: Ondrej Mosnacek <[email protected]>
commit cbfcd13be5cb2a07868afe67520ed181956579a7 upstream.
Current code contains a lot of racy patterns when converting an ocontext's context structure to an SID. This is being done in a "lazy" fashion, such that the SID is looked up in the SID table only when it's first needed and then cached in the "sid" field of the ocontext structure. However, this is done without any locking or memory barriers and is thus unsafe.
Between commits 24ed7fdae669 ("selinux: use separate table for initial SID lookup") and 66f8e2f03c02 ("selinux: sidtab reverse lookup hash table"), this race condition lead to an actual observable bug, because a pointer to the shared sid field was passed directly to sidtab_context_to_sid(), which was using this location to also store an intermediate value, which could have been read by other threads and interpreted as an SID. In practice this caused e.g. new mounts to get a wrong (seemingly random) filesystem context, leading to strange denials. This bug has been spotted in the wild at least twice, see [1] and [2].
Fix the race condition by making all the racy functions use a common helper that ensures the ocontext::sid accesses are made safely using the appropriate SMP constructs.
Note that security_netif_sid() was populating the sid field of both contexts stored in the ocontext, but only the first one was actually used. The SELinux wiki's documentation on the "netifcon" policy statement [3] suggests that using only the first context is intentional. I kept only the handling of the first context here, as there is really no point in doing the SID lookup for the unused one.
I wasn't able to reproduce the bug mentioned above on any kernel that includes commit 66f8e2f03c02, even though it has been reported that the issue occurs with that commit, too, just less frequently. Thus, I wasn't able to verify that this patch fixes the issue, but it makes sense to avoid the race condition regardless.
[1] https://github.com/containers/container-selinux/issues/89
[2] https://lists.fedoraproject.org/archives/list/[email protected]/thread/6DMTAMHIOAOEMUAVTULJD45JZU7IBAFM/
[3] https://selinuxproject.org/page/NetworkStatements#netifcon
--- security/selinux/ss/services.c | 162 +++++++++++++++++++---------------------- 1 file changed, 77 insertions(+), 85 deletions(-)
security/selinux/ss/services.c +77 -85
@@ -2377,6 +2377,43 @@ err_policy: }/** +* ocontext_to_sid - Helper to safely get sid for an ocontext +* @sidtab: SID table +* @c: ocontext structure +* @index: index of the context entry (0 or 1) +* @out_sid: pointer to the resulting SID value +* +* For all ocontexts except OCON_ISID the SID fields are populated +* on-demand when needed. Since updating the SID value is an SMP-sensitive +* operation, this helper must be used to do that safely. +* +* WARNING: This function may return -ESTALE, indicating that the caller +* must retry the operation after re-acquiring the policy pointer! +*/ +static int ocontext_to_sid (struct sidtab *sidtab,struct ocontext *c, +size_t index,u32 *out_sid) +{ +int rc; +u32 sid; + +/* Ensure the associated sidtab entry is visible to this thread. */ + sid =smp_load_acquire (&c->sid[index]); +if (!sid) { + rc =sidtab_context_to_sid (sidtab, &c->context[index], &sid); +if (rc) +return rc; + +/* +* Ensure the new sidtab entry is visible to other threads +* when they see the SID. +*/ +smp_store_release (&c->sid[index], sid); + } + *out_sid = sid; +return 0 ; +} + +/** * security_port_sid - Obtain the SID for a port. * @state: SELinux state * @protocol: protocol number
@@ -2414,17 +2451,13 @@ retry: }if (c) { -if (!c->sid[0 ]) { - rc =sidtab_context_to_sid (sidtab, &c->context[0 ], - &c->sid[0 ]); -if (rc == -ESTALE ) { -rcu_read_unlock (); - goto retry; - } -if (rc) - goto out; + rc =ocontext_to_sid (sidtab, c,0 , out_sid); +if (rc == -ESTALE ) { +rcu_read_unlock (); + goto retry; } - *out_sid = c->sid[0 ]; +if (rc) + goto out; }else { *out_sid =SECINITSID_PORT ; }
@@ -2473,18 +2506,13 @@ retry: }if (c) { -if (!c->sid[0 ]) { - rc =sidtab_context_to_sid (sidtab, - &c->context[0 ], - &c->sid[0 ]); -if (rc == -ESTALE ) { -rcu_read_unlock (); - goto retry; - } -if (rc) - goto out; + rc =ocontext_to_sid (sidtab, c,0 , out_sid); +if (rc == -ESTALE ) { +rcu_read_unlock (); + goto retry; } - *out_sid = c->sid[0 ]; +if (rc) + goto out; }else *out_sid =SECINITSID_UNLABELED ;
@@ -2533,17 +2561,13 @@ retry: }if (c) { -if (!c->sid[0 ]) { - rc =sidtab_context_to_sid (sidtab, &c->context[0 ], - &c->sid[0 ]); -if (rc == -ESTALE ) { -rcu_read_unlock (); - goto retry; - } -if (rc) - goto out; + rc =ocontext_to_sid (sidtab, c,0 , out_sid); +if (rc == -ESTALE ) { +rcu_read_unlock (); + goto retry; } - *out_sid = c->sid[0 ]; +if (rc) + goto out; }else *out_sid =SECINITSID_UNLABELED ;
@@ -2587,25 +2611,13 @@ retry: }if (c) { -if (!c->sid[0 ] || !c->sid[1 ]) { - rc =sidtab_context_to_sid (sidtab, &c->context[0 ], - &c->sid[0 ]); -if (rc == -ESTALE ) { -rcu_read_unlock (); - goto retry; - } -if (rc) - goto out; - rc =sidtab_context_to_sid (sidtab, &c->context[1 ], - &c->sid[1 ]); -if (rc == -ESTALE ) { -rcu_read_unlock (); - goto retry; - } -if (rc) - goto out; + rc =ocontext_to_sid (sidtab, c,0 , if_sid); +if (rc == -ESTALE ) { +rcu_read_unlock (); + goto retry; } - *if_sid = c->sid[0 ]; +if (rc) + goto out; }else *if_sid =SECINITSID_NETIF ;
@@ -2697,18 +2709,13 @@ retry: }if (c) { -if (!c->sid[0 ]) { - rc =sidtab_context_to_sid (sidtab, - &c->context[0 ], - &c->sid[0 ]); -if (rc == -ESTALE ) { -rcu_read_unlock (); - goto retry; - } -if (rc) - goto out; + rc =ocontext_to_sid (sidtab, c,0 , out_sid); +if (rc == -ESTALE ) { +rcu_read_unlock (); + goto retry; } - *out_sid = c->sid[0 ]; +if (rc) + goto out; }else { *out_sid =SECINITSID_NODE ; }
@@ -2873,7 +2880,7 @@ static inline int __security_genfs_sid(su16 sclass;struct genfs *genfs;struct ocontext *c; -int rc, cmp =0 ; +int cmp =0 ;while (path[0 ] =='/' && path[1 ] =='/' ) path++;
@@ -2887,9 +2894,8 @@ static inline int __security_genfs_sid(sbreak ; } - rc = -ENOENT ;if (!genfs || cmp) - goto out; +return -ENOENT ;for (c = genfs->head; c; c = c->next) { len =strlen (c->u.name);
@@ -2898,20 +2904,10 @@ static inline int __security_genfs_sid(sbreak ; } - rc = -ENOENT ;if (!c) - goto out; +return -ENOENT ; -if (!c->sid[0 ]) { - rc =sidtab_context_to_sid (sidtab, &c->context[0 ], &c->sid[0 ]); -if (rc) - goto out; - } - - *sid = c->sid[0 ]; - rc =0 ; -out: -return rc; +return ocontext_to_sid (sidtab, c,0 , sid); }/**
@@ -2996,17 +2992,13 @@ retry:if (c) { sbsec->behavior = c->v.behavior; -if (!c->sid[0 ]) { - rc =sidtab_context_to_sid (sidtab, &c->context[0 ], - &c->sid[0 ]); -if (rc == -ESTALE ) { -rcu_read_unlock (); - goto retry; - } -if (rc) - goto out; + rc =ocontext_to_sid (sidtab, c,0 , &sbsec->sid); +if (rc == -ESTALE ) { +rcu_read_unlock (); + goto retry; } - sbsec->sid = c->sid[0 ]; +if (rc) + goto out; }else { rc =__security_genfs_sid (policy, fstype,"/" ,SECCLASS_DIR , &sbsec->sid);
Greg Kroah-Hartman
maintainerPATCH 70/917 ipmi:watchdog: Set panic count to proper value on a panic
In reply to Greg Kroah-HartmanFrom: Corey Minyard <[email protected]>
commit db05ddf7f321634c5659a0cf7ea56594e22365f7 upstream.
You will get two decrements when the messages on a panic are sent, not one, since commit 2033f6858970 ("ipmi: Free receive messages when in an oops") was added, but the watchdog code had a bug where it didn't set the value properly.
--- drivers/char/ipmi/ipmi_watchdog.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/char/ipmi/ipmi_watchdog.c +4 -4
@@ -497,7 +497,7 @@ static void panic_halt_ipmi_heartbeat(vo msg.cmd =IPMI_WDOG_RESET_TIMER ; msg.data =NULL ; msg.data_len =0 ; -atomic_inc (&panic_done_count); +atomic_add (2 , &panic_done_count); rv = ipmi_request_supply_msgs(watchdog_user, (struct ipmi_addr *) &addr, 0,
@@ -507,7 +507,7 @@ static void panic_halt_ipmi_heartbeat(vo &panic_halt_heartbeat_recv_msg, 1);if (rv) -atomic_dec (&panic_done_count); +atomic_sub (2 , &panic_done_count); }static struct ipmi_smi_msg panic_halt_smi_msg = {
@@ -531,12 +531,12 @@ static void panic_halt_ipmi_set_timeout(/* Wait for the messages to be free. */ while (atomic_read (&panic_done_count) !=0 )ipmi_poll_interface (watchdog_user); -atomic_inc (&panic_done_count); +atomic_add (2 , &panic_done_count); rv =__ipmi_set_timeout (&panic_halt_smi_msg, &panic_halt_recv_msg, &send_heartbeat_now);if (rv) { -atomic_dec (&panic_done_count); +atomic_sub (2 , &panic_done_count);pr_warn ("Unable to extend the watchdog timeout\n" ); }else {if (send_heartbeat_now)
Greg Kroah-Hartman
maintainerPATCH 71/917 md/raid1: only allocate write behind bio for WriteMostly device
In reply to Greg Kroah-HartmanFrom: Guoqing Jiang <[email protected]>
commit fd3b6975e9c11c4fa00965f82a0bfbb3b7b44101 upstream.
Commit 6607cd319b6b91bff94e90f798a61c031650b514 ("raid1: ensure write behind bio has less than BIO_MAX_VECS sectors") tried to guarantee the size of behind bio is not bigger than BIO_MAX_VECS sectors.
Unfortunately the same calltrace still could happen since an array could enable write-behind without write mostly device.
To match the manpage of mdadm (which says "write-behind is only attempted on drives marked as write-mostly"), we need to check WriteMostly flag to avoid such unexpected behavior.
[1]. https://bugzilla.kernel.org/show_bug.cgi?id=213181#c25
--- drivers/md/raid1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/raid1.c +1 -1
@@ -1496,7 +1496,7 @@ static void raid1_write_request(struct mif (!r1_bio->bios[i])continue ; -if (first_clone) { +if (first_clone &&test_bit (WriteMostly, &rdev->flags)) {/* do behind I/O ? * Not if there are too many, or cannot * allocate memory, or a reader on WriteMostly
Greg Kroah-Hartman
maintainerPATCH 72/917 hwmon: (pmbus/lm25066) Add offset coefficients
In reply to Greg Kroah-HartmanFrom: Zev Weiss <[email protected]>
commit ae59dc455a78fb73034dd1fbb337d7e59c27cbd8 upstream.
With the exception of the lm5066i, all the devices handled by this driver had been missing their offset ('b') coefficients for direct format readings.
--- drivers/hwmon/pmbus/lm25066.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
drivers/hwmon/pmbus/lm25066.c +23 -0
@@ -55,22 +55,27 @@ static struct __coeff lm25066_coeff[6][P [lm25056] = { [PSC_VOLTAGE_IN] = { .m = 16296, + .b = 1343, .R = -2, }, [PSC_CURRENT_IN] = { .m = 13797, + .b = -1833, .R = -2, }, [PSC_CURRENT_IN_L] = { .m = 6726, + .b = -537, .R = -2, }, [PSC_POWER] = { .m = 5501, + .b = -2908, .R = -3, }, [PSC_POWER_L] = { .m = 26882, + .b = -5646, .R = -4, }, [PSC_TEMPERATURE] = {
@@ -82,26 +87,32 @@ static struct __coeff lm25066_coeff[6][P [lm25066] = { [PSC_VOLTAGE_IN] = { .m = 22070, + .b = -1800, .R = -2, }, [PSC_VOLTAGE_OUT] = { .m = 22070, + .b = -1800, .R = -2, }, [PSC_CURRENT_IN] = { .m = 13661, + .b = -5200, .R = -2, }, [PSC_CURRENT_IN_L] = { .m = 6852, + .b = -3100, .R = -2, }, [PSC_POWER] = { .m = 736, + .b = -3300, .R = -2, }, [PSC_POWER_L] = { .m = 369, + .b = -1900, .R = -2, }, [PSC_TEMPERATURE] = {
@@ -111,26 +122,32 @@ static struct __coeff lm25066_coeff[6][P [lm5064] = { [PSC_VOLTAGE_IN] = { .m = 4611, + .b = -642, .R = -2, }, [PSC_VOLTAGE_OUT] = { .m = 4621, + .b = 423, .R = -2, }, [PSC_CURRENT_IN] = { .m = 10742, + .b = 1552, .R = -2, }, [PSC_CURRENT_IN_L] = { .m = 5456, + .b = 2118, .R = -2, }, [PSC_POWER] = { .m = 1204, + .b = 8524, .R = -3, }, [PSC_POWER_L] = { .m = 612, + .b = 11202, .R = -3, }, [PSC_TEMPERATURE] = {
@@ -140,26 +157,32 @@ static struct __coeff lm25066_coeff[6][P [lm5066] = { [PSC_VOLTAGE_IN] = { .m = 4587, + .b = -1200, .R = -2, }, [PSC_VOLTAGE_OUT] = { .m = 4587, + .b = -2400, .R = -2, }, [PSC_CURRENT_IN] = { .m = 10753, + .b = -1200, .R = -2, }, [PSC_CURRENT_IN_L] = { .m = 5405, + .b = -600, .R = -2, }, [PSC_POWER] = { .m = 1204, + .b = -6000, .R = -3, }, [PSC_POWER_L] = { .m = 605, + .b = -8000, .R = -3, }, [PSC_TEMPERATURE] = {
Greg Kroah-Hartman
maintainerPATCH 73/917 regulator: s5m8767: do not use reset value as DVS voltage if GPIO DVS is disabled
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
commit b16bef60a9112b1e6daf3afd16484eb06e7ce792 upstream.
The driver and its bindings, before commit 04f9f068a619 ("regulator:
s5m8767: Modify parsing method of the voltage table of buck2/3/4") were requiring to provide at least one safe/default voltage for DVS registers if DVS GPIO is not being enabled.
IOW, if s5m8767,pmic-buck2-uses-gpio-dvs is missing, the s5m8767,pmic-buck2-dvs-voltage should still be present and contain one voltage.
This requirement was coming from driver behavior matching this condition (none of DVS GPIO is enabled): it was always initializing the DVS selector pins to 0 and keeping the DVS enable setting at reset value (enabled). Therefore if none of DVS GPIO is enabled in devicetree, driver was configuring the first DVS voltage for buck[234].
Mentioned commit 04f9f068a619 ("regulator: s5m8767: Modify parsing method of the voltage table of buck2/3/4") broke it because DVS voltage won't be parsed from devicetree if DVS GPIO is not enabled. After the change, driver will configure bucks to use the register reset value as voltage which might have unpleasant effects.
Fix this by relaxing the bindings constrain: if DVS GPIO is not enabled in devicetree (therefore DVS voltage is also not parsed), explicitly disable it.
Message-Id: <[email protected]>
--- Documentation/devicetree/bindings/regulator/samsung,s5m8767.txt | 21 +++------- drivers/regulator/s5m8767.c | 21 ++++------ 2 files changed, 17 insertions(+), 25 deletions(-)
Documentation/devicetree/bindings/regulator/samsung,s5m8767.txt +8 -13
@@ -13,6 +13,14 @@ common regulator binding documented in: Required properties of the main device node (the parent!): + - s5m8767,pmic-buck-ds-gpios: GPIO specifiers for three host gpio's used + for selecting GPIO DVS lines. It is one-to-one mapped to dvs gpio lines. + + [1] If either of the 's5m8767,pmic-buck[2/3/4]-uses-gpio-dvs' optional + property is specified, then all the eight voltage values for the + 's5m8767,pmic-buck[2/3/4]-dvs-voltage' should be specified. + +Optional properties of the main device node (the parent!): - s5m8767,pmic-buck2-dvs-voltage: A set of 8 voltage values in micro-volt (uV) units for buck2 when changing voltage using gpio dvs. Refer to [1] below for additional information.
@@ -25,19 +33,6 @@ Required properties of the main device n units for buck4 when changing voltage using gpio dvs. Refer to [1] below for additional information. - - s5m8767,pmic-buck-ds-gpios: GPIO specifiers for three host gpio's used - for selecting GPIO DVS lines. It is one-to-one mapped to dvs gpio lines. - - [1] If none of the 's5m8767,pmic-buck[2/3/4]-uses-gpio-dvs' optional - property is specified, the 's5m8767,pmic-buck[2/3/4]-dvs-voltage' - property should specify atleast one voltage level (which would be a - safe operating voltage). - - If either of the 's5m8767,pmic-buck[2/3/4]-uses-gpio-dvs' optional - property is specified, then all the eight voltage values for the - 's5m8767,pmic-buck[2/3/4]-dvs-voltage' should be specified. - -Optional properties of the main device node (the parent!): - s5m8767,pmic-buck2-uses-gpio-dvs: 'buck2' can be controlled by gpio dvs. - s5m8767,pmic-buck3-uses-gpio-dvs: 'buck3' can be controlled by gpio dvs. - s5m8767,pmic-buck4-uses-gpio-dvs: 'buck4' can be controlled by gpio dvs.
drivers/regulator/s5m8767.c +9 -12
@@ -850,18 +850,15 @@ static int s5m8767_pmic_probe(struct pla/* DS4 GPIO */ gpio_direction_output (pdata->buck_ds[2 ],0x0 ); -if (pdata->buck2_gpiodvs || pdata->buck3_gpiodvs || - pdata->buck4_gpiodvs) { -regmap_update_bits (s5m8767->iodev->regmap_pmic, -S5M8767_REG_BUCK2CTRL ,1 <<1 , - (pdata->buck2_gpiodvs) ? (1 <<1 ) : (0 <<1 )); -regmap_update_bits (s5m8767->iodev->regmap_pmic, -S5M8767_REG_BUCK3CTRL ,1 <<1 , - (pdata->buck3_gpiodvs) ? (1 <<1 ) : (0 <<1 )); -regmap_update_bits (s5m8767->iodev->regmap_pmic, -S5M8767_REG_BUCK4CTRL ,1 <<1 , - (pdata->buck4_gpiodvs) ? (1 <<1 ) : (0 <<1 )); - } +regmap_update_bits (s5m8767->iodev->regmap_pmic, +S5M8767_REG_BUCK2CTRL ,1 <<1 , + (pdata->buck2_gpiodvs) ? (1 <<1 ) : (0 <<1 )); +regmap_update_bits (s5m8767->iodev->regmap_pmic, +S5M8767_REG_BUCK3CTRL ,1 <<1 , + (pdata->buck3_gpiodvs) ? (1 <<1 ) : (0 <<1 )); +regmap_update_bits (s5m8767->iodev->regmap_pmic, +S5M8767_REG_BUCK4CTRL ,1 <<1 , + (pdata->buck4_gpiodvs) ? (1 <<1 ) : (0 <<1 ));/* Initialize GPIO DVS registers */ for (i =0 ; i <8 ; i++) {
Greg Kroah-Hartman
maintainerPATCH 74/917 regulator: dt-bindings: samsung,s5m8767: correct s5m8767,pmic-buck-default-dvs-idx property
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
commit a7fda04bc9b6ad9da8e19c9e6e3b1dab773d068a upstream.
The driver was always parsing "s5m8767,pmic-buck-default-dvs-idx", not "s5m8767,pmic-buck234-default-dvs-idx".
Message-Id: <[email protected]>
--- Documentation/devicetree/bindings/regulator/samsung,s5m8767.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/regulator/samsung,s5m8767.txt +1 -1
@@ -39,7 +39,7 @@ Optional properties of the main device n Additional properties required if either of the optional properties are used: - - s5m8767,pmic-buck234-default-dvs-idx: Default voltage setting selected from + - s5m8767,pmic-buck-default-dvs-idx: Default voltage setting selected from the possible 8 options selectable by the dvs gpios. The value of this property should be between 0 and 7. If not specified or if out of range, the default value of this property is set to 0.
Greg Kroah-Hartman
maintainerPATCH 75/917 EDAC/sb_edac: Fix top-of-high-memory value for Broadwell/Haswell
In reply to Greg Kroah-HartmanFrom: Eric Badger <[email protected]>
commit 537bddd069c743759addf422d0b8f028ff0f8dbc upstream.
The computation of TOHM is off by one bit. This missed bit results in too low a value for TOHM, which can cause errors in regular memory to incorrectly report:
EDAC MC0: 1 CE Error at MMIOH area, on addr 0x000000207fffa680 on any memory
--- drivers/edac/sb_edac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/edac/sb_edac.c +1 -1
@@ -1052,7 +1052,7 @@ static u64 haswell_get_tohm(struct sbridpci_read_config_dword (pvt->info.pci_vtd,HASWELL_TOHM_1 , ®); rc = ((reg <<6 ) | rc) <<26 ; -return rc |0x1ffffff ; +return rc |0x3ffffff ; }static u64 knl_get_tolm (struct sbridge_pvt *pvt)
Greg Kroah-Hartman
maintainerPATCH 76/917 mwifiex: fix division by zero in fw download path
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 89f8765a11d8df49296d92c404067f9b5c58ee26 upstream.
Add the missing endpoint sanity checks to probe() to avoid division by zero in mwifiex_write_data_sync() in case a malicious device has broken descriptors (or when doing descriptor fuzz testing).
Only add checks for the firmware-download boot stage, which require both command endpoints, for now. The driver looks like it will handle a missing endpoint during normal operation without oopsing, albeit not very gracefully as it will try to submit URBs to the default pipe and fail.
Note that USB core will reject URBs submitted for endpoints with zero wMaxPacketSize but that drivers doing packet-size calculations still need to handle this (cf. commit 2548288b4fb0 ("USB: Fix: Don't skip endpoint descriptors with maxpacket=0")).
--- drivers/net/wireless/marvell/mwifiex/usb.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/net/wireless/marvell/mwifiex/usb.c +16 -0
@@ -505,6 +505,22 @@ static int mwifiex_usb_probe(struct usb_ } } +switch (card->usb_boot_state) { +case USB8XXX_FW_DNLD : +/* Reject broken descriptors. */ +if (!card->rx_cmd_ep || !card->tx_cmd_ep) +return -ENODEV ; +if (card->bulk_out_maxpktsize ==0 ) +return -ENODEV ; +break ; +case USB8XXX_FW_READY : +/* Assume the driver can handle missing endpoints for now. */ +break ; +default : +WARN_ON (1 ); +return -ENODEV ; + } +usb_set_intfdata (intf, card); ret = mwifiex_add_card(card, &card->fw_done, &usb_ops,
Greg Kroah-Hartman
maintainerPATCH 77/917 ath6kl: fix division by zero in send path
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit c1b9ca365deae667192be9fe24db244919971234 upstream.
Add the missing endpoint max-packet sanity check to probe() to avoid division by zero in ath10k_usb_hif_tx_sg() in case a malicious device has broken descriptors (or when doing descriptor fuzz testing).
Note that USB core will reject URBs submitted for endpoints with zero wMaxPacketSize but that drivers doing packet-size calculations still need to handle this (cf. commit 2548288b4fb0 ("USB: Fix: Don't skip endpoint descriptors with maxpacket=0")).
--- drivers/net/wireless/ath/ath6kl/usb.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/ath/ath6kl/usb.c +5 -0
@@ -340,6 +340,11 @@ static int ath6kl_usb_setup_pipe_resourcle16_to_cpu (endpoint->wMaxPacketSize), endpoint->bInterval); } + +/* Ignore broken descriptors. */ +if (usb_endpoint_maxp (endpoint) ==0 ) +continue ; + urbcount =0 ; pipe_num =
Greg Kroah-Hartman
maintainerPATCH 78/917 ath6kl: fix control-message timeout
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit a066d28a7e729f808a3e6eff22e70c003091544e upstream.
USB control-message timeouts are specified in milliseconds and should specifically not vary with CONFIG_HZ.
--- drivers/net/wireless/ath/ath6kl/usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath6kl/usb.c +1 -1
@@ -912,7 +912,7 @@ static int ath6kl_usb_submit_ctrl_in(str req,USB_DIR_IN |USB_TYPE_VENDOR |USB_RECIP_DEVICE , value, index, buf, - size, 2 * HZ); + size, 2000);if (ret <0 ) {ath6kl_warn ("Failed to read usb control message: %d\n" , ret);
Greg Kroah-Hartman
maintainerPATCH 79/917 ath10k: fix control-message timeout
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 5286132324230168d3fab6ffc16bfd7de85bdfb4 upstream.
USB control-message timeouts are specified in milliseconds and should specifically not vary with CONFIG_HZ.
--- drivers/net/wireless/ath/ath10k/usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/usb.c +1 -1
@@ -525,7 +525,7 @@ static int ath10k_usb_submit_ctrl_in(str req,USB_DIR_IN |USB_TYPE_VENDOR |USB_RECIP_DEVICE , value, index, buf, - size, 2 * HZ); + size, 2000);if (ret <0 ) { ath10k_warn(ar, "Failed to read usb control message: %d\n",
Greg Kroah-Hartman
maintainerPATCH 80/917 ath10k: fix division by zero in send path
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit a006acb931317aad3a8dd41333ebb0453caf49b8 upstream.
Add the missing endpoint max-packet sanity check to probe() to avoid division by zero in ath10k_usb_hif_tx_sg() in case a malicious device has broken descriptors (or when doing descriptor fuzz testing).
Note that USB core will reject URBs submitted for endpoints with zero wMaxPacketSize but that drivers doing packet-size calculations still need to handle this (cf. commit 2548288b4fb0 ("USB: Fix: Don't skip endpoint descriptors with maxpacket=0")).
--- drivers/net/wireless/ath/ath10k/usb.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/ath/ath10k/usb.c +5 -0
@@ -853,6 +853,11 @@ static int ath10k_usb_setup_pipe_resourcle16_to_cpu (endpoint->wMaxPacketSize), endpoint->bInterval); } + +/* Ignore broken descriptors. */ +if (usb_endpoint_maxp (endpoint) ==0 ) +continue ; + urbcount =0 ; pipe_num =
Greg Kroah-Hartman
maintainerPATCH 81/917 PCI: Mark Atheros QCA6174 to avoid bus reset
In reply to Greg Kroah-HartmanFrom: Ingmar Klein <[email protected]>
commit e3f4bd3462f6f796594ecc0dda7144ed2d1e5a26 upstream.
When passing the Atheros QCA6174 through to a virtual machine, the VM hangs at the point where the ath10k driver loads.
Add a quirk to avoid bus resets on this device, which avoids the hang.
--- drivers/pci/quirks.c | 1 + 1 file changed, 1 insertion(+)
drivers/pci/quirks.c +1 -0
@@ -3612,6 +3612,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ADECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_ATHEROS ,0x003c , quirk_no_bus_reset);DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_ATHEROS ,0x0033 , quirk_no_bus_reset);DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_ATHEROS ,0x0034 , quirk_no_bus_reset); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_ATHEROS ,0x003e , quirk_no_bus_reset);/* * Root port on some Cavium CN8xxx chips do not successfully complete a bus
Greg Kroah-Hartman
maintainerPATCH 82/917 rtl8187: fix control-message timeouts
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 2e9be536a213e838daed6ba42024dd68954ac061 upstream.
USB control-message timeouts are specified in milliseconds and should specifically not vary with CONFIG_HZ.
--- drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.c +7 -7
@@ -28,7 +28,7 @@ u8 rtl818x_ioread8_idx(struct rtl8187_prusb_control_msg (priv->udev,usb_rcvctrlpipe (priv->udev,0 ),RTL8187_REQ_GET_REG ,RTL8187_REQT_READ , (unsigned long )addr, idx &0x03 , - &priv->io_dmabuf->bits8,sizeof (val),HZ /2 ); + &priv->io_dmabuf->bits8,sizeof (val),500 ); val = priv->io_dmabuf->bits8;mutex_unlock (&priv->io_mutex);
@@ -45,7 +45,7 @@ u16 rtl818x_ioread16_idx(struct rtl8187_usb_control_msg (priv->udev,usb_rcvctrlpipe (priv->udev,0 ),RTL8187_REQ_GET_REG ,RTL8187_REQT_READ , (unsigned long )addr, idx &0x03 , - &priv->io_dmabuf->bits16,sizeof (val),HZ /2 ); + &priv->io_dmabuf->bits16,sizeof (val),500 ); val = priv->io_dmabuf->bits16;mutex_unlock (&priv->io_mutex);
@@ -62,7 +62,7 @@ u32 rtl818x_ioread32_idx(struct rtl8187_usb_control_msg (priv->udev,usb_rcvctrlpipe (priv->udev,0 ),RTL8187_REQ_GET_REG ,RTL8187_REQT_READ , (unsigned long )addr, idx &0x03 , - &priv->io_dmabuf->bits32,sizeof (val),HZ /2 ); + &priv->io_dmabuf->bits32,sizeof (val),500 ); val = priv->io_dmabuf->bits32;mutex_unlock (&priv->io_mutex);
@@ -79,7 +79,7 @@ void rtl818x_iowrite8_idx(struct rtl8187usb_control_msg (priv->udev,usb_sndctrlpipe (priv->udev,0 ),RTL8187_REQ_SET_REG ,RTL8187_REQT_WRITE , (unsigned long )addr, idx &0x03 , - &priv->io_dmabuf->bits8,sizeof (val),HZ /2 ); + &priv->io_dmabuf->bits8,sizeof (val),500 );mutex_unlock (&priv->io_mutex); }
@@ -93,7 +93,7 @@ void rtl818x_iowrite16_idx(struct rtl818usb_control_msg (priv->udev,usb_sndctrlpipe (priv->udev,0 ),RTL8187_REQ_SET_REG ,RTL8187_REQT_WRITE , (unsigned long )addr, idx &0x03 , - &priv->io_dmabuf->bits16,sizeof (val),HZ /2 ); + &priv->io_dmabuf->bits16,sizeof (val),500 );mutex_unlock (&priv->io_mutex); }
@@ -107,7 +107,7 @@ void rtl818x_iowrite32_idx(struct rtl818usb_control_msg (priv->udev,usb_sndctrlpipe (priv->udev,0 ),RTL8187_REQ_SET_REG ,RTL8187_REQT_WRITE , (unsigned long )addr, idx &0x03 , - &priv->io_dmabuf->bits32,sizeof (val),HZ /2 ); + &priv->io_dmabuf->bits32,sizeof (val),500 );mutex_unlock (&priv->io_mutex); }
@@ -183,7 +183,7 @@ static void rtl8225_write_8051(struct ieusb_control_msg (priv->udev,usb_sndctrlpipe (priv->udev,0 ),RTL8187_REQ_SET_REG ,RTL8187_REQT_WRITE , addr,0x8225 , &priv->io_dmabuf->bits16,sizeof (data), -HZ /2 ); +500 );mutex_unlock (&priv->io_mutex);
Greg Kroah-Hartman
maintainerPATCH 83/917 evm: mark evm_fixmode as __ro_after_init
In reply to Greg Kroah-HartmanFrom: Austin Kim <[email protected]>
commit 32ba540f3c2a7ef61ed5a577ce25069a3d714fc9 upstream.
The evm_fixmode is only configurable by command-line option and it is never modified outside initcalls, so declaring it with __ro_after_init is better.
--- security/integrity/evm/evm_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/integrity/evm/evm_main.c +1 -1
@@ -78,7 +78,7 @@ static struct xattr_list evm_config_defaLIST_HEAD (evm_config_xattrnames); -static int evm_fixmode; +static int evm_fixmode__ro_after_init ;static int __init evm_set_fixmode (char *str) {if (strncmp (str,"fix" ,3 ) ==0 )
Greg Kroah-Hartman
maintainerPATCH 84/917 ifb: Depend on netfilter alternatively to tc
In reply to Greg Kroah-HartmanFrom: Lukas Wunner <[email protected]>
commit 046178e726c2977d686ba5e07105d5a6685c830e upstream.
IFB originally depended on NET_CLS_ACT for traffic redirection. But since v4.5, that may be achieved with NFT_FWD_NETDEV as well.
--- drivers/net/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/Kconfig +1 -1
@@ -150,7 +150,7 @@ config NET_FC config IFB tristate "Intermediate Functional Block support" - depends on NET_CLS_ACT + depends on NET_ACT_MIRRED || NFT_FWD_NETDEV select NET_REDIRECT help This is an intermediate driver that allows sharing of
Greg Kroah-Hartman
maintainerPATCH 85/917 platform/surface: aggregator_registry: Add support for Surface Laptop Studio
In reply to Greg Kroah-HartmanFrom: Maximilian Luz <[email protected]>
commit 4f042e40199ce8bac6bc2b853e81744ee4ea759c upstream.
Add support for the Surface Laptop Studio.
In contrast to previous Surface Laptop models, this one has its HID devices attached to target ID 1 (instead of 2). It also has a couple more of them, including a new notifier for when the pen is stashed / taken out of its place, a "Sys Control" device, and two other unidentified HID devices with unknown usages.
Battery and performance profile interfaces remain the same.
--- drivers/platform/surface/surface_aggregator_registry.c | 54 +++++++++++++++++ 1 file changed, 54 insertions(+)
drivers/platform/surface/surface_aggregator_registry.c +54 -0
@@ -77,6 +77,42 @@ static const struct software_node ssam_n .parent = &ssam_node_root, }; +/* HID keyboard (TID1). */ +static const struct software_node ssam_node_hid_tid1_keyboard = { + .name ="ssam:01:15:01:01:00" , + .parent = &ssam_node_root, +}; + +/* HID pen stash (TID1; pen taken / stashed away evens). */ +static const struct software_node ssam_node_hid_tid1_penstash = { + .name ="ssam:01:15:01:02:00" , + .parent = &ssam_node_root, +}; + +/* HID touchpad (TID1). */ +static const struct software_node ssam_node_hid_tid1_touchpad = { + .name ="ssam:01:15:01:03:00" , + .parent = &ssam_node_root, +}; + +/* HID device instance 6 (TID1, unknown HID device). */ +static const struct software_node ssam_node_hid_tid1_iid6 = { + .name ="ssam:01:15:01:06:00" , + .parent = &ssam_node_root, +}; + +/* HID device instance 7 (TID1, unknown HID device). */ +static const struct software_node ssam_node_hid_tid1_iid7 = { + .name ="ssam:01:15:01:07:00" , + .parent = &ssam_node_root, +}; + +/* HID system controls (TID1). */ +static const struct software_node ssam_node_hid_tid1_sysctrl = { + .name ="ssam:01:15:01:08:00" , + .parent = &ssam_node_root, +}; +/* HID keyboard. */ static const struct software_node ssam_node_hid_main_keyboard = { .name ="ssam:01:15:02:01:00" ,
@@ -159,6 +195,21 @@ static const struct software_node *ssam_ NULL, }; +/* Devices for Surface Laptop Studio. */ +static const struct software_node *ssam_node_group_sls[] = { + &ssam_node_root, + &ssam_node_bat_ac, + &ssam_node_bat_main, + &ssam_node_tmp_pprof, + &ssam_node_hid_tid1_keyboard, + &ssam_node_hid_tid1_penstash, + &ssam_node_hid_tid1_touchpad, + &ssam_node_hid_tid1_iid6, + &ssam_node_hid_tid1_iid7, + &ssam_node_hid_tid1_sysctrl, +NULL , +}; +/* Devices for Surface Laptop Go. */ static const struct software_node *ssam_node_group_slg1[] = { &ssam_node_root,
@@ -507,6 +558,9 @@ static const struct acpi_device_id ssam_/* Surface Laptop Go 1 */ { "MSHW0118", (unsigned long)ssam_node_group_slg1 }, +/* Surface Laptop Studio */ + { "MSHW0123", (unsigned long)ssam_node_group_sls }, + { }, };MODULE_DEVICE_TABLE (acpi, ssam_platform_hub_match);
Greg Kroah-Hartman
maintainerPATCH 86/917 mt76: mt7615: fix skb use-after-free on mac reset
In reply to Greg Kroah-HartmanFrom: Felix Fietkau <[email protected]>
commit b5cd1fd6043bbb7c5810067b5f93f3016bfd8a6f upstream.
When clearing all existing pending tx slots, mt76_tx_complete_skb needs to be used to free the skbs, to ensure that they are cleared from the status list as well.
--- drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 45 ++++++++++++------------ 1 file changed, 23 insertions(+), 22 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +23 -22
@@ -1494,32 +1494,41 @@ out: }static void -mt7615_mac_tx_free_token (struct mt7615_dev *dev,u16 token) +mt7615_txwi_free (struct mt7615_dev *dev,struct mt76_txwi_cache *txwi) {struct mt76_dev *mdev = &dev->mt76; -struct mt76_txwi_cache *txwi;__le32 *txwi_data;u32 val;u8 wcid; -trace_mac_tx_free (dev, token); - txwi =mt76_token_put (mdev, token); -if (!txwi) -return ; +mt7615_txp_skb_unmap (mdev, txwi); +if (!txwi->skb) + goto out; txwi_data = (__le32 *)mt76_get_txwi_ptr (mdev, txwi); val =le32_to_cpu (txwi_data[1 ]); wcid =FIELD_GET (MT_TXD1_WLAN_IDX , val); +mt76_tx_complete_skb (mdev, wcid, txwi->skb); -mt7615_txp_skb_unmap (mdev, txwi); -if (txwi->skb) { -mt76_tx_complete_skb (mdev, wcid, txwi->skb); - txwi->skb =NULL ; - } - +out: + txwi->skb =NULL ;mt76_put_txwi (mdev, txwi); } +static void +mt7615_mac_tx_free_token (struct mt7615_dev *dev,u16 token) +{ +struct mt76_dev *mdev = &dev->mt76; +struct mt76_txwi_cache *txwi; + +trace_mac_tx_free (dev, token); + txwi =mt76_token_put (mdev, token); +if (!txwi) +return ; + +mt7615_txwi_free (dev, txwi); +} +static void mt7615_mac_tx_free (struct mt7615_dev *dev,struct sk_buff *skb) {struct mt7615_tx_free *free = (struct mt7615_tx_free *)skb->data;
@@ -2026,16 +2035,8 @@ void mt7615_tx_token_put(struct mt7615_dint id;spin_lock_bh (&dev->mt76.token_lock); -idr_for_each_entry (&dev->mt76.token, txwi, id) { -mt7615_txp_skb_unmap (&dev->mt76, txwi); -if (txwi->skb) { -struct ieee80211_hw *hw; - - hw =mt76_tx_status_get_hw (&dev->mt76, txwi->skb); -ieee80211_free_txskb (hw, txwi->skb); - } -mt76_put_txwi (&dev->mt76, txwi); - } +idr_for_each_entry (&dev->mt76.token, txwi, id) +mt7615_txwi_free (dev, txwi);spin_unlock_bh (&dev->mt76.token_lock);idr_destroy (&dev->mt76.token); }
Greg Kroah-Hartman
maintainerPATCH 87/917 HID: surface-hid: Use correct event registry for managing HID events
In reply to Greg Kroah-HartmanFrom: Maximilian Luz <[email protected]>
commit dc0fd0acb6e0e8025a0a43ada54513b216254fac upstream.
Until now, we have only ever seen the REG-category registry being used on devices addressed with target ID 2. In fact, we have only ever seen Surface Aggregator Module (SAM) HID devices with target ID 2. For those devices, the registry also has to be addressed with target ID 2.
Some devices, like the new Surface Laptop Studio, however, address their HID devices on target ID 1. As a result of this, any target ID 2 commands time out. This includes event management commands addressed to the target ID 2 REG-category registry. For these devices, the registry has to be addressed via target ID 1 instead.
We therefore assume that the target ID of the registry to be used depends on the target ID of the respective device. Implement this accordingly.
Note that we currently allow the surface HID driver to only load against devices with target ID 2, so these timeouts are not happening (yet). This is just a preparation step before we allow the driver to load against all target IDs.
--- drivers/hid/surface-hid/surface_hid.c | 2 +- include/linux/surface_aggregator/controller.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/hid/surface-hid/surface_hid.c +1 -1
@@ -209,7 +209,7 @@ static int surface_hid_probe(struct ssam shid->notif.base.priority =1 ; shid->notif.base.fn = ssam_hid_event_fn; - shid->notif.event.reg =SSAM_EVENT_REGISTRY_REG ; + shid->notif.event.reg =SSAM_EVENT_REGISTRY_REG (sdev->uid.target); shid->notif.event.id.target_category = sdev->uid.category; shid->notif.event.id.instance = sdev->uid.instance; shid->notif.event.mask =SSAM_EVENT_MASK_STRICT ;
include/linux/surface_aggregator/controller.h +2 -2
@@ -792,8 +792,8 @@ enum ssam_event_mask {#define SSAM_EVENT_REGISTRY_KIP \ SSAM_EVENT_REGISTRY(SSAM_SSH_TC_KIP, 0x02, 0x27, 0x28) -#define SSAM_EVENT_REGISTRY_REG \ - SSAM_EVENT_REGISTRY(SSAM_SSH_TC_REG, 0x02, 0x01, 0x02) +#define SSAM_EVENT_REGISTRY_REG (tid)\ + SSAM_EVENT_REGISTRY(SSAM_SSH_TC_REG, tid, 0x01, 0x02)/** * enum ssam_event_notifier_flags - Flags for event notifiers.
Greg Kroah-Hartman
maintainerPATCH 88/917 HID: surface-hid: Allow driver matching for target ID 1 devices
In reply to Greg Kroah-HartmanFrom: Maximilian Luz <[email protected]>
commit ab5fe33925c6b03f646a1153771dab047548e4d8 upstream.
Until now we have only ever seen HID devices with target ID 2. The new Surface Laptop Studio however uses HID devices with target ID 1. Allow matching this driver to those as well.
--- drivers/hid/surface-hid/surface_hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hid/surface-hid/surface_hid.c +1 -1
@@ -230,7 +230,7 @@ static void surface_hid_remove(struct ss }static const struct ssam_device_id surface_hid_match[] = { - {SSAM_SDEV (HID ,0x02 ,SSAM_ANY_IID ,0x00 ) }, + {SSAM_SDEV (HID ,SSAM_ANY_TID ,SSAM_ANY_IID ,0x00 ) }, { }, };MODULE_DEVICE_TABLE (ssam, surface_hid_match);
Greg Kroah-Hartman
maintainerPATCH 89/917 wcn36xx: Fix HT40 capability for 2Ghz band
In reply to Greg Kroah-HartmanFrom: Loic Poulain <[email protected]>
commit 960ae77f25631bbe4e3aafefe209b52e044baf31 upstream.
All wcn36xx controllers are supposed to support HT40 (and SGI40), This doubles the maximum bitrate/throughput with compatible APs.
Tested with wcn3620 & wcn3680B.
--- drivers/net/wireless/ath/wcn36xx/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/wcn36xx/main.c +3 -1
@@ -135,7 +135,9 @@ static struct ieee80211_supported_band w .cap = IEEE80211_HT_CAP_GRN_FLD |IEEE80211_HT_CAP_SGI_20 |IEEE80211_HT_CAP_DSSSCCK40 | - IEEE80211_HT_CAP_LSIG_TXOP_PROT, +IEEE80211_HT_CAP_LSIG_TXOP_PROT | +IEEE80211_HT_CAP_SGI_40 | + IEEE80211_HT_CAP_SUP_WIDTH_20_40, .ht_supported = true, .ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K, .ampdu_density = IEEE80211_HT_MPDU_DENSITY_16,
Greg Kroah-Hartman
maintainerPATCH 90/917 wcn36xx: Fix tx_status mechanism
In reply to Greg Kroah-HartmanFrom: Loic Poulain <[email protected]>
commit a9e79b116cc4d0057e912be8f40b2c2e5bdc7c43 upstream.
This change fix the TX ack mechanism in various ways:
- For NO_ACK tagged packets, we don't need to wait for TX_ACK indication and so are not subject to the single packet ack limitation. So we don't have to stop the tx queue, and can call the tx status callback as soon as DMA transfer has completed.
- Fix skb ownership/reference. Only start status indication timeout once the DMA transfer has been completed. This avoids the skb to be both referenced in the DMA tx ring and by the tx_ack_skb pointer, preventing any use-after-free or double-free.
- This adds a sanity (paranoia?) check on the skb tx ack pointer.
- Resume TX queue if TX status tagged packet TX fails.
--- drivers/net/wireless/ath/wcn36xx/dxe.c | 37 ++++++++++++-------------------- drivers/net/wireless/ath/wcn36xx/txrx.c | 31 +++++--------------------- 2 files changed, 21 insertions(+), 47 deletions(-)
drivers/net/wireless/ath/wcn36xx/dxe.c +15 -22
@@ -403,8 +403,21 @@ static void reap_tx_dxes(struct wcn36xxdma_unmap_single (wcn->dev, ctl->desc->src_addr_l, ctl->skb->len,DMA_TO_DEVICE ); info =IEEE80211_SKB_CB (ctl->skb); -if (!(info->flags &IEEE80211_TX_CTL_REQ_TX_STATUS )) { -/* Keep frame until TX status comes */ +if (info->flags &IEEE80211_TX_CTL_REQ_TX_STATUS ) { +if (info->flags &IEEE80211_TX_CTL_NO_ACK ) { + info->flags |=IEEE80211_TX_STAT_NOACK_TRANSMITTED ; +ieee80211_tx_status_irqsafe (wcn->hw, ctl->skb); + }else { +/* Wait for the TX ack indication or timeout... */ +spin_lock (&wcn->dxe_lock); +if (WARN_ON (wcn->tx_ack_skb)) +ieee80211_free_txskb (wcn->hw, wcn->tx_ack_skb); + wcn->tx_ack_skb = ctl->skb;/* Tracking ref */ +mod_timer (&wcn->tx_ack_timer, jiffies +HZ /10 ); +spin_unlock (&wcn->dxe_lock); + } +/* do not free, ownership transferred to mac80211 status cb */ + }else {ieee80211_free_txskb (wcn->hw, ctl->skb); }
@@ -426,7 +439,6 @@ static irqreturn_t wcn36xx_irq_tx_comple {struct wcn36xx *wcn = (struct wcn36xx *)dev;int int_src, int_reason; -bool transmitted = false;wcn36xx_dxe_read_register (wcn,WCN36XX_DXE_INT_SRC_RAW_REG , &int_src);
@@ -466,7 +478,6 @@ static irqreturn_t wcn36xx_irq_tx_compleif (int_reason & (WCN36XX_CH_STAT_INT_DONE_MASK |WCN36XX_CH_STAT_INT_ED_MASK )) {reap_tx_dxes (wcn, &wcn->dxe_tx_h_ch); - transmitted = true; } }
@@ -479,7 +490,6 @@ static irqreturn_t wcn36xx_irq_tx_compleWCN36XX_DXE_0_INT_CLR , WCN36XX_INT_MASK_CHAN_TX_L); -if (int_reason &WCN36XX_CH_STAT_INT_ERR_MASK ) { wcn36xx_dxe_write_register(wcn, WCN36XX_DXE_0_INT_ERR_CLR,
@@ -507,25 +517,8 @@ static irqreturn_t wcn36xx_irq_tx_compleif (int_reason & (WCN36XX_CH_STAT_INT_DONE_MASK |WCN36XX_CH_STAT_INT_ED_MASK )) {reap_tx_dxes (wcn, &wcn->dxe_tx_l_ch); - transmitted = true; - } - } - -spin_lock (&wcn->dxe_lock); -if (wcn->tx_ack_skb && transmitted) { -struct ieee80211_tx_info *info =IEEE80211_SKB_CB (wcn->tx_ack_skb); - -/* TX complete, no need to wait for 802.11 ack indication */ -if (info->flags &IEEE80211_TX_CTL_REQ_TX_STATUS && - info->flags &IEEE80211_TX_CTL_NO_ACK ) { - info->flags |=IEEE80211_TX_STAT_NOACK_TRANSMITTED ; -del_timer (&wcn->tx_ack_timer); -ieee80211_tx_status_irqsafe (wcn->hw, wcn->tx_ack_skb); - wcn->tx_ack_skb =NULL ; -ieee80211_wake_queues (wcn->hw); } } -spin_unlock (&wcn->dxe_lock);return IRQ_HANDLED ; }
drivers/net/wireless/ath/wcn36xx/txrx.c +6 -25
@@ -502,10 +502,11 @@ int wcn36xx_start_tx(struct wcn36xx *wcnstruct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;struct wcn36xx_vif *vif_priv =NULL ;struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb); -unsigned long flags;bool is_low =ieee80211_is_data (hdr->frame_control);bool bcast =is_broadcast_ether_addr (hdr->addr1) ||is_multicast_ether_addr (hdr->addr1); +bool ack_ind = (info->flags &IEEE80211_TX_CTL_REQ_TX_STATUS ) && + !(info->flags &IEEE80211_TX_CTL_NO_ACK );struct wcn36xx_tx_bd bd;int ret;
@@ -521,30 +522,16 @@ int wcn36xx_start_tx(struct wcn36xx *wcn bd.dpu_rf =WCN36XX_BMU_WQ_TX ; -if (info->flags &IEEE80211_TX_CTL_REQ_TX_STATUS ) { +if (unlikely (ack_ind)) {wcn36xx_dbg (WCN36XX_DBG_DXE ,"TX_ACK status requested\n" ); -spin_lock_irqsave (&wcn->dxe_lock, flags); -if (wcn->tx_ack_skb) { -spin_unlock_irqrestore (&wcn->dxe_lock, flags); -wcn36xx_warn ("tx_ack_skb already set\n" ); -return -EINVAL ; - } - - wcn->tx_ack_skb = skb; -spin_unlock_irqrestore (&wcn->dxe_lock, flags); -/* Only one at a time is supported by fw. Stop the TX queues * until the ack status gets back. */ ieee80211_stop_queues (wcn->hw); -/* TX watchdog if no TX irq or ack indication received */ -mod_timer (&wcn->tx_ack_timer, jiffies +HZ /10 ); -/* Request ack indication from the firmware */ -if (!(info->flags &IEEE80211_TX_CTL_NO_ACK )) - bd.tx_comp =1 ; + bd.tx_comp =1 ; }/* Data frames served first*/
@@ -558,14 +545,8 @@ int wcn36xx_start_tx(struct wcn36xx *wcn bd.tx_bd_sign =0xbdbdbdbd ; ret =wcn36xx_dxe_tx_frame (wcn, vif_priv, &bd, skb, is_low); -if (ret && (info->flags &IEEE80211_TX_CTL_REQ_TX_STATUS )) { -/* If the skb has not been transmitted, -* don't keep a reference to it. -*/ -spin_lock_irqsave (&wcn->dxe_lock, flags); - wcn->tx_ack_skb =NULL ; -spin_unlock_irqrestore (&wcn->dxe_lock, flags); - +if (unlikely (ret && ack_ind)) { +/* If the skb has not been transmitted, resume TX queue */ ieee80211_wake_queues (wcn->hw); }
Greg Kroah-Hartman
maintainerPATCH 91/917 wcn36xx: Fix (QoS) null data frame bitrate/modulation
In reply to Greg Kroah-HartmanFrom: Loic Poulain <[email protected]>
commit d3fd2c95c1c13ec217d43ebef3c61cfa00a6cd37 upstream.
We observe unexpected connection drops with some APs due to non-acked mac80211 generated null data frames (keep-alive). After debugging and capture, we noticed that null frames are submitted at standard data bitrate and that the given APs are in trouble with that.
After setting the null frame bitrate to control bitrate, all null frames are acked as expected and connection is maintained.
Not sure if it's a requirement of the specification, but it seems the right thing to do anyway, null frames are mostly used for control purpose (power-saving, keep-alive...), and submitting them with a slower/simpler bitrate/modulation is more robust.
--- drivers/net/wireless/ath/wcn36xx/txrx.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/ath/wcn36xx/txrx.c +1 -0
@@ -429,6 +429,7 @@ static void wcn36xx_set_tx_data(struct wif (ieee80211_is_any_nullfunc (hdr->frame_control)) {/* Don't use a regular queue for null packet (no ampdu) */ bd->queue_id =WCN36XX_TX_U_WQ_ID ; + bd->bd_rate =WCN36XX_BD_RATE_CTRL ; }if (bcast) {
Greg Kroah-Hartman
maintainerPATCH 92/917 PM: sleep: Do not let "syscore" devices runtime-suspend during system transitions
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
commit 928265e3601cde78c7e0a3e518a93b27defed3b1 upstream.
There is no reason to allow "syscore" devices to runtime-suspend during system-wide PM transitions, because they are subject to the same possible failure modes as any other devices in that respect.
Accordingly, change device_prepare() and device_complete() to call pm_runtime_get_noresume() and pm_runtime_put(), respectively, for "syscore" devices too.
--- drivers/base/power/main.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/base/power/main.c +5 -4
@@ -1051,7 +1051,7 @@ static void device_complete(struct devicconst char *info =NULL ;if (dev->power.syscore) -return ; + goto out;device_lock (dev);
@@ -1081,6 +1081,7 @@ static void device_complete(struct devicdevice_unlock (dev); +out:pm_runtime_put (dev); }
@@ -1794,9 +1795,6 @@ static int device_prepare(struct deviceint (*callback)(struct device *) =NULL ;int ret =0 ; -if (dev->power.syscore) -return 0 ; -/* * If a device's parent goes into runtime suspend at the wrong time, * it won't be possible to resume the device. To prevent this we
@@ -1805,6 +1803,9 @@ static int device_prepare(struct device*/ pm_runtime_get_noresume (dev); +if (dev->power.syscore) +return 0 ; +device_lock (dev); dev->power.wakeup_path = false;
Greg Kroah-Hartman
maintainerPATCH 93/917 mwifiex: Read a PCI register after writing the TX ring write pointer
In reply to Greg Kroah-HartmanFrom: Jonas Dreßler <[email protected]>
commit e5f4eb8223aa740237cd463246a7debcddf4eda1 upstream.
On the 88W8897 PCIe+USB card the firmware randomly crashes after setting the TX ring write pointer. The issue is present in the latest firmware version 15.68.19.p21 of the PCIe+USB card.
Those firmware crashes can be worked around by reading any PCI register of the card after setting that register, so read the PCI_VENDOR_ID register here. The reason this works is probably because we keep the bus from entering an ASPM state for a bit longer, because that's what causes the cards firmware to crash.
This fixes a bug where during RX/TX traffic and with ASPM L1 substates enabled (the specific substates where the issue happens appear to be platform dependent), the firmware crashes and eventually a command timeout appears in the logs.
--- drivers/net/wireless/marvell/mwifiex/pcie.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/wireless/marvell/mwifiex/pcie.c +8 -0
@@ -1490,6 +1490,14 @@ mwifiex_pcie_send_data(struct mwifiex_ad ret =-1 ; goto done_unmap; } + +/* The firmware (latest version 15.68.19.p21) of the 88W8897 PCIe+USB card +* seems to crash randomly after setting the TX ring write pointer when +* ASPM powersaving is enabled. A workaround seems to be keeping the bus +* busy by reading a random register afterwards. +*/ +mwifiex_read_reg (adapter,PCI_VENDOR_ID , &rx_val); +if ((mwifiex_pcie_txbd_not_full (card)) && tx_param->next_pkt_len) {/* have more packets and TxBD still can hold more */
Greg Kroah-Hartman
maintainerPATCH 94/917 mwifiex: Try waking the firmware until we get an interrupt
In reply to Greg Kroah-HartmanFrom: Jonas Dreßler <[email protected]>
commit 8e3e59c31fea5de95ffc52c46f0c562c39f20c59 upstream.
It seems that the PCIe+USB firmware (latest version 15.68.19.p21) of the 88W8897 card sometimes ignores or misses when we try to wake it up by writing to the firmware status register. This leads to the firmware wakeup timeout expiring and the driver resetting the card because we assume the firmware has hung up or crashed.
Turns out that the firmware actually didn't hang up, but simply "missed" our wakeup request and didn't send us an interrupt with an AWAKE event.
Trying again to read the firmware status register after a short timeout usually makes the firmware wake up as expected, so add a small retry loop to mwifiex_pm_wakeup_card() that looks at the interrupt status to check whether the card woke up.
The number of tries and timeout lengths for this were determined
experimentally: The firmware usually takes about 500 us to wake up after we attempt to read the status register. In some cases where the firmware is very busy (for example while doing a bluetooth scan) it might even miss our requests for multiple milliseconds, which is why after 15 tries the waiting time gets increased to 10 ms. The maximum number of tries it took to wake the firmware when testing this was around 20, so a maximum number of 50 tries should give us plenty of safety margin.
Here's a reproducer for those firmware wakeup failures I've found:
1) Make sure wifi powersaving is enabled (iw dev wlp1s0 set power_save on)
2) Connect to any wifi network (makes firmware go into wifi powersaving mode, not deep sleep)
3) Make sure bluetooth is turned off (to ensure the firmware actually enters powersave mode and doesn't keep the radio active doing bluetooth stuff)
4) To confirm that wifi powersaving is entered ping a device on the LAN, pings should be a few ms higher than without powersaving
5) Run "while true; do iwconfig; sleep 0.0001; done", this wakes and suspends the firmware extremely often
6) Wait until things explode, for me it consistently takes <5 minutes
--- drivers/net/wireless/marvell/mwifiex/pcie.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-)
drivers/net/wireless/marvell/mwifiex/pcie.c +23 -5
@@ -17,6 +17,7 @@* this warranty disclaimer. */ +#include <linux/iopoll.h> #include <linux/firmware.h> #include "decl.h"
@@ -647,11 +648,15 @@ static void mwifiex_delay_for_sleep_cook "max count reached while accessing sleep cookie\n"); } +#define N_WAKEUP_TRIES_SHORT_INTERVAL 15 +#define N_WAKEUP_TRIES_LONG_INTERVAL 35 +/* This function wakes up the card by reading fw_status register. */ static int mwifiex_pm_wakeup_card (struct mwifiex_adapter *adapter) {struct pcie_service_card *card = adapter->card;const struct mwifiex_pcie_card_reg *reg = card->pcie.reg; +int retval;mwifiex_dbg (adapter,EVENT ,"event: Wakeup device...\n" );
@@ -659,11 +664,24 @@ static int mwifiex_pm_wakeup_card(structif (reg->sleep_cookie)mwifiex_pcie_dev_wakeup_delay (adapter); -/* Accessing fw_status register will wakeup device */ -if (mwifiex_write_reg (adapter, reg->fw_status,FIRMWARE_READY_PCIE )) { -mwifiex_dbg (adapter,ERROR , -"Writing fw_status register failed\n" ); -return -1 ; +/* The 88W8897 PCIe+USB firmware (latest version 15.68.19.p21) sometimes +* appears to ignore or miss our wakeup request, so we continue trying +* until we receive an interrupt from the card. +*/ +if (read_poll_timeout (mwifiex_write_reg, retval, +READ_ONCE (adapter->int_status) !=0 , +500 ,500 *N_WAKEUP_TRIES_SHORT_INTERVAL , + false, + adapter, reg->fw_status,FIRMWARE_READY_PCIE )) { +if (read_poll_timeout (mwifiex_write_reg, retval, +READ_ONCE (adapter->int_status) !=0 , +10000 ,10000 *N_WAKEUP_TRIES_LONG_INTERVAL , + false, + adapter, reg->fw_status,FIRMWARE_READY_PCIE )) { +mwifiex_dbg (adapter,ERROR , +"Firmware didn't wake up\n" ); +return -EIO ; + } }if (reg->sleep_cookie) {
Greg Kroah-Hartman
maintainerPATCH 95/917 libata: fix checking of DMA state
In reply to Greg Kroah-HartmanFrom: Reimar Döffinger <[email protected]>
commit f971a85439bd25dc7b4d597cf5e4e8dc7ffc884b upstream.
Checking if DMA is enabled should be done via the ata_dma_enabled helper function, since the init state 0xff indicates disabled.
This meant that ATA_CMD_READ_LOG_DMA_EXT was used and probed for before DMA was enabled, which caused hangs for some combinations of controllers and devices.
It might also have caused it to be incorrectly disabled as broken, but there have been no reports of that.
--- drivers/ata/libata-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ata/libata-core.c +1 -1
@@ -2007,7 +2007,7 @@ unsigned int ata_read_log_page(struct at retry:ata_tf_init (dev, &tf); -if (dev->dma_mode &&ata_id_has_read_log_dma_ext (dev->id) && +if (ata_dma_enabled (dev) &&ata_id_has_read_log_dma_ext (dev->id) && !(dev->horkage &ATA_HORKAGE_NO_DMA_LOG )) { tf.command =ATA_CMD_READ_LOG_DMA_EXT ; tf.protocol =ATA_PROT_DMA ;
Greg Kroah-Hartman
maintainerPATCH 96/917 dma-buf: fix and rework dma_buf_poll v7
In reply to Greg Kroah-HartmanFrom: Christian König <[email protected]>
commit 6b51b02a3a0ac49dfe302818d0746a799545e4e9 upstream.
Daniel pointed me towards this function and there are multiple obvious problems in the implementation.
First of all the retry loop is not working as intended. In general the retry makes only sense if you grab the reference first and then check the sequence values.
Then we should always also wait for the exclusive fence.
It's also good practice to keep the reference around when installing callbacks to fences you don't own.
And last the whole implementation was unnecessary complex and rather hard to understand which could lead to probably unexpected behavior of the IOCTL.
Fix all this by reworking the implementation from scratch. Dropping the whole RCU approach and taking the lock instead.
Only mildly tested and needs a thoughtful review of the code.
Pushing through drm-misc-next to avoid merge conflicts and give the code another round of testing.
v2: fix the reference counting as well
v3: keep the excl fence handling as is for stable
v4: back to testing all fences, drop RCU
v5: handle in and out separately
v6: add missing clear of events
v7: change coding style as suggested by Michel, drop unused variables
--- drivers/dma-buf/dma-buf.c | 152 +++++++++++++++++++++------------------------- include/linux/dma-buf.h | 2 2 files changed, 71 insertions(+), 83 deletions(-)
drivers/dma-buf/dma-buf.c +70 -82
@@ -74,7 +74,7 @@ static void dma_buf_release(struct dentr* If you hit this BUG() it means someone dropped their ref to the * dma-buf while still having pending operation to the buffer. */ -BUG_ON (dmabuf->cb_shared.active || dmabuf->cb_excl.active); +BUG_ON (dmabuf->cb_in.active || dmabuf->cb_out.active);dma_buf_stats_teardown (dmabuf); dmabuf->ops->release (dmabuf);
@@ -205,16 +205,55 @@ static void dma_buf_poll_cb(struct dma_fwake_up_locked_poll (dcb->poll, dcb->active); dcb->active =0 ;spin_unlock_irqrestore (&dcb->poll->lock, flags); +dma_fence_put (fence); +} + +static bool dma_buf_poll_shared (struct dma_resv *resv, +struct dma_buf_poll_cb_t *dcb) +{ +struct dma_resv_list *fobj =dma_resv_shared_list (resv); +struct dma_fence *fence; +int i, r; + +if (!fobj) +return false; + +for (i =0 ; i < fobj->shared_count; ++i) { + fence =rcu_dereference_protected (fobj->shared[i], +dma_resv_held (resv)); +dma_fence_get (fence); + r =dma_fence_add_callback (fence, &dcb->cb, dma_buf_poll_cb); +if (!r) +return true; +dma_fence_put (fence); + } + +return false; +} + +static bool dma_buf_poll_excl (struct dma_resv *resv, +struct dma_buf_poll_cb_t *dcb) +{ +struct dma_fence *fence =dma_resv_excl_fence (resv); +int r; + +if (!fence) +return false; + +dma_fence_get (fence); + r =dma_fence_add_callback (fence, &dcb->cb, dma_buf_poll_cb); +if (!r) +return true; +dma_fence_put (fence); + +return false; }static __poll_t dma_buf_poll (struct file *file,poll_table *poll) {struct dma_buf *dmabuf;struct dma_resv *resv; -struct dma_resv_list *fobj; -struct dma_fence *fence_excl;__poll_t events; -unsigned shared_count, seq; dmabuf = file->private_data;if (!dmabuf || !dmabuf->resv)
@@ -228,101 +267,50 @@ static __poll_t dma_buf_poll(struct fileif (!events)return 0 ; -retry: - seq =read_seqcount_begin (&resv->seq); -rcu_read_lock (); - - fobj =rcu_dereference (resv->fence); -if (fobj) - shared_count = fobj->shared_count; -else - shared_count =0 ; - fence_excl =dma_resv_excl_fence (resv); -if (read_seqcount_retry (&resv->seq, seq)) { -rcu_read_unlock (); - goto retry; - } - -if (fence_excl && (!(events &EPOLLOUT ) || shared_count ==0 )) { -struct dma_buf_poll_cb_t *dcb = &dmabuf->cb_excl; -__poll_t pevents =EPOLLIN ; +dma_resv_lock (resv,NULL ); -if (shared_count ==0 ) - pevents |=EPOLLOUT ; +if (events &EPOLLOUT ) { +struct dma_buf_poll_cb_t *dcb = &dmabuf->cb_out; +/* Check that callback isn't busy */ spin_lock_irq (&dmabuf->poll.lock); -if (dcb->active) { - dcb->active |= pevents; - events &= ~pevents; - }else - dcb->active = pevents; +if (dcb->active) + events &= ~EPOLLOUT ; +else + dcb->active =EPOLLOUT ;spin_unlock_irq (&dmabuf->poll.lock); -if (events & pevents) { -if (!dma_fence_get_rcu (fence_excl)) { -/* force a recheck */ - events &= ~pevents; +if (events &EPOLLOUT ) { +if (!dma_buf_poll_shared (resv, dcb) && + !dma_buf_poll_excl (resv, dcb)) +/* No callback queued, wake up any other waiters */ dma_buf_poll_cb (NULL , &dcb->cb); - }else if (!dma_fence_add_callback (fence_excl, &dcb->cb, - dma_buf_poll_cb)) { - events &= ~pevents; -dma_fence_put (fence_excl); - }else { -/* -* No callback queued, wake up any additional -* waiters. -*/ -dma_fence_put (fence_excl); -dma_buf_poll_cb (NULL , &dcb->cb); - } +else + events &= ~EPOLLOUT ; } } -if ((events &EPOLLOUT ) && shared_count >0 ) { -struct dma_buf_poll_cb_t *dcb = &dmabuf->cb_shared; -int i; +if (events &EPOLLIN ) { +struct dma_buf_poll_cb_t *dcb = &dmabuf->cb_in; -/* Only queue a new callback if no event has fired yet */ +/* Check that callback isn't busy */ spin_lock_irq (&dmabuf->poll.lock);if (dcb->active) - events &= ~EPOLLOUT ; + events &= ~EPOLLIN ;else - dcb->active =EPOLLOUT ; + dcb->active =EPOLLIN ;spin_unlock_irq (&dmabuf->poll.lock); -if (!(events &EPOLLOUT )) - goto out; - -for (i =0 ; i < shared_count; ++i) { -struct dma_fence *fence =rcu_dereference (fobj->shared[i]); - -if (!dma_fence_get_rcu (fence)) { -/* -* fence refcount dropped to zero, this means -* that fobj has been freed -* -* call dma_buf_poll_cb and force a recheck! -*/ - events &= ~EPOLLOUT ; +if (events &EPOLLIN ) { +if (!dma_buf_poll_excl (resv, dcb)) +/* No callback queued, wake up any other waiters */ dma_buf_poll_cb (NULL , &dcb->cb); -break ; - } -if (!dma_fence_add_callback (fence, &dcb->cb, - dma_buf_poll_cb)) { -dma_fence_put (fence); - events &= ~EPOLLOUT ; -break ; - } -dma_fence_put (fence); +else + events &= ~EPOLLIN ; } - -/* No callback queued, wake up any additional waiters. */ -if (i == shared_count) -dma_buf_poll_cb (NULL , &dcb->cb); } -out: -rcu_read_unlock (); +dma_resv_unlock (resv);return events; }
@@ -565,8 +553,8 @@ struct dma_buf *dma_buf_export(const str dmabuf->owner = exp_info->owner;spin_lock_init (&dmabuf->name_lock);init_waitqueue_head (&dmabuf->poll); - dmabuf->cb_excl.poll = dmabuf->cb_shared.poll = &dmabuf->poll; - dmabuf->cb_excl.active = dmabuf->cb_shared.active =0 ; + dmabuf->cb_in.poll = dmabuf->cb_out.poll = &dmabuf->poll; + dmabuf->cb_in.active = dmabuf->cb_out.active =0 ;if (!resv) { resv = (struct dma_resv *)&dmabuf[1 ];
include/linux/dma-buf.h +1 -1
@@ -433,7 +433,7 @@ struct dma_buf {wait_queue_head_t *poll;__poll_t active; - } cb_excl, cb_shared; + } cb_in, cb_out;#ifdef CONFIG_DMABUF_SYSFS_STATS /** * @sysfs_entry:
Greg Kroah-Hartman
maintainerPATCH 97/917 wcn36xx: handle connection loss indication
In reply to Greg Kroah-HartmanFrom: Benjamin Li <[email protected]>
commit d6dbce453b19c64b96f3e927b10230f9a704b504 upstream.
Firmware sends delete_sta_context_ind when it detects the AP has gone away in STA mode. Right now the handler for that indication only handles AP mode; fix it to also handle STA mode.
--- drivers/net/wireless/ath/wcn36xx/smd.c | 44 ++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 11 deletions(-)
drivers/net/wireless/ath/wcn36xx/smd.c +33 -11
@@ -2623,30 +2623,52 @@ static int wcn36xx_smd_delete_sta_contex size_t len) {struct wcn36xx_hal_delete_sta_context_ind_msg *rsp = buf; -struct wcn36xx_vif *tmp; +struct wcn36xx_vif *vif_priv; +struct ieee80211_vif *vif; +struct ieee80211_bss_conf *bss_conf;struct ieee80211_sta *sta; +bool found = false;if (len !=sizeof (*rsp)) {wcn36xx_warn ("Corrupted delete sta indication\n" );return -EIO ; } -wcn36xx_dbg (WCN36XX_DBG_HAL ,"delete station indication %pM index %d\n" , - rsp->addr2, rsp->sta_id); +wcn36xx_dbg (WCN36XX_DBG_HAL , +"delete station indication %pM index %d reason %d\n" , + rsp->addr2, rsp->sta_id, rsp->reason_code); -list_for_each_entry (tmp, &wcn->vif_list, list) { +list_for_each_entry (vif_priv, &wcn->vif_list, list) {rcu_read_lock (); - sta =ieee80211_find_sta (wcn36xx_priv_to_vif (tmp), rsp->addr2); -if (sta) -ieee80211_report_low_ack (sta,0 ); + vif =wcn36xx_priv_to_vif (vif_priv); + +if (vif->type ==NL80211_IFTYPE_STATION ) { +/* We could call ieee80211_find_sta too, but checking +* bss_conf is clearer. +*/ + bss_conf = &vif->bss_conf; +if (vif_priv->sta_assoc && + !memcmp (bss_conf->bssid, rsp->addr2,ETH_ALEN )) { + found = true; +wcn36xx_dbg (WCN36XX_DBG_HAL , +"connection loss bss_index %d\n" , + vif_priv->bss_index); +ieee80211_connection_loss (vif); + } + }else { + sta =ieee80211_find_sta (vif, rsp->addr2); +if (sta) { + found = true; +ieee80211_report_low_ack (sta,0 ); + } + } +rcu_read_unlock (); -if (sta) +if (found)return 0 ; } -wcn36xx_warn ("STA with addr %pM and index %d not found\n" , - rsp->addr2, - rsp->sta_id); +wcn36xx_warn ("BSS or STA with addr %pM not found\n" , rsp->addr2);return -ENOENT ; }
Greg Kroah-Hartman
maintainerPATCH 98/917 rsi: fix occasional initialisation failure with BT coex
In reply to Greg Kroah-HartmanFrom: Martin Fuzzey <[email protected]>
commit 9b14ed6e11b72dd4806535449ca6c6962cb2369d upstream.
When BT coexistence is enabled (eg oper mode 13, which is the default) the initialisation on startup sometimes silently fails.
In a normal initialisation we see
usb 1-1.3: Product: Wireless USB Network Module usb 1-1.3: Manufacturer: Redpine Signals, Inc. usb 1-1.3: SerialNumber: 000000000001 rsi_91x: rsi_probe: Initialized os intf ops rsi_91x: rsi_load_9116_firmware: Loading chunk 0 rsi_91x: rsi_load_9116_firmware: Loading chunk 1 rsi_91x: rsi_load_9116_firmware: Loading chunk 2 rsi_91x: Max Stations Allowed = 1
But sometimes the last log is missing and the wlan net device is not created.
Running a userspace loop that resets the hardware via a GPIO shows the problem occurring ~5/100 resets.
The problem does not occur in oper mode 1 (wifi only).
Adding logs shows that the initialisation state machine requests a MAC reset via rsi_send_reset_mac() but the firmware does not reply, leading to the initialisation sequence being incomplete.
Fix this by delaying attaching the BT adapter until the wifi initialisation has completed.
With this applied I have done > 300 reset loops with no errors.
--- drivers/net/wireless/rsi/rsi_91x_main.c | 16 +++++++++++++--- drivers/net/wireless/rsi/rsi_91x_mgmt.c | 3 +++ drivers/net/wireless/rsi/rsi_main.h | 2 ++ 3 files changed, 18 insertions(+), 3 deletions(-)
drivers/net/wireless/rsi/rsi_91x_main.c +13 -3
@@ -211,9 +211,10 @@ int rsi_read_pkt(struct rsi_common *comm bt_pkt_type = frame_desc[offset +BT_RX_PKT_TYPE_OFST ];if (bt_pkt_type ==BT_CARD_READY_IND ) {rsi_dbg (INFO_ZONE ,"BT Card ready recvd\n" ); -if (rsi_bt_ops.attach (common, &g_proto_ops)) -rsi_dbg (ERR_ZONE , -"Failed to attach BT module\n" ); +if (common->fsm_state ==FSM_MAC_INIT_DONE ) +rsi_attach_bt (common); +else + common->bt_defer_attach = true; }else {if (common->bt_adapter) rsi_bt_ops.recv_pkt(common->bt_adapter,
@@ -278,6 +279,15 @@ void rsi_set_bt_context(void *priv, void }#endif +void rsi_attach_bt (struct rsi_common *common) +{ +#ifdef CONFIG_RSI_COEX +if (rsi_bt_ops.attach (common, &g_proto_ops)) +rsi_dbg (ERR_ZONE , +"Failed to attach BT module\n" ); +#endif +} +/** * rsi_91x_init() - This function initializes os interface operations. * @oper_mode: One of DEV_OPMODE_*.
drivers/net/wireless/rsi/rsi_91x_mgmt.c +3 -0
@@ -2071,6 +2071,9 @@ static int rsi_handle_ta_confirm_type(stif (common->reinit_hw) {complete (&common->wlan_init_completion); }else { +if (common->bt_defer_attach) +rsi_attach_bt (common); +return rsi_mac80211_attach (common); } }
drivers/net/wireless/rsi/rsi_main.h +2 -0
@@ -320,6 +320,7 @@ struct rsi_common {struct ieee80211_vif *roc_vif;bool eapol4_confirm; +bool bt_defer_attach;void *bt_adapter;struct cfg80211_scan_request *hwscan;
@@ -401,5 +402,6 @@ struct rsi_host_intf_ops {enum rsi_host_intf rsi_get_host_intf (void *priv);void rsi_set_bt_context (void *priv,void *bt_context); +void rsi_attach_bt (struct rsi_common *common);#endif
Greg Kroah-Hartman
maintainerPATCH 99/917 rsi: fix key enabled check causing unwanted encryption for vap_id > 0
In reply to Greg Kroah-HartmanFrom: Martin Fuzzey <[email protected]>
commit 99ac6018821253ec67f466086afb63fc18ea48e2 upstream.
My previous patch checked if encryption should be enabled by directly checking info->control.hw_key (like the downstream driver). However that missed that the control and driver_info members of struct ieee80211_tx_info are union fields.
Due to this when rsi_core_xmit() updates fields in "tx_params" (driver_info) it can overwrite the control.hw_key, causing the result of the later test to be incorrect.
With the current structure layout the first byte of control.hw_key is overlayed with the vap_id so, since we only test if control.hw_key is NULL / non NULL, a non zero vap_id will incorrectly enable encryption.
In basic STA and AP modes the vap_id is always zero so it works but in P2P client mode a second VIF is created causing vap_id to be non zero and hence encryption to be enabled before keys have been set.
Fix this by extracting the key presence flag to a new field in the driver private tx_params structure and populating it first.
--- drivers/net/wireless/rsi/rsi_91x_core.c | 2 ++ drivers/net/wireless/rsi/rsi_91x_hal.c | 2 +- drivers/net/wireless/rsi/rsi_main.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/rsi/rsi_91x_core.c +2 -0
@@ -399,6 +399,8 @@ void rsi_core_xmit(struct rsi_common *co info =IEEE80211_SKB_CB (skb); tx_params = (struct skb_info *)info->driver_data; +/* info->driver_data and info->control part of union so make copy */ + tx_params->have_key = !!info->control.hw_key; wh = (struct ieee80211_hdr *)&skb->data[0 ]; tx_params->sta_id =0 ;
drivers/net/wireless/rsi/rsi_91x_hal.c +1 -1
@@ -203,7 +203,7 @@ int rsi_prepare_data_desc(struct rsi_com wh->frame_control |=cpu_to_le16 (RSI_SET_PS_ENABLE );if ((!(info->flags &IEEE80211_TX_INTFL_DONT_ENCRYPT )) && - info->control.hw_key) { + tx_params->have_key) {if (rsi_is_cipher_wep (common)) ieee80211_size +=4 ;else
drivers/net/wireless/rsi/rsi_main.h +1 -0
@@ -139,6 +139,7 @@ struct skb_info {u8 internal_hdr_size;struct ieee80211_vif *vif;u8 vap_id; +bool have_key; };enum edca_queue {
Greg Kroah-Hartman
maintainerPATCH 100/917 rsi: fix rate mask set leading to P2P failure
In reply to Greg Kroah-HartmanFrom: Martin Fuzzey <[email protected]>
commit b515d097053a71d624e0c5840b42cd4caa653941 upstream.
P2P client mode was only working the first time.
On subsequent connection attempts the group was successfully created but no data was sent (no transmitted data packets were seen with a sniffer).
The reason for this was that the hardware was being configured in fixed rate mode with rate RSI_RATE_1 (1Mbps) which is not valid in the 5GHz band.
In P2P mode wpa_supplicant uses NL80211_CMD_SET_TX_BITRATE_MASK to disallow the 11b rates in the 2.4GHz band which updated common->fixedrate_mask.
rsi_set_min_rate() then used the fixedrate_mask to calculate the minimum allowed rate, or 0xffff = auto if none was found.
However that calculation did not account for the different rate sets allowed in the different bands leading to the error.
Fixing set_min_rate() would result in 6Mb/s being used all the time which is not what we want either.
The reason the problem did not occur on the first connection is that rsi_mac80211_set_rate_mask() only updated the fixedrate_mask for the *current* band. When it was called that was still 2.4GHz as the switch is done later. So the when set_min_rate() was subsequently called after the switch to 5GHz it still had a mask of zero, leading to defaulting to auto mode.
Fix this by differentiating the case of a single rate being requested, in which case the hardware will be used in fixed rate mode with just that rate, and multiple rates being requested, in which case we remain in auto mode but the firmware rate selection algorithm is configured with a restricted set of rates.
--- drivers/net/wireless/rsi/rsi_91x_hal.c | 8 +-- drivers/net/wireless/rsi/rsi_91x_mac80211.c | 74 ++++++++-------------------- drivers/net/wireless/rsi/rsi_91x_mgmt.c | 21 +++++-- drivers/net/wireless/rsi/rsi_main.h | 12 +++- 4 files changed, 50 insertions(+), 65 deletions(-)
drivers/net/wireless/rsi/rsi_91x_hal.c +5 -3
@@ -214,15 +214,17 @@ int rsi_prepare_data_desc(struct rsi_com RSI_WIFI_DATA_Q); data_desc->header_len = ieee80211_size; -if (common->min_rate !=RSI_RATE_AUTO ) { +if (common->rate_config[common->band].fixed_enabled) {/* Send fixed rate */ +u16 fixed_rate = common->rate_config[common->band].fixed_hw_rate; + data_desc->frame_info =cpu_to_le16 (RATE_INFO_ENABLE ); - data_desc->rate_info =cpu_to_le16 (common->min_rate); + data_desc->rate_info =cpu_to_le16 (fixed_rate);if (conf_is_ht40 (&common->priv->hw->conf)) data_desc->bbp_info =cpu_to_le16 (FULL40M_ENABLE ); -if ((common->vif_info[0 ].sgi) && (common->min_rate &0x100 )) { +if (common->vif_info[0 ].sgi && (fixed_rate &0x100 )) {/* Only MCS rates */ data_desc->rate_info |=cpu_to_le16 (ENABLE_SHORTGI_RATE );
drivers/net/wireless/rsi/rsi_91x_mac80211.c +22 -52
111 lines not on this page · raw message
drivers/net/wireless/rsi/rsi_91x_mgmt.c +14 -7
@@ -276,7 +276,7 @@ static void rsi_set_default_parameters(s common->channel_width =BW_20MHZ ; common->rts_threshold =IEEE80211_MAX_RTS_THRESHOLD ; common->channel =1 ; - common->min_rate =0xffff ; +memset (&common->rate_config,0 ,sizeof (common->rate_config)); common->fsm_state =FSM_CARD_NOT_READY ; common->iface_down = true; common->endpoint =EP_2GHZ_20MHZ ;
@@ -1314,7 +1314,7 @@ static int rsi_send_auto_rate_request(stu8 band = hw->conf.chandef.chan->band;u8 num_supported_rates =0 ;u8 rate_table_offset, rate_offset =0 ; -u32 rate_bitmap; +u32 rate_bitmap, configured_rates;u16 *selected_rates, min_rate;bool is_ht = false, is_sgi = false;u16 frame_len =sizeof (struct rsi_auto_rate );
@@ -1364,6 +1364,10 @@ static int rsi_send_auto_rate_request(st is_sgi = true; } +/* Limit to any rates administratively configured by cfg80211 */ + configured_rates = common->rate_config[band].configured_mask ?:0xffffffff ; + rate_bitmap &= configured_rates; +if (band ==NL80211_BAND_2GHZ ) {if ((rate_bitmap ==0 ) && (is_ht)) min_rate =RSI_RATE_MCS0 ;
@@ -1389,10 +1393,13 @@ static int rsi_send_auto_rate_request(st num_supported_rates = jj;if (is_ht) { -for (ii =0 ; ii <ARRAY_SIZE (mcs); ii++) - selected_rates[jj++] = mcs[ii]; - num_supported_rates +=ARRAY_SIZE (mcs); - rate_offset +=ARRAY_SIZE (mcs); +for (ii =0 ; ii <ARRAY_SIZE (mcs); ii++) { +if (configured_rates &BIT (ii +ARRAY_SIZE (rsi_rates))) { + selected_rates[jj++] = mcs[ii]; + num_supported_rates++; + rate_offset++; + } + } }sort (selected_rates, jj,sizeof (u16), &rsi_compare,NULL );
@@ -1482,7 +1489,7 @@ void rsi_inform_bss_status(struct rsi_co qos_enable, aid, sta_id, vif); -if (common->min_rate ==0xffff ) +if (!common->rate_config[common->band].fixed_enabled)rsi_send_auto_rate_request (common, sta, sta_id, vif); if (opmode == RSI_OPMODE_STA && !(assoc_cap & WLAN_CAPABILITY_PRIVACY) &&
drivers/net/wireless/rsi/rsi_main.h +9 -3
@@ -61,6 +61,7 @@ enum RSI_FSM_STATES {extern u32 rsi_zone_enabled; extern __printf(2, 3) void rsi_dbg(u32 zone, const char *fmt, ...); +#define RSI_MAX_BANDS 2#define RSI_MAX_VIFS 3#define NUM_EDCA_QUEUES 4#define IEEE80211_ADDR_LEN 6
@@ -230,6 +231,12 @@ struct rsi_9116_features {u32 ps_options; }; +struct rsi_rate_config { +u32 configured_mask;/* configured by mac80211 bits 0-11=legacy 12+ mcs */ +u16 fixed_hw_rate; +bool fixed_enabled; +}; +struct rsi_common {struct rsi_hw *priv;struct vif_priv vif_info[RSI_MAX_VIFS ];
@@ -255,8 +262,8 @@ struct rsi_common {u8 channel_width;u16 rts_threshold; -u16 bitrate_mask[2 ]; -u32 fixedrate_mask[2 ]; +u32 bitrate_mask[RSI_MAX_BANDS ]; +struct rsi_rate_config rate_config[RSI_MAX_BANDS ];u8 rf_reset;struct transmit_q_stats tx_stats;
@@ -277,7 +284,6 @@ struct rsi_common {u8 mac_id;u8 radio_id;u16 rate_pwr[20 ]; -u16 min_rate;/* WMM algo related */ u8 selected_qnum;
Greg Kroah-Hartman
maintainerPATCH 101/917 rsi: Fix module dev_oper_mode parameter description
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
commit 31f97cf9f0c31143a2a6fcc89c4a1286ce20157e upstream.
The module parameters are missing dev_oper_mode 12, BT classic alone, add it. Moreover, the parameters encode newlines, which ends up being printed malformed e.g. by modinfo, so fix that too.
However, the module parameter string is duplicated in both USB and SDIO modules and the dev_oper_mode mode enumeration in those module parameters is a duplicate of macros used by the driver. Furthermore, the enumeration is confusing.
So, deduplicate the module parameter string and use __stringify() to encode the correct mode enumeration values into the module parameter string. Finally, replace 'Wi-Fi' with 'Wi-Fi alone' and 'BT' with 'BT classic alone' to clarify what those modes really mean.
--- drivers/net/wireless/rsi/rsi_91x_sdio.c | 5 +---- drivers/net/wireless/rsi/rsi_91x_usb.c | 5 +---- drivers/net/wireless/rsi/rsi_hal.h | 11 +++++++++++ 3 files changed, 13 insertions(+), 8 deletions(-)
drivers/net/wireless/rsi/rsi_91x_sdio.c +1 -4
@@ -24,10 +24,7 @@/* Default operating mode is wlan STA + BT */ static u16 dev_oper_mode =DEV_OPMODE_STA_BT_DUAL ;module_param (dev_oper_mode, ushort,0444 ); -MODULE_PARM_DESC (dev_oper_mode, -"1[Wi-Fi], 4[BT], 8[BT LE], 5[Wi-Fi STA + BT classic]\n" -"9[Wi-Fi STA + BT LE], 13[Wi-Fi STA + BT classic + BT LE]\n" -"6[AP + BT classic], 14[AP + BT classic + BT LE]" ); +MODULE_PARM_DESC (dev_oper_mode,DEV_OPMODE_PARAM_DESC );/** * rsi_sdio_set_cmd52_arg() - This function prepares cmd 52 read/write arg.
drivers/net/wireless/rsi/rsi_91x_usb.c +1 -4
@@ -25,10 +25,7 @@/* Default operating mode is wlan STA + BT */ static u16 dev_oper_mode =DEV_OPMODE_STA_BT_DUAL ;module_param (dev_oper_mode, ushort,0444 ); -MODULE_PARM_DESC (dev_oper_mode, -"1[Wi-Fi], 4[BT], 8[BT LE], 5[Wi-Fi STA + BT classic]\n" -"9[Wi-Fi STA + BT LE], 13[Wi-Fi STA + BT classic + BT LE]\n" -"6[AP + BT classic], 14[AP + BT classic + BT LE]" ); +MODULE_PARM_DESC (dev_oper_mode,DEV_OPMODE_PARAM_DESC );static int rsi_rx_urb_submit (struct rsi_hw *adapter,u8 ep_num,gfp_t flags);
drivers/net/wireless/rsi/rsi_hal.h +11 -0
@@ -28,6 +28,17 @@#define DEV_OPMODE_AP_BT 6#define DEV_OPMODE_AP_BT_DUAL 14 +#define DEV_OPMODE_PARAM_DESC \ + __stringify(DEV_OPMODE_WIFI_ALONE) "[Wi-Fi alone], " \ + __stringify(DEV_OPMODE_BT_ALONE) "[BT classic alone], " \ + __stringify(DEV_OPMODE_BT_LE_ALONE) "[BT LE alone], " \ + __stringify(DEV_OPMODE_BT_DUAL) "[BT classic + BT LE alone], " \ + __stringify(DEV_OPMODE_STA_BT) "[Wi-Fi STA + BT classic], " \ + __stringify(DEV_OPMODE_STA_BT_LE) "[Wi-Fi STA + BT LE], " \ + __stringify(DEV_OPMODE_STA_BT_DUAL) "[Wi-Fi STA + BT classic + BT LE], " \ + __stringify(DEV_OPMODE_AP_BT) "[Wi-Fi AP + BT classic], " \ + __stringify(DEV_OPMODE_AP_BT_DUAL) "[Wi-Fi AP + BT classic + BT LE]" +#define FLASH_WRITE_CHUNK_SIZE (4 * 1024)#define FLASH_SECTOR_SIZE (4 * 1024)
Greg Kroah-Hartman
maintainerPATCH 102/917 perf/x86/intel/uncore: Support extra IMC channel on Ice Lake server
In reply to Greg Kroah-HartmanFrom: Kan Liang <[email protected]>
commit 496a18f09374ad89b3ab4366019bc3975db90234 upstream.
There are three channels on a Ice Lake server, but only two channels will ever be active. Current perf only enables two channels.
Support the extra IMC channel, which may be activated on some Ice Lake machines. For a non-activated channel, the SW can still access it. The write will be ignored by the HW. 0 is always returned for the reading.
--- arch/x86/events/intel/uncore_snbep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/events/intel/uncore_snbep.c +2 -2
@@ -452,7 +452,7 @@#define ICX_M3UPI_PCI_PMON_BOX_CTL 0xa0/* ICX IMC */ -#define ICX_NUMBER_IMC_CHN 2 +#define ICX_NUMBER_IMC_CHN 3#define ICX_IMC_MEM_STRIDE 0x4/* SPR */
@@ -5463,7 +5463,7 @@ static struct intel_uncore_ops icx_uncorstatic struct intel_uncore_type icx_uncore_imc = { .name ="imc" , .num_counters =4 , - .num_boxes =8 , + .num_boxes =12 , .perf_ctr_bits =48 , .fixed_ctr_bits =48 , .fixed_ctr =SNR_IMC_MMIO_PMON_FIXED_CTR ,
Greg Kroah-Hartman
maintainerPATCH 103/917 perf/x86/intel/uncore: Fix invalid unit check
In reply to Greg Kroah-HartmanFrom: Kan Liang <[email protected]>
commit e2bb9fab08cbcc7922050c7eb0bd650807abfa4e upstream.
The uncore unit with the type ID 0 and the unit ID 0 is missed.
The table3 of the uncore unit maybe 0. The uncore_discovery_invalid_unit() mistakenly treated it as an invalid value.
Remove the !unit.table3 check.
--- arch/x86/events/intel/uncore_discovery.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/uncore_discovery.h +1 -1
@@ -30,7 +30,7 @@#define uncore_discovery_invalid_unit (unit) \ - (!unit.table1 || !unit.ctl || !unit.table3 || \ + (!unit.table1 || !unit.ctl || \ unit.table1 == -1ULL || unit.ctl == -1ULL || \ unit.table3 == -1ULL)
Greg Kroah-Hartman
maintainerPATCH 104/917 perf/x86/intel/uncore: Fix Intel ICX IIO event constraints
In reply to Greg Kroah-HartmanFrom: Kan Liang <[email protected]>
commit f42e8a603c88f72bf047a710b9fc1d3579f31e71 upstream.
According to the latest uncore document, both NUM_OUTSTANDING_REQ_OF_CPU (0x88) event and COMP_BUF_OCCUPANCY(0xd5) event also have constraints. Add them into the event constraints table.
--- arch/x86/events/intel/uncore_snbep.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/events/intel/uncore_snbep.c +2 -0
@@ -5076,8 +5076,10 @@ static struct event_constraint icx_uncorUNCORE_EVENT_CONSTRAINT (0x02 ,0x3 ),UNCORE_EVENT_CONSTRAINT (0x03 ,0x3 ),UNCORE_EVENT_CONSTRAINT (0x83 ,0x3 ), +UNCORE_EVENT_CONSTRAINT (0x88 ,0xc ),UNCORE_EVENT_CONSTRAINT (0xc0 ,0xc ),UNCORE_EVENT_CONSTRAINT (0xc5 ,0xc ), +UNCORE_EVENT_CONSTRAINT (0xd5 ,0xc ), EVENT_CONSTRAINT_END };
Greg Kroah-Hartman
maintainerPATCH 105/917 RDMA/qedr: Fix NULL deref for query_qp on the GSI QP
In reply to Greg Kroah-HartmanFrom: Alok Prasad <[email protected]>
commit 4f960393a0ee9a39469ceb7c8077ae8db665cc12 upstream.
This patch fixes a crash caused by querying the QP via netlink, and corrects the state of GSI qp. GSI qp's have a NULL qed_qp.
The call trace is generated by:
$ rdma res show
BUG: kernel NULL pointer dereference, address: 0000000000000034 Hardware name: Dell Inc. PowerEdge R720/0M1GCR, BIOS 1.2.6 05/10/2012 RIP: 0010:qed_rdma_query_qp+0x33/0x1a0 [qed] RSP: 0018:ffffba560a08f580 EFLAGS: 00010206 RAX: 0000000200000000 RBX: ffffba560a08f5b8 RCX: 0000000000000000 RDX: ffffba560a08f5b8 RSI: 0000000000000000 RDI: ffff9807ee458090 RBP: ffffba560a08f5a0 R08: 0000000000000000 R09: ffff9807890e7048 R10: ffffba560a08f658 R11: 0000000000000000 R12: 0000000000000000 R13: ffff9807ee458090 R14: ffff9807f0afb000 R15: ffffba560a08f7ec FS: 00007fbbf8bfe740(0000) GS:ffff980aafa00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000034 CR3: 00000001720ba001 CR4: 00000000000606f0 Call Trace: qedr_query_qp+0x82/0x360 [qedr] ib_query_qp+0x34/0x40 [ib_core] ? ib_query_qp+0x34/0x40 [ib_core] fill_res_qp_entry_query.isra.26+0x47/0x1d0 [ib_core] ? __nla_put+0x20/0x30 ? nla_put+0x33/0x40 fill_res_qp_entry+0xe3/0x120 [ib_core] res_get_common_dumpit+0x3f8/0x5d0 [ib_core] ? fill_res_cm_id_entry+0x1f0/0x1f0 [ib_core] nldev_res_get_qp_dumpit+0x1a/0x20 [ib_core] netlink_dump+0x156/0x2f0 __netlink_dump_start+0x1ab/0x260 rdma_nl_rcv+0x1de/0x330 [ib_core] ? nldev_res_get_cm_id_dumpit+0x20/0x20 [ib_core] netlink_unicast+0x1b8/0x270 netlink_sendmsg+0x33e/0x470 sock_sendmsg+0x63/0x70 __sys_sendto+0x13f/0x180 ? setup_sgl.isra.12+0x70/0xc0 __x64_sys_sendto+0x28/0x30 do_syscall_64+0x3a/0xb0 entry_SYSCALL_64_after_hwframe+0x44/0xae
--- drivers/infiniband/hw/qedr/verbs.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/infiniband/hw/qedr/verbs.c +9 -6
@@ -2744,15 +2744,18 @@ int qedr_query_qp(struct ib_qp *ibqp,int rc =0 ;memset (¶ms,0 ,sizeof (params)); - - rc = dev->ops->rdma_query_qp (dev->rdma_ctx, qp->qed_qp, ¶ms); -if (rc) - goto err; -memset (qp_attr,0 ,sizeof (*qp_attr));memset (qp_init_attr,0 ,sizeof (*qp_init_attr)); - qp_attr->qp_state =qedr_get_ibqp_state (params.state); +if (qp->qp_type !=IB_QPT_GSI ) { + rc = dev->ops->rdma_query_qp (dev->rdma_ctx, qp->qed_qp, ¶ms); +if (rc) + goto err; + qp_attr->qp_state =qedr_get_ibqp_state (params.state); + }else { + qp_attr->qp_state =qedr_get_ibqp_state (QED_ROCE_QP_STATE_RTS ); + } + qp_attr->cur_qp_state =qedr_get_ibqp_state (params.state); qp_attr->path_mtu =ib_mtu_int_to_enum (params.mtu); qp_attr->path_mig_state =IB_MIG_MIGRATED ;
Greg Kroah-Hartman
maintainerPATCH 106/917 ASoC: tegra: Set default card name for Trimslice
In reply to Greg Kroah-HartmanFrom: Dmitry Osipenko <[email protected]>
commit 824edd866a13db7dbb0d8e26d2142f10271b6460 upstream.
The default card name for Trimslice device should be "tegra-trimslice". It got lost by accident during unification of machine sound drivers, fix it.
--- sound/soc/tegra/tegra_asoc_machine.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/tegra/tegra_asoc_machine.c +1 -0
@@ -686,6 +686,7 @@ static struct snd_soc_dai_link tegra_tlv };static struct snd_soc_card snd_soc_tegra_trimslice = { + .name ="tegra-trimslice" , .components ="codec:tlv320aic23" , .dai_link = &tegra_tlv320aic23_dai, .num_links =1 ,
Greg Kroah-Hartman
maintainerPATCH 107/917 ASoC: tegra: Restore AC97 support
In reply to Greg Kroah-HartmanFrom: Dmitry Osipenko <[email protected]>
commit de8fc2b0a3f9930f3cbe801d40758bb1d80b0ad8 upstream.
The device-tree of AC97 codecs need to be parsed differently from I2S codecs, plus codec device may need to be created. This was missed by the patch that unified machine drivers into a single driver, fix it. It should restore audio on Toradex Colibri board.
--- sound/soc/tegra/tegra_asoc_machine.c | 63 ++++++++++++++++++++++++++++------- sound/soc/tegra/tegra_asoc_machine.h | 1 2 files changed, 52 insertions(+), 12 deletions(-)
sound/soc/tegra/tegra_asoc_machine.c +51 -12
@@ -341,9 +341,34 @@ tegra_machine_parse_phandle(struct devicreturn np; } +static void tegra_machine_unregister_codec (void *pdev) +{ +platform_device_unregister (pdev); +} + +static int tegra_machine_register_codec (struct device *dev,const char *name) +{ +struct platform_device *pdev; +int err; + +if (!name) +return 0 ; + + pdev =platform_device_register_simple (name,-1 ,NULL ,0 ); +if (IS_ERR (pdev)) +return PTR_ERR (pdev); + + err =devm_add_action_or_reset (dev, tegra_machine_unregister_codec, + pdev); +if (err) +return err; + +return 0 ; +} +int tegra_asoc_machine_probe (struct platform_device *pdev) { -struct device_node *np_codec, *np_i2s; +struct device_node *np_codec, *np_i2s, *np_ac97;const struct tegra_asoc_data *asoc;struct device *dev = &pdev->dev;struct tegra_machine *machine;
@@ -404,17 +429,30 @@ int tegra_asoc_machine_probe(struct platreturn err; } - np_codec =tegra_machine_parse_phandle (dev,"nvidia,audio-codec" ); -if (IS_ERR (np_codec)) -return PTR_ERR (np_codec); - - np_i2s =tegra_machine_parse_phandle (dev,"nvidia,i2s-controller" ); -if (IS_ERR (np_i2s)) -return PTR_ERR (np_i2s); - - card->dai_link->cpus->of_node = np_i2s; - card->dai_link->codecs->of_node = np_codec; - card->dai_link->platforms->of_node = np_i2s; +if (asoc->set_ac97) { + err =tegra_machine_register_codec (dev, asoc->codec_dev_name); +if (err) +return err; + + np_ac97 =tegra_machine_parse_phandle (dev,"nvidia,ac97-controller" ); +if (IS_ERR (np_ac97)) +return PTR_ERR (np_ac97); + + card->dai_link->cpus->of_node = np_ac97; + card->dai_link->platforms->of_node = np_ac97; + }else { + np_codec =tegra_machine_parse_phandle (dev,"nvidia,audio-codec" ); +if (IS_ERR (np_codec)) +return PTR_ERR (np_codec); + + np_i2s =tegra_machine_parse_phandle (dev,"nvidia,i2s-controller" ); +if (IS_ERR (np_i2s)) +return PTR_ERR (np_i2s); + + card->dai_link->cpus->of_node = np_i2s; + card->dai_link->codecs->of_node = np_codec; + card->dai_link->platforms->of_node = np_i2s; + }if (asoc->add_common_controls) { card->controls = tegra_machine_controls;
@@ -589,6 +627,7 @@ static struct snd_soc_card snd_soc_tegrastatic const struct tegra_asoc_data tegra_wm9712_data = { .card = &snd_soc_tegra_wm9712, .add_common_dapm_widgets = true, + .codec_dev_name ="wm9712-codec" , .set_ac97 = true, };
sound/soc/tegra/tegra_asoc_machine.h +1 -0
@@ -13,6 +13,7 @@ struct snd_soc_pcm_runtime;struct tegra_asoc_data {unsigned int (*mclk_rate)(unsigned int srate); +const char *codec_dev_name;struct snd_soc_card *card;unsigned int mclk_id;bool hp_jack_gpio_active_low;
Greg Kroah-Hartman
maintainerPATCH 108/917 signal: Remove the bogus sigkill_pending in ptrace_stop
In reply to Greg Kroah-HartmanFrom: Eric W. Biederman <[email protected]>
commit 7d613f9f72ec8f90ddefcae038fdae5adb8404b3 upstream.
The existence of sigkill_pending is a little silly as it is functionally a duplicate of fatal_signal_pending that is used in exactly one place.
Checking for pending fatal signals and returning early in ptrace_stop is actively harmful. It casues the ptrace_stop called by ptrace_signal to return early before setting current->exit_code. Later when ptrace_signal reads the signal number from current->exit_code is undefined, making it unpredictable what will happen.
Instead rely on the fact that schedule will not sleep if there is a pending signal that can awaken a task.
Removing the explict sigkill_pending test fixes fixes ptrace_signal when ptrace_stop does not stop because current->exit_code is always set to to signr.
--- kernel/signal.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-)
kernel/signal.c +4 -14
@@ -2169,15 +2169,6 @@ static inline bool may_ptrace_stop(void)return true; } -/* -* Return non-zero if there is a SIGKILL that should be waking us up. -* Called with the siglock held. -*/ -static bool sigkill_pending (struct task_struct *tsk) -{ -return sigismember (&tsk->pending.signal,SIGKILL ) || -sigismember (&tsk->signal->shared_pending.signal,SIGKILL ); -}/* * This must be called with current->sighand->siglock held.
@@ -2204,17 +2195,16 @@ static void ptrace_stop(int exit_code, i* calling arch_ptrace_stop, so we must release it now. * To preserve proper semantics, we must do this before * any signal bookkeeping like checking group_stop_count. -* Meanwhile, a SIGKILL could come in before we retake the -* siglock. That must prevent us from sleeping in TASK_TRACED. -* So after regaining the lock, we must check for SIGKILL. */ spin_unlock_irq (¤t->sighand->siglock);arch_ptrace_stop (exit_code, info);spin_lock_irq (¤t->sighand->siglock); -if (sigkill_pending (current)) -return ; } +/* +* schedule() will not sleep if there is a pending signal that +* can awaken the task. +*/ set_special_state (TASK_TRACED );/*