5.4.251-rc1 review
Subsystems (7)
Greg Kroah-Hartman
maintainercover 5.4.251-rc1 review
This is the start of the stable review cycle for the 5.4.251 release. There are 313 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 27 Jul 2023 10:44:26 +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.4.251-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.4.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.4.251-rc1
Mohamed Khalfella <[email protected]>
tracing/histograms: Return an error if we fail to add histogram to hist_vars list
Eric Dumazet <[email protected]>
tcp: annotate data-races around fastopenq.max_qlen
Eric Dumazet <[email protected]>
tcp: annotate data-races around tp->notsent_lowat
Eric Dumazet <[email protected]>
tcp: annotate data-races around rskq_defer_accept
Eric Dumazet <[email protected]>
tcp: annotate data-races around tp->linger2
Cambda Zhu <[email protected]>
net: Replace the limit of TCP_LINGER2 with TCP_FIN_TIMEOUT_MAX
Eric Dumazet <[email protected]>
tcp: annotate data-races around tp->tcp_tx_delay
Florian Westphal <[email protected]>
netfilter: nf_tables: can't schedule in nft_chain_validate
Florian Westphal <[email protected]>
netfilter: nf_tables: fix spurious set element insertion failure
Kuniyuki Iwashima <[email protected]>
llc: Don't drop packet from non-root netns.
Zhang Shurong <[email protected]>
fbdev: au1200fb: Fix missing IRQ check in au1200fb_drv_probe
Kuniyuki Iwashima <[email protected]>
Revert "tcp: avoid the lookup process failing to get sk in ehash table"
Yuanjun Gong <[email protected]>
net:ipv6: check return value of pskb_trim()
Ding Hui <[email protected]>
iavf: Fix use-after-free in free_netdev
Tanmay Patil <[email protected]>
net: ethernet: ti: cpsw_ale: Fix cpsw_ale_get_field()/cpsw_ale_set_field()
Mario Limonciello <[email protected]>
pinctrl: amd: Use amd_pinconf_set() for all config options
Martin Kaiser <[email protected]>
fbdev: imxfb: warn about invalid left/right margin
Jonas Gorski <[email protected]>
spi: bcm63xx: fix max prepend length
Ying Hsu <[email protected]>
igb: Fix igb_down hung on surprise removal
Johannes Berg <[email protected]>
wifi: iwlwifi: mvm: avoid baid size integer overflow
Gustavo A. R. Silva <[email protected]>
wifi: wext-core: Fix -Wstringop-overflow warning in ioctl_standard_iw_point()
Petr Oros <[email protected]>
devlink: report devlink_port_type_warn source device
Martin KaFai Lau <[email protected]>
bpf: Address KCSAN report on bpf_lru_list
Yicong Yang <[email protected]>
sched/fair: Don't balance task to its current running CPU
Mark Rutland <[email protected]>
arm64: mm: fix VA-range sanity check
Thomas Gleixner <[email protected]>
posix-timers: Ensure timer ID search-loop limit is valid
Yu Kuai <[email protected]>
md/raid10: prevent soft lockup while flush writes
Yu Kuai <[email protected]>
md: fix data corruption for raid456 when reshape restart while grow up
Zhong Jinghua <[email protected]>
nbd: Add the maximum limit of allocated index in nbd_dev_add
Tetsuo Handa <[email protected]>
debugobjects: Recheck debug_objects_enabled before reporting
Eric Whitney <[email protected]>
ext4: correct inline offset when handling xattrs in inode body
Jocelyn Falempe <[email protected]>
drm/client: Fix memory leak in drm_client_modeset_probe
Jocelyn Falempe <[email protected]>
drm/client: Fix memory leak in drm_client_target_cloned
YueHaibing <[email protected]>
can: bcm: Fix UAF in bcm_proc_show()
Matthieu Baerts <[email protected]>
selftests: tc: set timeout to 15 minutes
Miklos Szeredi <[email protected]>
fuse: revalidate: don't invalidate if interrupted
Filipe Manana <[email protected]>
btrfs: fix warning when putting transaction with qgroups enabled after abort
Georg Müller <[email protected]>
perf probe: Add test for regression introduced by switch to die_get_decl_file()
Daniel Vetter <[email protected]>
drm/atomic: Fix potential use-after-free in nonblocking commits
Manish Rangankar <[email protected]>
scsi: qla2xxx: Remove unused nvme_ls_waitq wait queue
Shreyas Deodhar <[email protected]>
scsi: qla2xxx: Pointer may be dereferenced
Bikash Hazarika <[email protected]>
scsi: qla2xxx: Correct the index of array
Nilesh Javali <[email protected]>
scsi: qla2xxx: Check valid rport returned by fc_bsg_to_rport()
Bikash Hazarika <[email protected]>
scsi: qla2xxx: Fix potential NULL pointer dereference
Quinn Tran <[email protected]>
scsi: qla2xxx: Wait for io return on terminate rport
Masami Hiramatsu (Google) <[email protected]>
tracing/probes: Fix not to count error code to total length
Mateusz Stachyra <[email protected]>
tracing: Fix null pointer dereference in tracing_err_log_open()
Max Filippov <[email protected]>
xtensa: ISS: fix call to split_if_spec
Zheng Yejian <[email protected]>
ring-buffer: Fix deadloop issue on reading trace_pipe
Mohamed Khalfella <[email protected]>
tracing/histograms: Add histograms to hist_vars if they have referenced variables
Christophe JAILLET <[email protected]>
tty: serial: samsung_tty: Fix a memory leak in s3c24xx_serial_getclk() when iterating clk
Christophe JAILLET <[email protected]>
tty: serial: samsung_tty: Fix a memory leak in s3c24xx_serial_getclk() in case of error
Jiaqing Zhao <[email protected]>
Revert "8250: add support for ASIX devices with a FIFO bug"
George Stark <[email protected]>
meson saradc: fix clock divider mask length
Xiubo Li <[email protected]>
ceph: don't let check_caps skip sending responses for revoke msgs
Martin Kaiser <[email protected]>
hwrng: imx-rngc - fix the timeout for init and self check
Christophe JAILLET <[email protected]>
firmware: stratix10-svc: Fix a potential resource leak in svc_create_memory_pool()
Dan Carpenter <[email protected]>
serial: atmel: don't enable IRQs prematurely
Brian Norris <[email protected]>
drm/rockchip: vop: Leave vblank enabled in self-refresh
Brian Norris <[email protected]>
drm/atomic: Allow vblank-enabled + self-refresh "disable"
Alexander Aring <[email protected]>
fs: dlm: return positive pid value for F_GETLK
Jason Baron <[email protected]>
md/raid0: add discard support for the 'original' layout
Damien Le Moal <[email protected]>
misc: pci_endpoint_test: Re-init completion for every test
Damien Le Moal <[email protected]>
misc: pci_endpoint_test: Free IRQs before removing the device
Damien Le Moal <[email protected]>
PCI: rockchip: Set address alignment for endpoint mode
Rick Wertenbroek <[email protected]>
PCI: rockchip: Use u32 variable to access 32-bit registers
Rick Wertenbroek <[email protected]>
PCI: rockchip: Fix legacy IRQ generation for RK3399 PCIe endpoint core
Rick Wertenbroek <[email protected]>
PCI: rockchip: Add poll and timeout to wait for PHY PLLs to be locked
Rick Wertenbroek <[email protected]>
PCI: rockchip: Write PCI Device ID to correct register
Rick Wertenbroek <[email protected]>
PCI: rockchip: Assert PCI Configuration Enable bit after probe
Manivannan Sadhasivam <[email protected]>
PCI: qcom: Disable write access to read only registers for IP v2.3.3
Robin Murphy <[email protected]>
PCI: Add function 1 DMA alias quirk for Marvell 88SE9235
Ondrej Zary <[email protected]>
PCI/PM: Avoid putting EloPOS E2/S2/H2 PCIe Ports in D3cold
Siddh Raman Pant <[email protected]>
jfs: jfs_dmap: Validate db_l2nbperpage while mounting
Baokun Li <[email protected]>
ext4: only update i_reserved_data_blocks on successful block allocation
Chao Yu <[email protected]>
ext4: fix to check return value of freeze_bdev() in ext4_shutdown()
Kemeng Shi <[email protected]>
ext4: fix wrong unit use in ext4_mb_clear_bb
Gao Xiang <[email protected]>
erofs: fix compact 4B support for 16k block size
Ding Hui <[email protected]>
SUNRPC: Fix UAF in svc_tcp_listen_data_ready()
Ekansh Gupta <[email protected]>
misc: fastrpc: Create fastrpc scalar with correct buffer count
Naveen N Rao <[email protected]>
powerpc: Fail build if using recordmcount with binutils v2.37
Florian Fainelli <[email protected]>
net: bcmgenet: Ensure MDIO unregistration has clocks enabled
Arseniy Krasnov <[email protected]>
mtd: rawnand: meson: fix unaligned DMA buffers handling
Jarkko Sakkinen <[email protected]>
tpm: tpm_vtpm_proxy: fix a race condition in /dev/vtpmx creation
Mario Limonciello <[email protected]>
pinctrl: amd: Only use special debounce behavior for GPIO 0
Mario Limonciello <[email protected]>
pinctrl: amd: Detect internal GPIO0 debounce handling
Mario Limonciello <[email protected]>
pinctrl: amd: Fix mistake in handling clearing pins at startup
Pedro Tammela <[email protected]>
net/sched: make psched_mtu() RTNL-less safe
Ido Schimmel <[email protected]>
net/sched: flower: Ensure both minimum and maximum ports are specified
Guillaume Nault <[email protected]>
cls_flower: Add extack support for src and dst port range options
Randy Dunlap <[email protected]>
wifi: airo: avoid uninitialized warning in airo_get_rate()
Chunhai Guo <[email protected]>
erofs: avoid infinite loop in z_erofs_do_read_page() when reading beyond EOF
Andy Shevchenko <[email protected]>
platform/x86: wmi: Break possible infinite loop when parsing GUID
Barnabás Pőcze <[email protected]>
platform/x86: wmi: move variables
Barnabás Pőcze <[email protected]>
platform/x86: wmi: use guid_t and guid_equal()
Barnabás Pőcze <[email protected]>
platform/x86: wmi: remove unnecessary argument
Andy Shevchenko <[email protected]>
platform/x86: wmi: Fix indentation in some cases
Andy Shevchenko <[email protected]>
platform/x86: wmi: Replace UUID redefinitions by their originals
Ziyang Xuan <[email protected]>
ipv6/addrconf: fix a potential refcount underflow for idev
Jiasheng Jiang <[email protected]>
NTB: ntb_tool: Add check for devm_kcalloc
Yang Yingliang <[email protected]>
NTB: ntb_transport: fix possible memory leak while device_register() fails
Yuan Can <[email protected]>
ntb: intel: Fix error handling in intel_ntb_pci_driver_init()
Yuan Can <[email protected]>
NTB: amd: Fix error handling in amd_ntb_pci_driver_init()
Yuan Can <[email protected]>
ntb: idt: Fix error handling in idt_pci_driver_init()
Eric Dumazet <[email protected]>
udp6: fix udp6_ehashfn() typo
Kuniyuki Iwashima <[email protected]>
icmp6: Fix null-ptr-deref of ip6_null_entry->rt6i_idev in icmp6_dev().
Nitya Sunkad <[email protected]>
ionic: remove WARN_ON to prevent panic_on_warn
Shannon Nelson <[email protected]>
ionic: ionic_intr_free parameter change
Shannon Nelson <[email protected]>
ionic: move irq request to qcq alloc
Shannon Nelson <[email protected]>
ionic: clean irq affinity on queue deinit
Shannon Nelson <[email protected]>
ionic: improve irq numa locality
M A Ramdhan <[email protected]>
net/sched: cls_fw: Fix improper refcount update leads to use-after-free
Klaus Kudielka <[email protected]>
net: mvneta: fix txq_map in case of txq_number==1
Dan Carpenter <[email protected]>
scsi: qla2xxx: Fix error code in qla2x00_start_sp()
Prasad Koya <[email protected]>
igc: set TP bit in 'supported' and 'advertising' fields of ethtool_link_ksettings
Muhammad Husaini Zulkifli <[email protected]>
igc: Remove delay during TX ring configuration
Fabio Estevam <[email protected]>
drm/panel: simple: Add connector_type for innolux_at043tn24
Laurent Pinchart <[email protected]>
drm/panel: Add and fill drm_panel type field
Laurent Pinchart <[email protected]>
drm/panel: Initialise panel dev and funcs through drm_panel_init()
Linus Torvalds <[email protected]>
workqueue: clean up WORK_* constant types, clarify masking
Moritz Fischer <[email protected]>
net: lan743x: Don't sleep in atomic context
Michael Schmitz <[email protected]>
block/partition: fix signedness issue for Amiga partitions
Sherry Sun <[email protected]>
tty: serial: fsl_lpuart: add earlycon for imx8ulp platform
Thadeu Lima de Souza Cascardo <[email protected]>
netfilter: nf_tables: prevent OOB access in nft_byteorder_eval
Florent Revest <[email protected]>
netfilter: conntrack: Avoid nf_ct_helper_hash uses after free
Florian Westphal <[email protected]>
netfilter: nf_tables: fix scheduling-while-atomic splat
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: unbind non-anonymous set if rule construction fails
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: reject unbound anonymous set before commit phase
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE
Florian Westphal <[email protected]>
netfilter: nf_tables: add rescheduling points during loop detection walks
Florian Westphal <[email protected]>
netfilter: nf_tables: use net_generic infra for transaction data
Pablo Neira Ayuso <[email protected]>
netfilter: add helper function to set up the nfnetlink header and use it
Pablo Neira Ayuso <[email protected]>
netfilter: nftables: add helper function to set the base sequence number
Florian Westphal <[email protected]>
netfilter: nf_tables: fix nat hook table deletion
Michael Schmitz <[email protected]>
block: add overflow checks for Amiga partition support
Amir Goldstein <[email protected]>
fanotify: disallow mount/sb marks on kernel internal pseudo fs
Jan Kara <[email protected]>
fs: no need to check source
Arnd Bergmann <[email protected]>
ARM: orion5x: fix d2net gpio initialization
Filipe Manana <[email protected]>
btrfs: fix race when deleting quota root from the dirty cow roots list
Jan Kara <[email protected]>
fs: Lock moved directories
Jan Kara <[email protected]>
fs: Establish locking order for unrelated directories
Jan Kara <[email protected]>
Revert "f2fs: fix potential corruption when moving a directory"
Jan Kara <[email protected]>
ext4: Remove ext4 locking of moved directory
Thomas Weißschuh <[email protected]>
fs: avoid empty option when generating legacy mount string
Fabian Frederick <[email protected]>
jffs2: reduce stack usage in jffs2_build_xattr_subsystem()
Tianjia Zhang <[email protected]>
integrity: Fix possible multiple allocation in integrity_inode_get()
Zheng Wang <[email protected]>
bcache: Remove unnecessary NULL point check in node allocations
Chevron Li <[email protected]>
mmc: sdhci: fix DMA configure compatibility issue when 64bit DMA mode is used.
Robert Marko <[email protected]>
mmc: core: disable TRIM on Micron MTFC4GACAJCN-1M
Robert Marko <[email protected]>
mmc: core: disable TRIM on Kingston EMMC04G-M627
Dai Ngo <[email protected]>
NFSD: add encoding of op_recall flag for write delegation
Takashi Iwai <[email protected]>
ALSA: jack: Fix mutex call in snd_jack_report()
Robert Hancock <[email protected]>
i2c: xiic: Don't try to handle more interrupt events after error
Marek Vasut <[email protected]>
i2c: xiic: Defer xiic_wakeup() and __xiic_start_xfer() in xiic_process()
Artur Rojek <[email protected]>
sh: dma: Fix DMA channel offset calculation
Vladimir Oltean <[email protected]>
net: dsa: tag_sja1105: fix MAC DA patching from meta frames
Lin Ma <[email protected]>
net/sched: act_pedit: Add size check for TCA_PEDIT_PARMS_EX
Ilya Maximets <[email protected]>
xsk: Honor SO_BINDTODEVICE on bind
Magnus Karlsson <[email protected]>
xsk: Improve documentation for AF_XDP
Eric Dumazet <[email protected]>
tcp: annotate data races in __tcp_oow_rate_limited()
Vladimir Oltean <[email protected]>
net: bridge: keep ports without IFF_UNICAST_FLT in BR_PROMISC mode
Randy Dunlap <[email protected]>
powerpc: allow PPC_EARLY_DEBUG_CPM only when SERIAL_CPM=y
Chao Yu <[email protected]>
f2fs: fix error path handling in truncate_dnode()
Nishanth Menon <[email protected]>
mailbox: ti-msgmgr: Fill non-message tx data fields with 0x0
Jonas Gorski <[email protected]>
spi: bcm-qspi: return error if neither hif_mspi nor mspi is available
Tobias Heider <[email protected]>
Add MODULE_FIRMWARE() for FIRMWARE_TG357766.
Chengfeng Ye <[email protected]>
sctp: fix potential deadlock on &net->sctp.addr_wq_lock
Christophe JAILLET <[email protected]>
rtc: st-lpc: Release some resources in st_rtc_probe() in case of error
Marek Vasut <[email protected]>
pwm: sysfs: Do not apply state to already disabled PWMs
Fancy Fang <[email protected]>
pwm: imx-tpm: force 'real_period' to be zero in suspend
Christophe JAILLET <[email protected]>
mfd: stmpe: Only disable the regulators if they are enabled
Pierre Morel <[email protected]>
KVM: s390: vsie: fix the length of APCB bitmap
Amelie Delaunay <[email protected]>
mfd: stmfx: Fix error path in stmfx_chip_init
Tony Lindgren <[email protected]>
serial: 8250_omap: Use force_suspend and resume for system suspend
Jiasheng Jiang <[email protected]>
mfd: intel-lpss: Add missing check for platform_get_resource
Christophe JAILLET <[email protected]>
usb: dwc3: qcom: Release the correct resources in dwc3_qcom_remove()
Nico Boehr <[email protected]>
KVM: s390: fix KVM_S390_GET_CMMA_BITS for GFNs in memslot holes
Stephan Gerhold <[email protected]>
mfd: rt5033: Drop rt5033-battery sub-device
Arnd Bergmann <[email protected]>
usb: hide unused usbfs_notify_suspend/resume functions
Li Yang <[email protected]>
usb: phy: phy-tahvo: fix memory leak in tahvo_usb_probe()
Andy Shevchenko <[email protected]>
extcon: Fix kernel doc of property capability fields to avoid warnings
Andy Shevchenko <[email protected]>
extcon: Fix kernel doc of property fields to avoid warnings
Vladislav Efanov <[email protected]>
usb: dwc3: qcom: Fix potential memory leak
Duoming Zhou <[email protected]>
media: usb: siano: Fix warning due to null work_func_t function pointer
Marek Vasut <[email protected]>
media: videodev2.h: Fix struct v4l2_input tuner index comment
Daniil Dulov <[email protected]>
media: usb: Check az6007_read() return value
John Paul Adrian Glaubitz <[email protected]>
sh: j2: Use ioremap() to translate device tree address into kernel memory
Dan Carpenter <[email protected]>
w1: fix loop in w1_fini()
Michael Schmitz <[email protected]>
block: change all __u32 annotations to __be32 in affs_hardblocks.h
Michael Schmitz <[email protected]>
block: fix signed int overflow in Amiga partition support
Krishna Kurapati <[email protected]>
usb: dwc3: gadget: Propagate core init errors to UDC during pullup
Davide Tronchin <[email protected]>
USB: serial: option: add LARA-R6 01B PIDs
Martin Kaiser <[email protected]>
hwrng: st - keep clock enabled while hwrng is registered
Herbert Xu <[email protected]>
hwrng: st - Fix W=1 unused variable warning
Olga Kornievskaia <[email protected]>
NFSv4.1: freeze the session table upon receiving NFS4ERR_BADSESSION
Masahiro Yamada <[email protected]>
ARC: define ASM_NL and __ALIGN(_STR) outside #ifdef __ASSEMBLY__ guard
Dan Carpenter <[email protected]>
modpost: fix off by one in is_executable_section()
Arnd Bergmann <[email protected]>
crypto: marvell/cesa - Fix type mismatch warning
Eric Biggers <[email protected]>
crypto: skcipher - remove crypto_has_ablkcipher()
Eric Biggers <[email protected]>
crypto: skcipher - unify the crypto_has_skcipher*() functions
Masahiro Yamada <[email protected]>
modpost: fix section mismatch message for R_ARM_{PC24,CALL,JUMP24}Masahiro Yamada <[email protected]>
modpost: fix section mismatch message for R_ARM_ABS32
Randy Dunlap <[email protected]>
crypto: nx - fix build warnings when DEBUG_FS is not enabled
Herbert Xu <[email protected]>
hwrng: virtio - Fix race on data_avail and actual data
Laurent Vivier <[email protected]>
hwrng: virtio - always add a pending request
Laurent Vivier <[email protected]>
hwrng: virtio - don't waste entropy
Laurent Vivier <[email protected]>
hwrng: virtio - don't wait on cleanup
Laurent Vivier <[email protected]>
hwrng: virtio - add an internal buffer
Aneesh Kumar K.V <[email protected]>
powerpc/mm/dax: Fix the condition when checking if altmap vmemap can cross-boundary
Claudiu Beznea <[email protected]>
pinctrl: at91-pio4: check return value of devm_kasprintf()
Namhyung Kim <[email protected]>
perf dwarf-aux: Fix off-by-one in die_get_varname()
Andy Shevchenko <[email protected]>
pinctrl: cherryview: Return correct value if pin in push-pull mode
Sui Jingfeng <[email protected]>
PCI: Add pci_clear_master() stub for non-CONFIG_PCI
Junyan Ye <[email protected]>
PCI: ftpci100: Release the clock resources
Rongguang Wei <[email protected]>
PCI: pciehp: Cancel bringup sequence if card is not present
Yuchen Yang <[email protected]>
scsi: 3w-xxxx: Add error handling for initialization failure in tw_probe()
Ding Hui <[email protected]>
PCI/ASPM: Disable ASPM on MFD function removal to avoid use-after-free
Jinhong Zhu <[email protected]>
scsi: qedf: Fix NULL dereference in error handling
Claudiu Beznea <[email protected]>
ASoC: imx-audmix: check return value of devm_kasprintf()
Claudiu Beznea <[email protected]>
clk: keystone: sci-clk: check return value of kasprintf()
Claudiu Beznea <[email protected]>
clk: cdce925: check return value of kasprintf()
Su Hui <[email protected]>
ALSA: ac97: Fix possible NULL dereference in snd_ac97_mixer
Yuan Can <[email protected]>
clk: tegra: tegra124-emc: Fix potential memory leak
Nikita Zhandarovich <[email protected]>
drm/radeon: fix possible division-by-zero errors
Daniil Dulov <[email protected]>
drm/amdkfd: Fix potential deallocation of previously deallocated memory.
Christophe JAILLET <[email protected]>
fbdev: omapfb: lcd_mipid: Fix an error handling path in mipid_spi_probe()
Wolfram Sang <[email protected]>
arm64: dts: renesas: ulcb-kf: Remove flow control for SCIF1
Patrick Kelsey <[email protected]>
IB/hfi1: Fix sdma.h tx->num_descs off-by-one errors
Randy Dunlap <[email protected]>
soc/fsl/qe: fix usb.c build errors
Cristian Ciocaltea <[email protected]>
ASoC: es8316: Do not set rate constraints for unsupported MCLKs
Cristian Ciocaltea <[email protected]>
ASoC: es8316: Increment max value for ALC Capture Target Volume control
Krzysztof Kozlowski <[email protected]>
memory: brcmstb_dpfe: fix testing array offset after use
Arnd Bergmann <[email protected]>
ARM: ep93xx: fix missing-prototype warnings
Dario Binacchi <[email protected]>
drm/panel: simple: fix active size for Ampire AM-480272H3TMQW-T01H
Krzysztof Kozlowski <[email protected]>
arm64: dts: qcom: msm8916: correct camss unit address
Tony Lindgren <[email protected]>
ARM: dts: gta04: Move model property out of pinctrl node
Kalesh AP <[email protected]>
RDMA/bnxt_re: Fix to remove an unnecessary log
XuDong Liu <[email protected]>
drm: sun4i_tcon: use devm_clk_get_enabled in sun4i_tcon_init_clocks
Marek Vasut <[email protected]>
Input: adxl34x - do not hardcode interrupt trigger type
Rafał Miłecki <[email protected]>
ARM: dts: BCM5301X: Drop "clock-names" from the SPI node
Luca Weiss <[email protected]>
Input: drv260x - sleep between polling GO bit
Nikita Zhandarovich <[email protected]>
radeon: avoid double free in ci_dpm_init()
Kuniyuki Iwashima <[email protected]>
netlink: Add __sock_i_ino() for __netlink_diag_dump().
Cambda Zhu <[email protected]>
ipvlan: Fix return value of ipvlan_queue_xmit()
Ilia.Gavrilov <[email protected]>
netfilter: nf_conntrack_sip: fix the ct_sip_parse_numerical_param() return value.
Florian Westphal <[email protected]>
netfilter: conntrack: dccp: copy entire header to stack buffer, not just basic one
Jeremy Sowden <[email protected]>
lib/ts_bm: reset initial match offset for every block of text
Lin Ma <[email protected]>
net: nfc: Fix use-after-free caused by nfc_llcp_find_local
Krzysztof Kozlowski <[email protected]>
nfc: llcp: simplify llcp_sock_connect() error paths
Kuniyuki Iwashima <[email protected]>
gtp: Fix use-after-free in __gtp_encap_destroy().
Sabrina Dubroca <[email protected]>
selftests: rtnetlink: remove netdevsim device after ipsec offload test
Eric Dumazet <[email protected]>
netlink: do not hard code device address lenth in fdb dumps
Eric Dumazet <[email protected]>
netlink: fix potential deadlock in netlink_set_err()
Dmitry Antipov <[email protected]>
wifi: ath9k: convert msecs to jiffies where needed
Benjamin Berg <[email protected]>
wifi: cfg80211: rewrite merging of inherited elements
Johannes Berg <[email protected]>
wifi: iwlwifi: pull from TXQs with softirqs disabled
Edwin Peer <[email protected]>
rtnetlink: extend RTEXT_FILTER_SKIP_STATS to IFLA_VF_INFO
Remi Pommarel <[email protected]>
wifi: ath9k: Fix possible stall on ath9k_txq_list_has_key()
Arnd Bergmann <[email protected]>
memstick r592: make memstick_debug_get_tpc_name() static
Zhen Lei <[email protected]>
kexec: fix a memory leak in crash_shrink_memory()
Douglas Anderson <[email protected]>
watchdog/perf: more properly prevent false positives with turbo modes
Douglas Anderson <[email protected]>
watchdog/perf: define dummy watchdog_update_hrtimer_threshold() on correct config
Marek Vasut <[email protected]>
wifi: rsi: Do not set MMC_PM_KEEP_POWER in shutdown
Fedor Pchelkin <[email protected]>
wifi: ath9k: don't allow to overwrite ENDPOINT0 attributes
Christophe JAILLET <[email protected]>
wifi: ray_cs: Fix an error handling path in ray_probe()
Andy Shevchenko <[email protected]>
wifi: ray_cs: Drop useless status variable in parse_addr()
Andy Shevchenko <[email protected]>
wifi: ray_cs: Utilize strnlen() in parse_addr()
Christophe JAILLET <[email protected]>
wifi: wl3501_cs: Fix an error handling path in wl3501_probe()
Jakub Kicinski <[email protected]>
wl3501_cs: use eth_hw_addr_set()
Jakub Kicinski <[email protected]>
net: create netdev->dev_addr assignment helpers
Lee Jones <[email protected]>
wl3501_cs: Fix misspelling and provide missing documentation
Alex Dewar <[email protected]>
wl3501_cs: Remove unnecessary NULL check
Lee Jones <[email protected]>
wl3501_cs: Fix a bunch of formatting issues related to function docs
Christophe JAILLET <[email protected]>
wifi: atmel: Fix an error handling path in atmel_probe()
Christophe JAILLET <[email protected]>
wifi: orinoco: Fix an error handling path in orinoco_cs_probe()
Christophe JAILLET <[email protected]>
wifi: orinoco: Fix an error handling path in spectrum_cs_probe()
Geert Uytterhoeven <[email protected]>
regulator: core: Streamline debugfs operations
Geert Uytterhoeven <[email protected]>
regulator: core: Fix more error checking for debugfs_create_dir()
Krzysztof Kozlowski <[email protected]>
nfc: llcp: fix possible use of uninitialized variable in nfc_llcp_send_connect()
Krzysztof Kozlowski <[email protected]>
nfc: constify several pointers to u8, char and sk_buff
Christophe JAILLET <[email protected]>
wifi: mwifiex: Fix the size of a memory allocation in mwifiex_ret_802_11_scan()
Vijaya Krishna Nivarthi <[email protected]>
spi: spi-geni-qcom: Correct CS_TOGGLE bit in SPI_TRANS_CFG
Pengcheng Yang <[email protected]>
samples/bpf: Fix buffer overflow in tcp_basertt
Fedor Pchelkin <[email protected]>
wifi: ath9k: avoid referencing uninit memory in ath9k_wmi_ctrl_rx
Peter Seiderer <[email protected]>
wifi: ath9k: fix AR9003 mac hardware hang check register offset calculation
Roberto Sassu <[email protected]>
ima: Fix build warnings
Jiasheng Jiang <[email protected]>
pstore/ram: Add check for kstrdup
Roberto Sassu <[email protected]>
evm: Complete description of evm_inode_setattr()
Arnd Bergmann <[email protected]>
ARM: 9303/1: kprobes: avoid missing-declaration warnings
Zhang Rui <[email protected]>
powercap: RAPL: Fix CONFIG_IOSF_MBI dependency
Nikita Zhandarovich <[email protected]>
PM: domains: fix integer overflow issues in genpd_parse_state()
Feng Mingxi <[email protected]>
clocksource/drivers/cadence-ttc: Fix memory leak in ttc_timer_probe
Rajan Vaja <[email protected]>
clocksource/drivers/cadence-ttc: Use ttc driver as platform driver
Sebastian Andrzej Siewior <[email protected]>
tracing/timer: Add missing hrtimer modes to decode_hrtimer_mode().
John Paul Adrian Glaubitz <[email protected]>
irqchip/jcore-aic: Fix missing allocation of IRQ descriptors
Marc Zyngier <[email protected]>
irqchip/jcore-aic: Kill use of irq_create_strict_mappings()
Li Nan <[email protected]>
md/raid10: fix io loss while replacement replace rdev
Li Nan <[email protected]>
md/raid10: fix null-ptr-deref of mreplace in raid10_sync_request
Li Nan <[email protected]>
md/raid10: fix wrong setting of max_corr_read_errors
Li Nan <[email protected]>
md/raid10: fix overflow of md/safe_mode_delay
Li Nan <[email protected]>
md/raid10: check slab-out-of-bounds in md_bitmap_get_counter
Shawn Wang <[email protected]>
x86/resctrl: Only show tasks' pid in current pid namespace
James Morse <[email protected]>
x86/resctrl: Use is_closid_match() in more places
Rafał Miłecki <[email protected]>
bgmac: fix *initial* chip reset to support BCM5358
Bas Nieuwenhuizen <[email protected]>
drm/amdgpu: Validate VM ioctl flags.
Ahmed S. Darwish <[email protected]>
scripts/tags.sh: Resolve gtags empty index generation
Chris Wilson <[email protected]>
drm/i915: Initialise outparam for error return from wait_for_register
Jason Gerecke <[email protected]>
HID: wacom: Use ktime_t rather than int when dealing with timestamps
Zheng Wang <[email protected]>
fbdev: imsttfb: Fix use after free bug in imsttfb_probe
Greg Kroah-Hartman <[email protected]>
video: imsttfb: check for ioremap() failures
Thomas Gleixner <[email protected]>
x86/smp: Use dedicated cache-line for mwait_play_dead()
Bob Peterson <[email protected]>
gfs2: Don't deref jdesc in evict
-------------
Diffstat:
Documentation/crypto/api-skcipher.rst | 2 +- Documentation/filesystems/directory-locking.rst | 26 +- Documentation/networking/af_xdp.rst | 268 +++++++++-- Makefile | 4 +- arch/arc/include/asm/linkage.h | 8 +- arch/arm/boot/dts/bcm5301x.dtsi | 1 - arch/arm/boot/dts/omap3-gta04a5one.dts | 4 +- arch/arm/mach-ep93xx/timer-ep93xx.c | 3 +- arch/arm/mach-orion5x/board-dt.c | 3 + arch/arm/mach-orion5x/common.h | 6 + arch/arm/probes/kprobes/checkers-common.c | 2 +- arch/arm/probes/kprobes/core.c | 2 +- arch/arm/probes/kprobes/opt-arm.c | 2 - arch/arm/probes/kprobes/test-core.c | 2 +- arch/arm/probes/kprobes/test-core.h | 4 + arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 +- arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 3 +- arch/arm64/mm/mmu.c | 4 +- arch/powerpc/Kconfig.debug | 2 +- arch/powerpc/Makefile | 8 + arch/powerpc/mm/init_64.c | 2 +- arch/s390/kvm/kvm-s390.c | 4 + arch/s390/kvm/vsie.c | 6 +- arch/sh/drivers/dma/dma-sh.c | 37 +- arch/sh/kernel/cpu/sh2/probe.c | 2 +- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 36 +- arch/x86/kernel/smpboot.c | 24 +- arch/xtensa/platforms/iss/network.c | 2 +- block/partitions/amiga.c | 104 ++++- crypto/skcipher.c | 4 +- drivers/base/power/domain.c | 6 +- drivers/block/nbd.c | 3 +- drivers/char/hw_random/imx-rngc.c | 6 +- drivers/char/hw_random/st-rng.c | 24 +- drivers/char/hw_random/virtio-rng.c | 86 +++- drivers/char/tpm/tpm_vtpm_proxy.c | 30 +- drivers/clk/clk-cdce925.c | 12 + drivers/clk/keystone/sci-clk.c | 2 + drivers/clk/tegra/clk-emc.c | 2 + drivers/clocksource/timer-cadence-ttc.c | 45 +- drivers/crypto/marvell/cipher.c | 2 +- drivers/crypto/nx/Makefile | 2 +- drivers/crypto/nx/nx.h | 4 +- drivers/extcon/extcon.c | 8 + drivers/firmware/stratix10-svc.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 13 +- drivers/gpu/drm/drm_atomic.c | 11 +- drivers/gpu/drm/drm_atomic_helper.c | 11 +- drivers/gpu/drm/drm_client_modeset.c | 6 + drivers/gpu/drm/drm_panel.c | 14 +- drivers/gpu/drm/i915/intel_uncore.c | 3 +- drivers/gpu/drm/panel/panel-arm-versatile.c | 5 +- .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 5 +- drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 5 +- drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 5 +- drivers/gpu/drm/panel/panel-innolux-p079zca.c | 5 +- drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 5 +- drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 5 +- drivers/gpu/drm/panel/panel-lg-lb035q02.c | 5 +- drivers/gpu/drm/panel/panel-lg-lg4573.c | 5 +- drivers/gpu/drm/panel/panel-lvds.c | 5 +- drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 5 +- drivers/gpu/drm/panel/panel-novatek-nt39016.c | 5 +- drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 5 +- drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 5 +- drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 5 +- .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 5 +- .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 5 +- drivers/gpu/drm/panel/panel-raydium-rm67191.c | 5 +- drivers/gpu/drm/panel/panel-raydium-rm68200.c | 5 +- drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c | 5 +- drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 5 +- drivers/gpu/drm/panel/panel-samsung-ld9040.c | 5 +- drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 5 +- drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 5 +- drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 5 +- drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 5 +- drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 5 +- drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 5 +- drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 5 +- drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c | 5 +- drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 5 +- drivers/gpu/drm/panel/panel-simple.c | 33 +- drivers/gpu/drm/panel/panel-sitronix-st7701.c | 5 +- drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 5 +- drivers/gpu/drm/panel/panel-sony-acx565akm.c | 5 +- drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 5 +- drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 5 +- drivers/gpu/drm/panel/panel-tpo-tpg110.c | 5 +- drivers/gpu/drm/panel/panel-truly-nt35597.c | 5 +- drivers/gpu/drm/radeon/ci_dpm.c | 28 +- drivers/gpu/drm/radeon/cypress_dpm.c | 8 +- drivers/gpu/drm/radeon/ni_dpm.c | 8 +- drivers/gpu/drm/radeon/rv740_dpm.c | 8 +- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 8 +- drivers/gpu/drm/sun4i/sun4i_tcon.c | 19 +- drivers/hid/wacom_wac.c | 6 +- drivers/hid/wacom_wac.h | 2 +- drivers/i2c/busses/i2c-xiic.c | 39 +- drivers/iio/adc/meson_saradc.c | 2 +- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 5 +- drivers/infiniband/hw/hfi1/sdma.c | 4 +- drivers/infiniband/hw/hfi1/sdma.h | 15 +- drivers/input/misc/adxl34x.c | 3 +- drivers/input/misc/drv260x.c | 1 + drivers/irqchip/irq-jcore-aic.c | 11 +- drivers/mailbox/ti-msgmgr.c | 12 +- drivers/md/bcache/btree.c | 10 +- drivers/md/bcache/super.c | 4 +- drivers/md/md-bitmap.c | 17 +- drivers/md/md.c | 23 +- drivers/md/raid0.c | 62 ++- drivers/md/raid0.h | 1 + drivers/md/raid10.c | 38 +- drivers/media/usb/dvb-usb-v2/az6007.c | 3 +- drivers/media/usb/siano/smsusb.c | 3 +- drivers/memory/brcmstb_dpfe.c | 4 +- drivers/memstick/host/r592.c | 4 +- drivers/mfd/intel-lpss-acpi.c | 3 + drivers/mfd/rt5033.c | 3 - drivers/mfd/stmfx.c | 2 +- drivers/mfd/stmpe.c | 4 +- drivers/misc/fastrpc.c | 2 +- drivers/misc/pci_endpoint_test.c | 10 +- drivers/mmc/core/quirks.h | 14 + drivers/mmc/host/sdhci.c | 4 +- drivers/mtd/nand/raw/meson_nand.c | 4 + drivers/net/ethernet/broadcom/bgmac.c | 8 +- drivers/net/ethernet/broadcom/bgmac.h | 2 + drivers/net/ethernet/broadcom/genet/bcmmii.c | 2 + drivers/net/ethernet/broadcom/tg3.c | 1 + drivers/net/ethernet/intel/iavf/iavf_main.c | 5 +- drivers/net/ethernet/intel/igb/igb_main.c | 5 + drivers/net/ethernet/intel/igc/igc_ethtool.c | 2 + drivers/net/ethernet/intel/igc/igc_main.c | 1 - drivers/net/ethernet/marvell/mvneta.c | 4 +- drivers/net/ethernet/microchip/lan743x_main.c | 21 +- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 57 ++- drivers/net/ethernet/ti/cpsw_ale.c | 24 +- drivers/net/gtp.c | 2 + drivers/net/ipvlan/ipvlan_core.c | 9 +- drivers/net/wireless/ath/ath9k/ar9003_hw.c | 27 +- drivers/net/wireless/ath/ath9k/htc_hst.c | 8 +- drivers/net/wireless/ath/ath9k/main.c | 11 +- drivers/net/wireless/ath/ath9k/wmi.c | 4 + drivers/net/wireless/atmel/atmel_cs.c | 13 +- drivers/net/wireless/cisco/airo.c | 5 +- drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 5 +- drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 2 +- drivers/net/wireless/intersil/orinoco/orinoco_cs.c | 13 +- .../net/wireless/intersil/orinoco/spectrum_cs.c | 13 +- drivers/net/wireless/marvell/mwifiex/scan.c | 6 +- drivers/net/wireless/ray_cs.c | 36 +- drivers/net/wireless/rsi/rsi_91x_sdio.c | 3 - drivers/net/wireless/wl3501_cs.c | 51 +- drivers/ntb/hw/amd/ntb_hw_amd.c | 7 +- drivers/ntb/hw/idt/ntb_hw_idt.c | 7 +- drivers/ntb/hw/intel/ntb_hw_gen1.c | 7 +- drivers/ntb/ntb_transport.c | 2 +- drivers/ntb/test/ntb_tool.c | 2 + drivers/pci/controller/dwc/pcie-qcom.c | 2 + drivers/pci/controller/pci-ftpci100.c | 14 +- drivers/pci/controller/pcie-rockchip-ep.c | 65 +-- drivers/pci/controller/pcie-rockchip.c | 17 + drivers/pci/controller/pcie-rockchip.h | 11 +- drivers/pci/hotplug/pciehp_ctrl.c | 8 + drivers/pci/pci.c | 10 +- drivers/pci/pcie/aspm.c | 21 +- drivers/pci/quirks.c | 2 + drivers/pinctrl/intel/pinctrl-cherryview.c | 15 +- drivers/pinctrl/pinctrl-amd.c | 41 +- drivers/pinctrl/pinctrl-amd.h | 1 + drivers/pinctrl/pinctrl-at91-pio4.c | 2 + drivers/platform/x86/wmi.c | 81 ++-- drivers/powercap/Kconfig | 4 +- drivers/powercap/intel_rapl_msr.c | 1 - drivers/pwm/pwm-imx-tpm.c | 7 + drivers/pwm/sysfs.c | 17 + drivers/regulator/core.c | 30 +- drivers/rtc/rtc-st-lpc.c | 2 +- drivers/scsi/3w-xxxx.c | 4 +- drivers/scsi/qedf/qedf_main.c | 3 +- drivers/scsi/qla2xxx/qla_attr.c | 13 + drivers/scsi/qla2xxx/qla_bsg.c | 6 + drivers/scsi/qla2xxx/qla_def.h | 1 - drivers/scsi/qla2xxx/qla_inline.h | 5 +- drivers/scsi/qla2xxx/qla_iocb.c | 5 +- drivers/scsi/qla2xxx/qla_nvme.c | 3 - drivers/soc/fsl/qe/Kconfig | 1 + drivers/spi/spi-bcm-qspi.c | 10 +- drivers/spi/spi-bcm63xx.c | 2 +- drivers/spi/spi-geni-qcom.c | 2 +- drivers/tty/serial/8250/8250.h | 1 - drivers/tty/serial/8250/8250_omap.c | 20 +- drivers/tty/serial/8250/8250_pci.c | 19 - drivers/tty/serial/8250/8250_port.c | 11 +- drivers/tty/serial/atmel_serial.c | 4 +- drivers/tty/serial/fsl_lpuart.c | 1 + drivers/tty/serial/samsung.c | 14 +- drivers/usb/core/devio.c | 2 + drivers/usb/dwc3/dwc3-qcom.c | 12 +- drivers/usb/dwc3/gadget.c | 4 +- drivers/usb/phy/phy-tahvo.c | 2 +- drivers/usb/serial/option.c | 4 + drivers/video/fbdev/au1200fb.c | 3 + drivers/video/fbdev/imsttfb.c | 34 +- drivers/video/fbdev/imxfb.c | 4 +- drivers/video/fbdev/omap/lcd_mipid.c | 6 +- drivers/w1/w1.c | 4 +- fs/btrfs/qgroup.c | 3 + fs/ceph/caps.c | 9 + fs/dlm/plock.c | 4 +- fs/erofs/zdata.c | 2 +- fs/erofs/zmap.c | 6 +- fs/ext4/indirect.c | 8 + fs/ext4/inode.c | 10 - fs/ext4/ioctl.c | 5 +- fs/ext4/mballoc.c | 4 +- fs/ext4/namei.c | 17 +- fs/ext4/xattr.c | 14 + fs/f2fs/namei.c | 16 +- fs/f2fs/node.c | 4 +- fs/fs_context.c | 3 +- fs/fuse/dir.c | 2 +- fs/gfs2/super.c | 8 + fs/inode.c | 42 ++ fs/internal.h | 2 + fs/jffs2/build.c | 5 +- fs/jffs2/xattr.c | 13 +- fs/jffs2/xattr.h | 4 +- fs/jfs/jfs_dmap.c | 6 + fs/jfs/jfs_filsys.h | 2 + fs/namei.c | 25 +- fs/nfs/nfs4proc.c | 1 + fs/nfsd/nfs4xdr.c | 2 +- fs/notify/fanotify/fanotify_user.c | 22 +- fs/pstore/ram_core.c | 2 + include/crypto/skcipher.h | 19 +- include/drm/drm_panel.h | 13 +- include/linux/crypto.h | 31 -- include/linux/etherdevice.h | 12 + include/linux/netdevice.h | 18 + include/linux/netfilter/nfnetlink.h | 27 ++ include/linux/nmi.h | 2 +- include/linux/pci.h | 1 + include/linux/sched/signal.h | 2 +- include/linux/serial_8250.h | 1 - include/linux/tcp.h | 2 +- include/linux/workqueue.h | 15 +- include/net/netfilter/nf_tables.h | 14 + include/net/netns/nftables.h | 6 - include/net/nfc/nfc.h | 4 +- include/net/pkt_sched.h | 2 +- include/net/sock.h | 1 + include/net/tcp.h | 7 +- include/trace/events/timer.h | 6 +- include/uapi/linux/affs_hardblocks.h | 68 +-- include/uapi/linux/videodev2.h | 2 +- kernel/bpf/bpf_lru_list.c | 21 +- kernel/bpf/bpf_lru_list.h | 7 +- kernel/kexec_core.c | 5 +- kernel/sched/fair.c | 2 +- kernel/time/posix-timers.c | 31 +- kernel/trace/ring_buffer.c | 24 +- kernel/trace/trace.c | 2 +- kernel/trace/trace_events_hist.c | 9 +- kernel/trace/trace_probe_tmpl.h | 2 + kernel/watchdog_hld.c | 6 +- kernel/workqueue.c | 13 +- lib/debugobjects.c | 9 + lib/ts_bm.c | 4 +- net/bridge/br_if.c | 5 +- net/can/bcm.c | 12 +- net/core/devlink.c | 5 +- net/core/rtnetlink.c | 104 +++-- net/core/sock.c | 17 +- net/dsa/tag_sja1105.c | 4 +- net/ipv4/inet_hashtables.c | 17 +- net/ipv4/inet_timewait_sock.c | 8 +- net/ipv4/tcp.c | 31 +- net/ipv4/tcp_fastopen.c | 6 +- net/ipv4/tcp_input.c | 12 +- net/ipv6/addrconf.c | 3 +- net/ipv6/icmp.c | 5 +- net/ipv6/ip6_gre.c | 3 +- net/ipv6/udp.c | 2 +- net/llc/llc_input.c | 3 - net/netfilter/ipset/ip_set_core.c | 17 +- net/netfilter/nf_conntrack_helper.c | 4 + net/netfilter/nf_conntrack_netlink.c | 77 +--- net/netfilter/nf_conntrack_proto_dccp.c | 52 ++- net/netfilter/nf_conntrack_sip.c | 2 +- net/netfilter/nf_tables_api.c | 513 ++++++++++++--------- net/netfilter/nf_tables_offload.c | 29 +- net/netfilter/nf_tables_trace.c | 9 +- net/netfilter/nfnetlink_acct.c | 11 +- net/netfilter/nfnetlink_cthelper.c | 11 +- net/netfilter/nfnetlink_cttimeout.c | 22 +- net/netfilter/nfnetlink_log.c | 11 +- net/netfilter/nfnetlink_queue.c | 12 +- net/netfilter/nft_byteorder.c | 14 +- net/netfilter/nft_chain_filter.c | 11 +- net/netfilter/nft_compat.c | 11 +- net/netfilter/nft_dynset.c | 6 +- net/netlink/af_netlink.c | 5 +- net/netlink/diag.c | 7 +- net/nfc/core.c | 4 +- net/nfc/hci/llc_shdlc.c | 10 +- net/nfc/llcp.h | 9 +- net/nfc/llcp_commands.c | 59 ++- net/nfc/llcp_core.c | 95 ++-- net/nfc/llcp_sock.c | 21 +- net/nfc/netlink.c | 20 +- net/nfc/nfc.h | 3 +- net/sched/act_pedit.c | 1 + net/sched/cls_flower.c | 36 +- net/sched/cls_fw.c | 10 +- net/sctp/socket.c | 4 +- net/sunrpc/svcsock.c | 27 +- net/wireless/scan.c | 217 +++++---- net/wireless/wext-core.c | 6 + net/xdp/xsk.c | 5 + samples/bpf/tcp_basertt_kern.c | 2 +- scripts/mod/modpost.c | 26 +- scripts/tags.sh | 9 +- security/integrity/evm/evm_main.c | 2 + security/integrity/iint.c | 15 +- security/integrity/ima/ima_modsig.c | 3 + security/integrity/ima/ima_policy.c | 3 +- sound/core/jack.c | 15 +- sound/pci/ac97/ac97_codec.c | 4 +- sound/soc/codecs/es8316.c | 23 +- sound/soc/fsl/imx-audmix.c | 9 + .../tests/shell/test_uprobe_from_different_cu.sh | 77 ++++ tools/perf/util/dwarf-aux.c | 2 +- tools/testing/selftests/net/rtnetlink.sh | 1 + tools/testing/selftests/tc-testing/settings | 1 + 338 files changed, 3035 insertions(+), 1780 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/313 gfs2: Dont deref jdesc in evict
From: Bob Peterson <[email protected]>
commit 504a10d9e46bc37b23d0a1ae2f28973c8516e636 upstream.
On corrupt gfs2 file systems the evict code can try to reference the journal descriptor structure, jdesc, after it has been freed and set to NULL. The sequence of events is:
init_journal()
...fail_jindex:
gfs2_jindex_free(sdp); <------frees journals, sets jdesc = NULL
if (gfs2_holder_initialized(&ji_gh))
gfs2_glock_dq_uninit(&ji_gh);
fail:
iput(sdp->sd_jindex); <--references jdesc in evict_linked_inode
evict()
gfs2_evict_inode()
evict_linked_inode()
ret = gfs2_trans_begin(sdp, 0, sdp->sd_jdesc->jd_blocks);<------references the now freed/zeroed sd_jdesc pointer.
The call to gfs2_trans_begin is done because the truncate_inode_pages call can cause gfs2 events that require a transaction, such as removing journaled data (jdata) blocks from the journal.
This patch fixes the problem by adding a check for sdp->sd_jdesc to function gfs2_evict_inode. In theory, this should only happen to corrupt gfs2 file systems, when gfs2 detects the problem, reports it, then tries to evict all the system inodes it has read in up to that point.
--- fs/gfs2/super.c | 8 ++++++++ 1 file changed, 8 insertions(+)
fs/gfs2/super.c +8 -0
@@ -1258,6 +1258,14 @@ static void gfs2_evict_inode(struct inodif (inode->i_nlink ||sb_rdonly (sb)) goto out; +/* +* In case of an incomplete mount, gfs2_evict_inode() may be called for +* system files without having an active journal to write to. In that +* case, skip the filesystem evict. +*/ +if (!sdp->sd_jdesc) + goto out; +if (test_bit (GIF_ALLOC_FAILED , &ip->i_flags)) {BUG_ON (!gfs2_glock_is_locked_by_me (ip->i_gl));gfs2_holder_mark_uninitialized (&gh);
Greg Kroah-Hartman
maintainerPATCH 2/313 x86/smp: Use dedicated cache-line for mwait_play_dead()
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
commit f9c9987bf52f4e42e940ae217333ebb5a4c3b506 upstream.
Monitoring idletask::thread_info::flags in mwait_play_dead() has been an obvious choice as all what is needed is a cache line which is not written by other CPUs.
But there is a use case where a "dead" CPU needs to be brought out of
MWAIT: kexec().
This is required as kexec() can overwrite text, pagetables, stacks and the monitored cacheline of the original kernel. The latter causes MWAIT to resume execution which obviously causes havoc on the kexec kernel which results usually in triple faults.
Use a dedicated per CPU storage to prepare for that.
--- arch/x86/kernel/smpboot.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)
arch/x86/kernel/smpboot.c +14 -10
@@ -99,6 +99,17 @@ DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t DEFINE_PER_CPU_READ_MOSTLY(struct cpuinfo_x86, cpu_info);EXPORT_PER_CPU_SYMBOL (cpu_info); +struct mwait_cpu_dead { +unsigned int control; +unsigned int status; +}; + +/* +* Cache line aligned data for mwait_play_dead(). Separate on purpose so +* that it's unlikely to be touched by other CPUs. +*/ +static DEFINE_PER_CPU_ALIGNED(struct mwait_cpu_dead, mwait_cpu_dead); +/* Logical package management. We might want to allocate that dynamically */ unsigned int __max_logical_packages__read_mostly ;EXPORT_SYMBOL (__max_logical_packages);
@@ -1675,10 +1686,10 @@ static bool wakeup_cpu0(void)*/ static inline void mwait_play_dead (void ) { +struct mwait_cpu_dead *md =this_cpu_ptr (&mwait_cpu_dead);unsigned int eax, ebx, ecx, edx;unsigned int highest_cstate =0 ;unsigned int highest_subcstate =0 ; -void *mwait_ptr;int i; if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD ||
@@ -1713,13 +1724,6 @@ static inline void mwait_play_dead(void) (highest_subcstate -1 ); } -/* -* This should be a memory location in a cache line which is -* unlikely to be touched by other processors. The actual -* content is immaterial as it is not actually modified in any way. -*/ - mwait_ptr = ¤t_thread_info ()->flags; -wbinvd ();while (1 ) {
@@ -1731,9 +1735,9 @@ static inline void mwait_play_dead(void)* case where we return around the loop. */ mb (); -clflush (mwait_ptr); +clflush (md);mb (); -__monitor (mwait_ptr,0 ,0 ); +__monitor (md,0 ,0 );mb ();__mwait (eax,0 );/*
Greg Kroah-Hartman
maintainerPATCH 3/313 video: imsttfb: check for ioremap() failures
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
commit 13b7c0390a5d3840e1e2cda8f44a310fdbb982de upstream.
We should check if ioremap() were to somehow fail in imsttfb_probe() and handle the unwinding of the resources allocated here properly.
Ideally if anyone cares about this driver (it's for a PowerMac era PCI display card), they wouldn't even be using fbdev anymore. Or the devm_* apis could be used, but that's just extra work for diminishing returns...
--- drivers/video/fbdev/imsttfb.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)
drivers/video/fbdev/imsttfb.c +18 -3
@@ -1469,6 +1469,7 @@ static int imsttfb_probe(struct pci_devstruct imstt_par *par;struct fb_info *info;struct device_node *dp; +int ret = -ENOMEM ; dp =pci_device_to_OF_node (pdev);if (dp)
@@ -1504,23 +1505,37 @@ static int imsttfb_probe(struct pci_devdefault :printk (KERN_INFO "imsttfb: Device 0x%x unknown, " "contact maintainer.\n" , pdev->device); -release_mem_region (addr, size); -framebuffer_release (info); -return -ENODEV ; + ret = -ENODEV ; + goto error; } info->fix.smem_start = addr; info->screen_base = (__u8 *)ioremap (addr, par->ramdac ==IBM ?0x400000 :0x800000 ); +if (!info->screen_base) + goto error; info->fix.mmio_start = addr +0x800000 ; par->dc_regs =ioremap (addr +0x800000 ,0x1000 ); +if (!par->dc_regs) + goto error; par->cmap_regs_phys = addr +0x840000 ; par->cmap_regs = (__u8 *)ioremap (addr +0x840000 ,0x1000 ); +if (!par->cmap_regs) + goto error; info->pseudo_palette = par->palette;init_imstt (info);pci_set_drvdata (pdev, info);return 0 ; + +error: +if (par->dc_regs) +iounmap (par->dc_regs); +if (info->screen_base) +iounmap (info->screen_base); +release_mem_region (addr, size); +framebuffer_release (info); +return ret; }static void imsttfb_remove (struct pci_dev *pdev)
Greg Kroah-Hartman
maintainerPATCH 4/313 fbdev: imsttfb: Fix use after free bug in imsttfb_probe
In reply to Greg Kroah-HartmanFrom: Zheng Wang <[email protected]>
commit c75f5a55061091030a13fef71b9995b89bc86213 upstream.
A use-after-free bug may occur if init_imstt invokes framebuffer_release and free the info ptr. The caller, imsttfb_probe didn't notice that and still keep the ptr as private data in pdev.
If we remove the driver which will call imsttfb_remove to make cleanup, UAF happens.
Fix it by return error code if bad case happens in init_imstt.
--- drivers/video/fbdev/imsttfb.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/video/fbdev/imsttfb.c +8 -7
@@ -1346,7 +1346,7 @@ static struct fb_ops imsttfb_ops = { .fb_ioctl = imsttfb_ioctl, }; -static void init_imstt (struct fb_info *info) +static int init_imstt (struct fb_info *info) {struct imstt_par *par = info->par;__u32 i, tmp, *ip, *end;
@@ -1419,7 +1419,7 @@ static void init_imstt(struct fb_info *i || !(compute_imstt_regvals(par, info->var.xres, info->var.yres))) {printk ("imsttfb: %ux%ux%u not supported\n" , info->var.xres, info->var.yres, info->var.bits_per_pixel);framebuffer_release (info); -return ; +return -ENODEV ; }sprintf (info->fix.id,"IMS TT (%s)" , par->ramdac ==IBM ?"IBM" :"TVP" );
@@ -1455,12 +1455,13 @@ static void init_imstt(struct fb_info *iif (register_framebuffer (info) <0 ) {framebuffer_release (info); -return ; +return -ENODEV ; } tmp = (read_reg_le32 (par->dc_regs,SSTATUS ) &0x0f00 ) >>8 ;fb_info (info,"%s frame buffer; %uMB vram; chip version %u\n" , info->fix.id, info->fix.smem_len >>20 , tmp); +return 0 ; }static int imsttfb_probe (struct pci_dev *pdev,const struct pci_device_id *ent)
@@ -1523,10 +1524,10 @@ static int imsttfb_probe(struct pci_devif (!par->cmap_regs) goto error; info->pseudo_palette = par->palette; -init_imstt (info); - -pci_set_drvdata (pdev, info); -return 0 ; + ret =init_imstt (info); +if (!ret) +pci_set_drvdata (pdev, info); +return ret; error:if (par->dc_regs)
Greg Kroah-Hartman
maintainerPATCH 5/313 HID: wacom: Use ktime_t rather than int when dealing with timestamps
In reply to Greg Kroah-HartmanFrom: Jason Gerecke <[email protected]>
commit 9a6c0e28e215535b2938c61ded54603b4e5814c5 upstream.
Code which interacts with timestamps needs to use the ktime_t type returned by functions like ktime_get. The int type does not offer enough space to store these values, and attempting to use it is a recipe for problems. In this particular case, overflows would occur when calculating/storing timestamps leading to incorrect values being reported to userspace. In some cases these bad timestamps cause input handling in userspace to appear hung.
--- drivers/hid/wacom_wac.c | 6 +++--- drivers/hid/wacom_wac.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/hid/wacom_wac.c +3 -3
@@ -1307,7 +1307,7 @@ static void wacom_intuos_pro2_bt_pen(strstruct input_dev *pen_input = wacom->pen_input;unsigned char *data = wacom->data;int number_of_valid_frames =0 ; -int time_interval =15000000 ; +ktime_t time_interval =15000000 ;ktime_t time_packet_received =ktime_get ();int i;
@@ -1341,7 +1341,7 @@ static void wacom_intuos_pro2_bt_pen(strif (number_of_valid_frames) {if (wacom->hid_data.time_delayed) time_interval =ktime_get () - wacom->hid_data.time_delayed; - time_interval /= number_of_valid_frames; + time_interval =div_u64 (time_interval, number_of_valid_frames); wacom->hid_data.time_delayed = time_packet_received; }
@@ -1352,7 +1352,7 @@ static void wacom_intuos_pro2_bt_pen(strbool range = frame[0 ] &0x20 ;bool invert = frame[0 ] &0x10 ;int frames_number_reversed = number_of_valid_frames - i -1 ; -int event_timestamp = time_packet_received - frames_number_reversed * time_interval; +ktime_t event_timestamp = time_packet_received - frames_number_reversed * time_interval;if (!valid)continue ;
drivers/hid/wacom_wac.h +1 -1
@@ -320,7 +320,7 @@ struct hid_data {int bat_connected;int ps_connected;bool pad_input_event_flag; -int time_delayed; +ktime_t time_delayed; };struct wacom_remote_data {
Greg Kroah-Hartman
maintainerPATCH 6/313 drm/i915: Initialise outparam for error return from wait_for_register
In reply to Greg Kroah-HartmanFrom: Chris Wilson <[email protected]>
commit b79ffa914ede785a721f42d8ee3ce7b8eeede2bb upstream.
Just in case the caller passes in 0 for both slow&fast timeouts, make sure we initialise the stack value returned. Add an assert so that we don't make the mistake of passing 0 timeouts for the wait.
drivers/gpu/drm/i915/intel_uncore.c:2011 __intel_wait_for_register_fw() error: uninitialized symbol 'reg_value'.
--- drivers/gpu/drm/i915/intel_uncore.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_uncore.c +2 -1
@@ -1926,13 +1926,14 @@ int __intel_wait_for_register_fw(structunsigned int slow_timeout_ms, u32 *out_value) { - u32 reg_value; + u32 reg_value = 0;#define done (((reg_value = intel_uncore_read_fw(uncore, reg)) & mask) == value)int ret;/* Catch any overuse of this function */ might_sleep_if (slow_timeout_ms);GEM_BUG_ON (fast_timeout_us >20000 ); +GEM_BUG_ON (!fast_timeout_us && !slow_timeout_ms); ret = -ETIMEDOUT ;if (fast_timeout_us && fast_timeout_us <=20000 )
Greg Kroah-Hartman
maintainerPATCH 7/313 scripts/tags.sh: Resolve gtags empty index generation
In reply to Greg Kroah-HartmanFrom: Ahmed S. Darwish <[email protected]>
commit e1b37563caffc410bb4b55f153ccb14dede66815 upstream.
gtags considers any file outside of its current working directory "outside the source tree" and refuses to index it. For O= kernel builds, or when "make" is invoked from a directory other then the kernel source tree, gtags ignores the entire kernel source and generates an empty index.
Force-set gtags current working directory to the kernel source tree.
Due to commit 9da0763bdd82 ("kbuild: Use relative path when building in a subdir of the source tree"), if the kernel build is done in a sub-directory of the kernel source tree, the kernel Makefile will set the kernel's $srctree to ".." for shorter compile-time and run-time warnings. Consequently, the list of files to be indexed will be in the "../*" form, rendering all such paths invalid once gtags switches to the kernel source tree as its current working directory.
If gtags indexing is requested and the build directory is not the kernel source tree, index all files in absolute-path form.
Note, indexing in absolute-path form will not affect the generated index, as paths in gtags indices are always relative to the gtags "root directory" anyway (as evidenced by "gtags --dump").
--- scripts/tags.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
scripts/tags.sh +8 -1
@@ -28,6 +28,13 @@ fi # ignore userspace tools ignore="$ignore ( -path ${tree}tools ) -prune -o" +# gtags(1) refuses to index any file outside of its current working dir. +# If gtags indexing is requested and the build output directory is not +# the kernel source tree, index all files in absolute-path form. +if [[ "$1" == "gtags" && -n "${tree}" ]]; then + tree=$(realpath "$tree")/ +fi + # Detect if ALLSOURCE_ARCHS is set. If not, we assume SRCARCH if [ "${ALLSOURCE_ARCHS}" = "" ]; then ALLSOURCE_ARCHS=${SRCARCH}
@@ -134,7 +141,7 @@ docscope() dogtags() { - all_target_sources | gtags -i -f - + all_target_sources | gtags -i -C "${tree:-.}" -f - "$PWD" } # Basic regular expressions with an optional /kind-spec/ for ctags and
Greg Kroah-Hartman
maintainerPATCH 8/313 drm/amdgpu: Validate VM ioctl flags.
In reply to Greg Kroah-HartmanFrom: Bas Nieuwenhuizen <[email protected]>
commit a2b308044dcaca8d3e580959a4f867a1d5c37fac upstream.
None have been defined yet, so reject anybody setting any. Mesa sets it to 0 anyway.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +4 -0
@@ -3076,6 +3076,10 @@ int amdgpu_vm_ioctl(struct drm_device *dstruct amdgpu_fpriv *fpriv = filp->driver_priv;int r; +/* No valid flags defined yet */ +if (args->in.flags) +return -EINVAL ; +switch (args->in.op) {case AMDGPU_VM_OP_RESERVE_VMID :/* current, we only have requirement to reserve vmid from gfxhub */
Greg Kroah-Hartman
maintainerPATCH 9/313 bgmac: fix *initial* chip reset to support BCM5358
In reply to Greg Kroah-HartmanFrom: Rafał Miłecki <[email protected]>
commit f99e6d7c4ed3be2531bd576425a5bd07fb133bd7 upstream.
While bringing hardware up we should perform a full reset including the switch bit (BGMAC_BCMA_IOCTL_SW_RESET aka SICF_SWRST). It's what specification says and what reference driver does.
This seems to be critical for the BCM5358. Without this hardware doesn't get initialized properly and doesn't seem to transmit or receive any packets.
Originally bgmac was calling bgmac_chip_reset() before setting "has_robosw" property which resulted in expected behaviour. That has changed as a side effect of adding platform device support which regressed BCM5358 support.
--- drivers/net/ethernet/broadcom/bgmac.c | 8 ++++++-- drivers/net/ethernet/broadcom/bgmac.h | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-)
drivers/net/ethernet/broadcom/bgmac.c +6 -2
@@ -890,13 +890,13 @@ static void bgmac_chip_reset_idm_config(if (iost &BGMAC_BCMA_IOST_ATTACHED ) { flags =BGMAC_BCMA_IOCTL_SW_CLKEN ; -if (!bgmac->has_robosw) +if (bgmac->in_init || !bgmac->has_robosw) flags |=BGMAC_BCMA_IOCTL_SW_RESET ; }bgmac_clk_enable (bgmac, flags); } -if (iost &BGMAC_BCMA_IOST_ATTACHED && !bgmac->has_robosw) +if (iost &BGMAC_BCMA_IOST_ATTACHED && (bgmac->in_init || !bgmac->has_robosw))bgmac_idm_write (bgmac,BCMA_IOCTL ,bgmac_idm_read (bgmac,BCMA_IOCTL ) & ~BGMAC_BCMA_IOCTL_SW_RESET );
@@ -1489,6 +1489,8 @@ int bgmac_enet_probe(struct bgmac *bgmacstruct net_device *net_dev = bgmac->net_dev;int err; + bgmac->in_init = true; +bgmac_chip_intrs_off (bgmac); net_dev->irq = bgmac->irq;
@@ -1538,6 +1540,8 @@ int bgmac_enet_probe(struct bgmac *bgmac net_dev->hw_features = net_dev->features; net_dev->vlan_features = net_dev->features; + bgmac->in_init = false; + err =register_netdev (bgmac->net_dev);if (err) {dev_err (bgmac->dev,"Cannot register net device\n" );
drivers/net/ethernet/broadcom/bgmac.h +2 -0
@@ -511,6 +511,8 @@ struct bgmac {int irq;u32 int_mask; +bool in_init; +/* Current MAC state */ int mac_speed;int mac_duplex;
Greg Kroah-Hartman
maintainerPATCH 10/313 x86/resctrl: Use is_closid_match() in more places
In reply to Greg Kroah-HartmanFrom: James Morse <[email protected]>
[ Upstream commit e6b2fac36fcc0b73cbef063d700a9841850e37a0 ]
rdtgroup_tasks_assigned() and show_rdt_tasks() loop over threads testing for a CTRL/MON group match by closid/rmid with the provided rdtgrp. Further down the file are helpers to do this, move these further up and make use of them here.
These helpers additionally check for alloc/mon capable. This is harmless as rdtgroup_mkdir() tests these capable flags before allowing the config directories to be created.
Stable-dep-of: 2997d94b5dd0 ("x86/resctrl: Only show tasks' pid in current pid namespace")
--- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 30 ++++++++++++-------------- 1 file changed, 14 insertions(+), 16 deletions(-)
arch/x86/kernel/cpu/resctrl/rdtgroup.c +14 -16
@@ -593,6 +593,18 @@ static int __rdtgroup_move_task(struct task_struct *tsk,return 0 ; } +static bool is_closid_match (struct task_struct *t,struct rdtgroup *r) +{ +return (rdt_alloc_capable && + (r->type ==RDTCTRL_GROUP ) && (t->closid == r->closid)); +} + +static bool is_rmid_match (struct task_struct *t,struct rdtgroup *r) +{ +return (rdt_mon_capable && + (r->type ==RDTMON_GROUP ) && (t->rmid == r->mon.rmid)); +} +/** * rdtgroup_tasks_assigned - Test if tasks have been assigned to resource group * @r: Resource group
@@ -608,8 +620,7 @@ int rdtgroup_tasks_assigned(struct rdtgroup *r)rcu_read_lock ();for_each_process_thread (p, t) { -if ((r->type ==RDTCTRL_GROUP && t->closid == r->closid) || - (r->type ==RDTMON_GROUP && t->rmid == r->mon.rmid)) { +if (is_closid_match (t, r) ||is_rmid_match (t, r)) { ret =1 ;break ; }
@@ -707,8 +718,7 @@ static void show_rdt_tasks(struct rdtgroup *r, struct seq_file *s)rcu_read_lock ();for_each_process_thread (p, t) { -if ((r->type ==RDTCTRL_GROUP && t->closid == r->closid) || - (r->type ==RDTMON_GROUP && t->rmid == r->mon.rmid)) +if (is_closid_match (t, r) ||is_rmid_match (t, r))seq_printf (s,"%d\n" , t->pid); }rcu_read_unlock ();
@@ -2148,18 +2158,6 @@ static int reset_all_ctrls(struct rdt_resource *r)return 0 ; } -static bool is_closid_match (struct task_struct *t,struct rdtgroup *r) -{ -return (rdt_alloc_capable && - (r->type ==RDTCTRL_GROUP ) && (t->closid == r->closid)); -} - -static bool is_rmid_match (struct task_struct *t,struct rdtgroup *r) -{ -return (rdt_mon_capable && - (r->type ==RDTMON_GROUP ) && (t->rmid == r->mon.rmid)); -} -/* * Move tasks from one to the other group. If @from is NULL, then all tasks * in the systems are moved unconditionally (used for teardown).
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 11/313 x86/resctrl: Only show tasks pid in current pid namespace
In reply to Greg Kroah-HartmanFrom: Shawn Wang <[email protected]>
[ Upstream commit 2997d94b5dd0e8b10076f5e0b6f18410c73e28bd ]
When writing a task id to the "tasks" file in an rdtgroup, rdtgroup_tasks_write() treats the pid as a number in the current pid namespace. But when reading the "tasks" file, rdtgroup_tasks_show() shows the list of global pids from the init namespace, which is confusing and incorrect.
To be more robust, let the "tasks" file only show pids in the current pid namespace.
--- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/resctrl/rdtgroup.c +6 -2
@@ -715,11 +715,15 @@ static ssize_t rdtgroup_tasks_write(struct kernfs_open_file *of,static void show_rdt_tasks (struct rdtgroup *r,struct seq_file *s) {struct task_struct *p, *t; +pid_t pid;rcu_read_lock ();for_each_process_thread (p, t) { -if (is_closid_match (t, r) ||is_rmid_match (t, r)) -seq_printf (s,"%d\n" , t->pid); +if (is_closid_match (t, r) ||is_rmid_match (t, r)) { + pid =task_pid_vnr (t); +if (pid) +seq_printf (s,"%d\n" , pid); + } }rcu_read_unlock (); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 12/313 md/raid10: check slab-out-of-bounds in md_bitmap_get_counter
In reply to Greg Kroah-HartmanFrom: Li Nan <[email protected]>
[ Upstream commit 301867b1c16805aebbc306aafa6ecdc68b73c7e5 ]
If we write a large number to md/bitmap_set_bits, md_bitmap_checkpage() will return -EINVAL because 'page >= bitmap->pages', but the return value was not checked immediately in md_bitmap_get_counter() in order to set *blocks value and slab-out-of-bounds occurs.
Move check of 'page >= bitmap->pages' to md_bitmap_get_counter() and return directly if true.
--- drivers/md/md-bitmap.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/md/md-bitmap.c +9 -8
@@ -54,14 +54,7 @@ __acquires(bitmap->lock) {unsigned char *mappage; -if (page >= bitmap->pages) { -/* This can happen if bitmap_start_sync goes beyond -* End-of-device while looking for a whole page. -* It is harmless. -*/ -return -EINVAL ; - } - +WARN_ON_ONCE (page >= bitmap->pages);if (bitmap->bp[page].hijacked)/* it's hijacked, don't try to alloc */ return 0 ;
@@ -1369,6 +1362,14 @@ __acquires(bitmap->lock)sector_t csize;int err; +if (page >= bitmap->pages) { +/* +* This can happen if bitmap_start_sync goes beyond +* End-of-device while looking for a whole page or +* user set a huge number to sysfs bitmap_set_bits. +*/ +return NULL ; + } err =md_bitmap_checkpage (bitmap, page, create,0 ); if (bitmap->bp[page].hijacked ||
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 13/313 md/raid10: fix overflow of md/safe_mode_delay
In reply to Greg Kroah-HartmanFrom: Li Nan <[email protected]>
[ Upstream commit 6beb489b2eed25978523f379a605073f99240c50 ]
There is no input check when echo md/safe_mode_delay in safe_delay_store(). And msec might also overflow when HZ < 1000 in safe_delay_show(), Fix it by checking overflow in safe_delay_store() and use unsigned long conversion in safe_delay_show().
--- drivers/md/md.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/md/md.c +4 -3
@@ -3766,8 +3766,9 @@ int strict_strtoul_scaled(const char *cp, unsigned long *res, int scale)static ssize_t safe_delay_show (struct mddev *mddev,char *page) { -int msec = (mddev->safemode_delay*1000 )/HZ ; -return sprintf (page,"%d.%03d\n" , msec/1000 , msec%1000 ); +unsigned int msec = ((unsigned long )mddev->safemode_delay*1000 )/HZ ; + +return sprintf (page,"%u.%03u\n" , msec/1000 , msec%1000 ); }static ssize_t safe_delay_store (struct mddev *mddev,const char *cbuf,size_t len)
@@ -3779,7 +3780,7 @@ safe_delay_store(struct mddev *mddev, const char *cbuf, size_t len)return -EINVAL ; } -if (strict_strtoul_scaled (cbuf, &msec,3 ) <0 ) +if (strict_strtoul_scaled (cbuf, &msec,3 ) <0 || msec >UINT_MAX /HZ )return -EINVAL ;if (msec ==0 ) mddev->safemode_delay =0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 14/313 md/raid10: fix wrong setting of max_corr_read_errors
In reply to Greg Kroah-HartmanFrom: Li Nan <[email protected]>
[ Upstream commit f8b20a405428803bd9881881d8242c9d72c6b2b2 ]
There is no input check when echo md/max_read_errors and overflow might occur. Add check of input number.
--- drivers/md/md.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/md/md.c +2 -0
@@ -4441,6 +4441,8 @@ max_corrected_read_errors_store(struct mddev *mddev, const char *buf, size_t len rv =kstrtouint (buf,10 , &n);if (rv <0 )return rv; +if (n >INT_MAX ) +return -EINVAL ;atomic_set (&mddev->max_corr_read_errors, n);return len; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 15/313 md/raid10: fix null-ptr-deref of mreplace in raid10_sync_request
In reply to Greg Kroah-HartmanFrom: Li Nan <[email protected]>
[ Upstream commit 34817a2441747b48e444cb0e05d84e14bc9443da ]
There are two check of 'mreplace' in raid10_sync_request(). In the first check, 'need_replace' will be set and 'mreplace' will be used later if no-Faulty 'mreplace' exists, In the second check, 'mreplace' will be set to NULL if it is Faulty, but 'need_replace' will not be changed accordingly. null-ptr-deref occurs if Faulty is set between two check.
Fix it by merging two checks into one. And replace 'need_replace' with 'mreplace' because their values are always the same.
--- drivers/md/raid10.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
drivers/md/raid10.c +5 -9
@@ -3054,7 +3054,6 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr,int must_sync;int any_working;int need_recover =0 ; -int need_replace =0 ;struct raid10_info *mirror = &conf->mirrors[i];struct md_rdev *mrdev, *mreplace;
@@ -3066,11 +3065,10 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr, !test_bit(Faulty, &mrdev->flags) && !test_bit(In_sync, &mrdev->flags)) need_recover =1 ; -if (mreplace !=NULL && - !test_bit (Faulty, &mreplace->flags)) - need_replace =1 ; +if (mreplace &&test_bit (Faulty, &mreplace->flags)) + mreplace =NULL ; -if (!need_recover && !need_replace) { +if (!need_recover && !mreplace) {rcu_read_unlock ();continue ; }
@@ -3086,8 +3084,6 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr,rcu_read_unlock ();continue ; } -if (mreplace &&test_bit (Faulty, &mreplace->flags)) - mreplace =NULL ;/* Unless we are doing a full sync, or a replacement * we only need to recover the block if it is set in * the bitmap
@@ -3210,11 +3206,11 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr, bio = r10_bio->devs[1 ].repl_bio;if (bio) bio->bi_end_io =NULL ; -/* Note: if need_replace, then bio +/* Note: if replace is not NULL, then bio * cannot be NULL as r10buf_pool_alloc will * have allocated it. */ -if (!need_replace) +if (!mreplace)break ; bio->bi_next = biolist; biolist = bio;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 16/313 md/raid10: fix io loss while replacement replace rdev
In reply to Greg Kroah-HartmanFrom: Li Nan <[email protected]>
[ Upstream commit 2ae6aaf76912bae53c74b191569d2ab484f24bf3 ]
When removing a disk with replacement, the replacement will be used to replace rdev. During this process, there is a brief window in which both rdev and replacement are read as NULL in raid10_write_request(). This will result in io not being submitted but it should be.
//remove //write
raid10_remove_disk raid10_write_request
mirror->rdev = NULL
read rdev -> NULL mirror->rdev = mirror->replacement mirror->replacement = NULL read replacement -> NULL
Fix it by reading replacement first and rdev later, meanwhile, use smp_mb() to prevent memory reordering.
--- drivers/md/raid10.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
drivers/md/raid10.c +18 -4
@@ -751,8 +751,16 @@ static struct md_rdev *read_balance(struct r10conf *conf, disk = r10_bio->devs[slot].devnum; rdev =rcu_dereference (conf->mirrors[disk].replacement);if (rdev ==NULL ||test_bit (Faulty, &rdev->flags) || - r10_bio->devs[slot].addr + sectors > rdev->recovery_offset) + r10_bio->devs[slot].addr + sectors > + rdev->recovery_offset) { +/* +* Read replacement first to prevent reading both rdev +* and replacement as NULL during replacement replace +* rdev. +*/ +smp_mb (); rdev =rcu_dereference (conf->mirrors[disk].rdev); + }if (rdev ==NULL ||test_bit (Faulty, &rdev->flags))continue ;
@@ -1363,9 +1371,15 @@ static void raid10_write_request(struct mddev *mddev, struct bio *bio,for (i =0 ; i < conf->copies; i++) {int d = r10_bio->devs[i].devnum; -struct md_rdev *rdev =rcu_dereference (conf->mirrors[d].rdev); -struct md_rdev *rrdev =rcu_dereference ( - conf->mirrors[d].replacement); +struct md_rdev *rdev, *rrdev; + + rrdev =rcu_dereference (conf->mirrors[d].replacement); +/* +* Read replacement first to prevent reading both rdev and +* replacement as NULL during replacement replace rdev. +*/ +smp_mb (); + rdev =rcu_dereference (conf->mirrors[d].rdev);if (rdev == rrdev) rrdev =NULL ;if (rdev &&unlikely (test_bit (Blocked, &rdev->flags))) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 17/313 irqchip/jcore-aic: Kill use of irq_create_strict_mappings()
In reply to Greg Kroah-HartmanFrom: Marc Zyngier <[email protected]>
[ Upstream commit 5f8b938bd790cff6542c7fe3c1495c71f89fef1b ]
irq_create_strict_mappings() is a poor way to allow the use of a linear IRQ domain as a legacy one. Let's be upfront about it.
Stable-dep-of: 4848229494a3 ("irqchip/jcore-aic: Fix missing allocation of IRQ descriptors")
--- drivers/irqchip/irq-jcore-aic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/irqchip/irq-jcore-aic.c +2 -2
@@ -100,11 +100,11 @@ static int __init aic_irq_of_init(struct device_node *node, jcore_aic.irq_unmask = noop; jcore_aic.name ="AIC" ; - domain =irq_domain_add_linear (node, dom_sz, &jcore_aic_irqdomain_ops, + domain =irq_domain_add_legacy (node, dom_sz - min_irq, min_irq, min_irq, + &jcore_aic_irqdomain_ops, &jcore_aic);if (!domain)return -ENOMEM ; -irq_create_strict_mappings (domain, min_irq, min_irq, dom_sz - min_irq);return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 18/313 irqchip/jcore-aic: Fix missing allocation of IRQ descriptors
In reply to Greg Kroah-HartmanFrom: John Paul Adrian Glaubitz <[email protected]>
[ Upstream commit 4848229494a323eeaab62eee5574ef9f7de80374 ]
The initialization function for the J-Core AIC aic_irq_of_init() is currently missing the call to irq_alloc_descs() which allocates and initializes all the IRQ descriptors. Add missing function call and return the error code from irq_alloc_descs() in case the allocation fails.
--- drivers/irqchip/irq-jcore-aic.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/irqchip/irq-jcore-aic.c +7 -0
@@ -68,6 +68,7 @@ static int __init aic_irq_of_init(struct device_node *node,unsigned min_irq =JCORE_AIC2_MIN_HWIRQ ;unsigned dom_sz =JCORE_AIC_MAX_HWIRQ +1 ;struct irq_domain *domain; +int ret;pr_info ("Initializing J-Core AIC\n" );
@@ -100,6 +101,12 @@ static int __init aic_irq_of_init(struct device_node *node, jcore_aic.irq_unmask = noop; jcore_aic.name ="AIC" ; + ret =irq_alloc_descs (-1 , min_irq, dom_sz - min_irq, +of_node_to_nid (node)); + +if (ret <0 ) +return ret; + domain =irq_domain_add_legacy (node, dom_sz - min_irq, min_irq, min_irq, &jcore_aic_irqdomain_ops, &jcore_aic);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 19/313 tracing/timer: Add missing hrtimer modes to decode_hrtimer_mode().
In reply to Greg Kroah-HartmanFrom: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit 2951580ba6adb082bb6b7154a5ecb24e7c1f7569 ]
The trace output for the HRTIMER_MODE_.*_HARD modes is seen as a number since these modes are not decoded. The author was not aware of the fancy decoding function which makes the life easier.
Extend decode_hrtimer_mode() with the additional HRTIMER_MODE_.*_HARD modes.
--- include/trace/events/timer.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
include/trace/events/timer.h +5 -1
@@ -156,7 +156,11 @@ DEFINE_EVENT(timer_class, timer_cancel, { HRTIMER_MODE_ABS_SOFT, "ABS|SOFT" }, \ { HRTIMER_MODE_REL_SOFT, "REL|SOFT" }, \ { HRTIMER_MODE_ABS_PINNED_SOFT, "ABS|PINNED|SOFT" }, \ - { HRTIMER_MODE_REL_PINNED_SOFT, "REL|PINNED|SOFT" }) + { HRTIMER_MODE_REL_PINNED_SOFT, "REL|PINNED|SOFT" }, \ + { HRTIMER_MODE_ABS_HARD, "ABS|HARD" }, \ + { HRTIMER_MODE_REL_HARD, "REL|HARD" }, \ + { HRTIMER_MODE_ABS_PINNED_HARD, "ABS|PINNED|HARD" }, \ + { HRTIMER_MODE_REL_PINNED_HARD, "REL|PINNED|HARD" })/** * hrtimer_init - called when the hrtimer is initialized
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 20/313 clocksource/drivers/cadence-ttc: Use ttc driver as platform driver
In reply to Greg Kroah-HartmanFrom: Rajan Vaja <[email protected]>
[ Upstream commit f5ac896b6a23eb46681cdbef440c1d991b04e519 ]
Currently TTC driver is TIMER_OF_DECLARE type driver. Because of that, TTC driver may be initialized before other clock drivers. If TTC driver is dependent on that clock driver then initialization of TTC driver will failed.
So use TTC driver as platform driver instead of using TIMER_OF_DECLARE.
Stable-dep-of: 8b5bf64c89c7 ("clocksource/drivers/cadence-ttc: Fix memory leak in ttc_timer_probe")
--- drivers/clocksource/timer-cadence-ttc.c | 26 +++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-)
drivers/clocksource/timer-cadence-ttc.c +18 -8
@@ -15,6 +15,8 @@#include <linux/of_irq.h> #include <linux/slab.h> #include <linux/sched_clock.h> +#include <linux/module.h> +#include <linux/of_platform.h> /* * This driver configures the 2 16/32-bit count-up timers as follows:
@@ -464,13 +466,7 @@ static int __init ttc_setup_clockevent(struct clk *clk,return err; } -/** -* ttc_timer_init - Initialize the timer -* -* Initializes the timer hardware and register the clock source and clock event -* timers with Linux kernal timer framework -*/ -static int __init ttc_timer_init (struct device_node *timer) +static int __init ttc_timer_probe (struct platform_device *pdev) {unsigned int irq;void __iomem *timer_baseaddr;
@@ -478,6 +474,7 @@ static int __init ttc_timer_init(struct device_node *timer)static int initialized;int clksel, ret;u32 timer_width =16 ; +struct device_node *timer = pdev->dev.of_node;if (initialized)return 0 ;
@@ -532,4 +529,17 @@ static int __init ttc_timer_init(struct device_node *timer)return 0 ; } -TIMER_OF_DECLARE (ttc,"cdns,ttc" , ttc_timer_init); +static const struct of_device_id ttc_timer_of_match[] = { + {.compatible ="cdns,ttc" }, + {}, +}; + +MODULE_DEVICE_TABLE (of, ttc_timer_of_match); + +static struct platform_driver ttc_timer_driver = { + .driver = { + .name ="cdns_ttc_timer" , + .of_match_table = ttc_timer_of_match, + }, +}; +builtin_platform_driver_probe (ttc_timer_driver, ttc_timer_probe);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 21/313 clocksource/drivers/cadence-ttc: Fix memory leak in ttc_timer_probe
In reply to Greg Kroah-HartmanFrom: Feng Mingxi <[email protected]>
[ Upstream commit 8b5bf64c89c7100c921bd807ba39b2eb003061ab ]
Smatch reports:drivers/clocksource/timer-cadence-ttc.c:529 ttc_timer_probe()
warn: 'timer_baseaddr' from of_iomap() not released on lines: 498,508,516.
timer_baseaddr may have the problem of not being released after use, I replaced it with the devm_of_iomap() function and added the clk_put() function to cleanup the "clk_ce" and "clk_cs".
--- drivers/clocksource/timer-cadence-ttc.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/clocksource/timer-cadence-ttc.c +13 -6
@@ -486,10 +486,10 @@ static int __init ttc_timer_probe(struct platform_device *pdev)* and use it. Note that the event timer uses the interrupt and it's the * 2nd TTC hence the irq_of_parse_and_map(,1) */ - timer_baseaddr =of_iomap (timer,0 ); -if (!timer_baseaddr) { + timer_baseaddr =devm_of_iomap (&pdev->dev, timer,0 ,NULL ); +if (IS_ERR (timer_baseaddr)) {pr_err ("ERROR: invalid timer base address\n" ); -return -ENXIO ; +return PTR_ERR (timer_baseaddr); } irq =irq_of_parse_and_map (timer,1 );
@@ -513,20 +513,27 @@ static int __init ttc_timer_probe(struct platform_device *pdev) clk_ce =of_clk_get (timer, clksel);if (IS_ERR (clk_ce)) {pr_err ("ERROR: timer input clock not found\n" ); -return PTR_ERR (clk_ce); + ret =PTR_ERR (clk_ce); + goto put_clk_cs; } ret =ttc_setup_clocksource (clk_cs, timer_baseaddr, timer_width);if (ret) -return ret; + goto put_clk_ce; ret =ttc_setup_clockevent (clk_ce, timer_baseaddr +4 , irq);if (ret) -return ret; + goto put_clk_ce;pr_info ("%pOFn #0 at %p, irq=%d\n" , timer, timer_baseaddr, irq);return 0 ; + +put_clk_ce: +clk_put (clk_ce); +put_clk_cs: +clk_put (clk_cs); +return ret; }static const struct of_device_id ttc_timer_of_match[] = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 22/313 PM: domains: fix integer overflow issues in genpd_parse_state()
In reply to Greg Kroah-HartmanFrom: Nikita Zhandarovich <[email protected]>
[ Upstream commit e5d1c8722083f0332dcd3c85fa1273d85fb6bed8 ]
Currently, while calculating residency and latency values, right operands may overflow if resulting values are big enough.
To prevent this, albeit unlikely case, play it safe and convert right operands to left ones' type s64.
Found by Linux Verification Center (linuxtesting.org) with static analysis tool SVACE.
--- drivers/base/power/domain.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/base/power/domain.c +3 -3
@@ -2596,10 +2596,10 @@ static int genpd_parse_state(struct genpd_power_state *genpd_state, err =of_property_read_u32 (state_node,"min-residency-us" , &residency);if (!err) - genpd_state->residency_ns =1000 * residency; + genpd_state->residency_ns =1000LL * residency; - genpd_state->power_on_latency_ns =1000 * exit_latency; - genpd_state->power_off_latency_ns =1000 * entry_latency; + genpd_state->power_on_latency_ns =1000LL * exit_latency; + genpd_state->power_off_latency_ns =1000LL * entry_latency; genpd_state->fwnode = &state_node->fwnode;return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 23/313 powercap: RAPL: Fix CONFIG_IOSF_MBI dependency
In reply to Greg Kroah-HartmanFrom: Zhang Rui <[email protected]>
[ Upstream commit 4658fe81b3f8afe8adf37734ec5fe595d90415c6 ]
After commit 3382388d7148 ("intel_rapl: abstract RAPL common code"), accessing to IOSF_MBI interface is done in the RAPL common code.
Thus it is the CONFIG_INTEL_RAPL_CORE that has dependency of CONFIG_IOSF_MBI, while CONFIG_INTEL_RAPL_MSR does not.
This problem was not exposed previously because all the previous RAPL common code users, aka, the RAPL MSR and MMIO I/F drivers, have CONFIG_IOSF_MBI selected.
Fix the CONFIG_IOSF_MBI dependency in RAPL code. This also fixes a build time failure when the RAPL TPMI I/F driver is introduced without selecting CONFIG_IOSF_MBI.
x86_64-linux-ld: vmlinux.o: in function `set_floor_freq_atom':
intel_rapl_common.c:(.text+0x2dac9b8): undefined reference to `iosf_mbi_write'
x86_64-linux-ld: intel_rapl_common.c:(.text+0x2daca66): undefined reference to `iosf_mbi_read'
Reference to iosf_mbi.h is also removed from the RAPL MSR I/F driver.
--- drivers/powercap/Kconfig | 4 +++- drivers/powercap/intel_rapl_msr.c | 1 - 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/powercap/Kconfig +3 -1
@@ -18,10 +18,12 @@ if POWERCAP # Client driver configurations go here. config INTEL_RAPL_CORE tristate + depends on PCI + select IOSF_MBI config INTEL_RAPL tristate "Intel RAPL Support via MSR Interface" - depends on X86 && IOSF_MBI + depends on X86 && PCI select INTEL_RAPL_CORE ---help--- This enables support for the Intel Running Average Power Limit (RAPL)
drivers/powercap/intel_rapl_msr.c +0 -1
@@ -22,7 +22,6 @@#include <linux/processor.h> #include <linux/platform_device.h> -#include <asm/iosf_mbi.h> #include <asm/cpu_device_id.h> #include <asm/intel-family.h>
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 24/313 ARM: 9303/1: kprobes: avoid missing-declaration warnings
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 1b9c3ddcec6a55e15d3e38e7405e2d078db02020 ]
checker_stack_use_t32strd() and kprobe_handler() can be made static since they are not used from other files, while coverage_start_registers() and __kprobes_test_case() are used from assembler code, and just need a declaration to avoid a warning with the global definition.
arch/arm/probes/kprobes/checkers-common.c:43:18: error: no previous prototype for 'checker_stack_use_t32strd' arch/arm/probes/kprobes/core.c:236:16: error: no previous prototype for 'kprobe_handler' arch/arm/probes/kprobes/test-core.c:723:10: error: no previous prototype for 'coverage_start_registers' arch/arm/probes/kprobes/test-core.c:918:14: error: no previous prototype for '__kprobes_test_case_start' arch/arm/probes/kprobes/test-core.c:952:14: error: no previous prototype for '__kprobes_test_case_end_16' arch/arm/probes/kprobes/test-core.c:967:14: error: no previous prototype for '__kprobes_test_case_end_32'
--- arch/arm/probes/kprobes/checkers-common.c | 2 +- arch/arm/probes/kprobes/core.c | 2 +- arch/arm/probes/kprobes/opt-arm.c | 2 -- arch/arm/probes/kprobes/test-core.c | 2 +- arch/arm/probes/kprobes/test-core.h | 4 ++++ 5 files changed, 7 insertions(+), 5 deletions(-)
arch/arm/probes/kprobes/checkers-common.c +1 -1
@@ -40,7 +40,7 @@ enum probes_insn checker_stack_use_imm_0xx(probes_opcode_t insn,* Different from other insn uses imm8, the real addressing offset of * STRD in T32 encoding should be imm8 * 4. See ARMARM description. */ -enum probes_insn checker_stack_use_t32strd (probes_opcode_t insn, +static enum probes_insn checker_stack_use_t32strd (probes_opcode_t insn,struct arch_probes_insn *asi,const struct decode_header *h) {
arch/arm/probes/kprobes/core.c +1 -1
@@ -231,7 +231,7 @@ singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb)* kprobe, and that level is reserved for user kprobe handlers, so we can't * risk encountering a new kprobe in an interrupt handler. */ -void __kprobes kprobe_handler (struct pt_regs *regs) +static void __kprobes kprobe_handler (struct pt_regs *regs) {struct kprobe *p, *cur;struct kprobe_ctlblk *kcb;
arch/arm/probes/kprobes/opt-arm.c +0 -2
@@ -145,8 +145,6 @@ __arch_remove_optimized_kprobe(struct optimized_kprobe *op, int dirty) } } -extern void kprobe_handler (struct pt_regs *regs); -static void optimized_callback (struct optimized_kprobe *op,struct pt_regs *regs) {
arch/arm/probes/kprobes/test-core.c +1 -1
@@ -720,7 +720,7 @@ static const char coverage_register_lookup[16] = { [REG_TYPE_NOSPPCX] = COVERAGE_ANY_REG | COVERAGE_SP, }; -unsigned coverage_start_registers (const struct decode_header *h) +static unsigned coverage_start_registers (const struct decode_header *h) {unsigned regs =0 ;int i;
arch/arm/probes/kprobes/test-core.h +4 -0
@@ -453,3 +453,7 @@ void kprobe_thumb32_test_cases(void);#else void kprobe_arm_test_cases (void );#endif + +void __kprobes_test_case_start (void ); +void __kprobes_test_case_end_16 (void ); +void __kprobes_test_case_end_32 (void );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 25/313 evm: Complete description of evm_inode_setattr()
In reply to Greg Kroah-HartmanFrom: Roberto Sassu <[email protected]>
[ Upstream commit b1de86d4248b273cb12c4cd7d20c08d459519f7d ]
Add the description for missing parameters of evm_inode_setattr() to avoid the warning arising with W=n compile option.
--- security/integrity/evm/evm_main.c | 2 ++ 1 file changed, 2 insertions(+)
security/integrity/evm/evm_main.c +2 -0
@@ -471,7 +471,9 @@ void evm_inode_post_removexattr(struct dentry *dentry, const char *xattr_name)/** * evm_inode_setattr - prevent updating an invalid EVM extended attribute +* @idmap: idmap of the mount * @dentry: pointer to the affected dentry +* @attr: iattr structure containing the new file attributes * * Permit update of file attributes when files have a valid EVM signature, * except in the case of them having an immutable portable signature.
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 26/313 pstore/ram: Add check for kstrdup
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit d97038d5ec2062733c1e016caf9baaf68cf64ea1 ]
Add check for the return value of kstrdup() and return the error if it fails in order to avoid NULL pointer dereference.
--- fs/pstore/ram_core.c | 2 ++ 1 file changed, 2 insertions(+)
fs/pstore/ram_core.c +2 -0
@@ -579,6 +579,8 @@ struct persistent_ram_zone *persistent_ram_new(phys_addr_t start, size_t size,raw_spin_lock_init (&prz->buffer_lock); prz->flags = flags; prz->label =kstrdup (label,GFP_KERNEL ); +if (!prz->label) + goto err; ret =persistent_ram_buffer_map (start, size, prz, memtype);if (ret)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 27/313 ima: Fix build warnings
In reply to Greg Kroah-HartmanFrom: Roberto Sassu <[email protected]>
[ Upstream commit 95526d13038c2bbddd567a4d8e39fac42484e182 ]
Fix build warnings (function parameters description) for ima_collect_modsig(), ima_match_policy() and ima_parse_add_rule().
--- security/integrity/ima/ima_modsig.c | 3 +++ security/integrity/ima/ima_policy.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)
security/integrity/ima/ima_modsig.c +3 -0
@@ -109,6 +109,9 @@ int ima_read_modsig(enum ima_hooks func, const void *buf, loff_t buf_len,/** * ima_collect_modsig - Calculate the file hash without the appended signature. +* @modsig: parsed module signature +* @buf: data to verify the signature on +* @size: data size * * Since the modsig is part of the file contents, the hash used in its signature * isn't the same one ordinarily calculated by IMA. Therefore PKCS7 code
security/integrity/ima/ima_policy.c +2 -1
@@ -500,6 +500,7 @@ static int get_subaction(struct ima_rule_entry *rule, enum ima_hooks func)* @secid: LSM secid of the task to be validated * @func: IMA hook identifier * @mask: requested action (MAY_READ | MAY_WRITE | MAY_APPEND | MAY_EXEC) +* @flags: IMA actions to consider (e.g. IMA_MEASURE | IMA_APPRAISE) * @pcr: set the pcr to extend * @template_desc: the template that should be used for this rule *
@@ -1266,7 +1267,7 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)/** * ima_parse_add_rule - add a rule to ima_policy_rules -* @rule - ima measurement policy rule +* @rule: ima measurement policy rule * * Avoid locking by allowing just one writer at a time in ima_write_policy() * Returns the length of the rule parsed, an error code on failure
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 28/313 wifi: ath9k: fix AR9003 mac hardware hang check register offset calculation
In reply to Greg Kroah-HartmanFrom: Peter Seiderer <[email protected]>
[ Upstream commit 3e56c80931c7615250fe4bf83f93b57881969266 ]
Fix ath9k_hw_verify_hang()/ar9003_hw_detect_mac_hang() register offset calculation (do not overflow the shift for the second register/queues above five, use the register layout described in the comments above ath9k_hw_verify_hang() instead).
--- drivers/net/wireless/ath/ath9k/ar9003_hw.c | 27 ++++++++++++++-------- 1 file changed, 18 insertions(+), 9 deletions(-)
drivers/net/wireless/ath/ath9k/ar9003_hw.c +18 -9
@@ -1099,17 +1099,22 @@ static bool ath9k_hw_verify_hang(struct ath_hw *ah, unsigned int queue) {u32 dma_dbg_chain, dma_dbg_complete;u8 dcu_chain_state, dcu_complete_state; +unsigned int dbg_reg, reg_offset;int i; -for (i =0 ; i <NUM_STATUS_READS ; i++) { -if (queue <6 ) - dma_dbg_chain =REG_READ (ah,AR_DMADBG_4 ); -else - dma_dbg_chain =REG_READ (ah,AR_DMADBG_5 ); +if (queue <6 ) { + dbg_reg =AR_DMADBG_4 ; + reg_offset = queue *5 ; + }else { + dbg_reg =AR_DMADBG_5 ; + reg_offset = (queue -6 ) *5 ; + } +for (i =0 ; i <NUM_STATUS_READS ; i++) { + dma_dbg_chain =REG_READ (ah, dbg_reg); dma_dbg_complete =REG_READ (ah,AR_DMADBG_6 ); - dcu_chain_state = (dma_dbg_chain >> (5 * queue)) &0x1f ; + dcu_chain_state = (dma_dbg_chain >> reg_offset) &0x1f ; dcu_complete_state = dma_dbg_complete &0x3 ;if ((dcu_chain_state !=0x6 ) || (dcu_complete_state !=0x1 ))
@@ -1128,6 +1133,7 @@ static bool ar9003_hw_detect_mac_hang(struct ath_hw *ah)u8 dcu_chain_state, dcu_complete_state;bool dcu_wait_frdone = false;unsigned long chk_dcu =0 ; +unsigned int reg_offset;unsigned int i =0 ; dma_dbg_4 =REG_READ (ah,AR_DMADBG_4 );
@@ -1139,12 +1145,15 @@ static bool ar9003_hw_detect_mac_hang(struct ath_hw *ah) goto exit;for (i =0 ; i <ATH9K_NUM_TX_QUEUES ; i++) { -if (i <6 ) +if (i <6 ) { chk_dbg = dma_dbg_4; -else + reg_offset = i *5 ; + }else { chk_dbg = dma_dbg_5; + reg_offset = (i -6 ) *5 ; + } - dcu_chain_state = (chk_dbg >> (5 * i)) &0x1f ; + dcu_chain_state = (chk_dbg >> reg_offset) &0x1f ;if (dcu_chain_state ==0x6 ) { dcu_wait_frdone = true; chk_dcu |=BIT (i);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 29/313 wifi: ath9k: avoid referencing uninit memory in ath9k_wmi_ctrl_rx
In reply to Greg Kroah-HartmanFrom: Fedor Pchelkin <[email protected]>
[ Upstream commit f24292e827088bba8de7158501ac25a59b064953 ]
For the reasons also described in commit b383e8abed41 ("wifi: ath9k: avoid uninit memory read in ath9k_htc_rx_msg()"), ath9k_htc_rx_msg() should validate pkt_len before accessing the SKB.
For example, the obtained SKB may have been badly constructed with pkt_len = 8. In this case, the SKB can only contain a valid htc_frame_hdr but after being processed in ath9k_htc_rx_msg() and passed to ath9k_wmi_ctrl_rx() endpoint RX handler, it is expected to have a WMI command header which should be located inside its data payload.
Implement sanity checking inside ath9k_wmi_ctrl_rx(). Otherwise, uninit memory can be referenced.
Tested on Qualcomm Atheros Communications AR9271 802.11n .
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
--- drivers/net/wireless/ath/ath9k/wmi.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/ath/ath9k/wmi.c +4 -0
@@ -218,6 +218,10 @@ static void ath9k_wmi_ctrl_rx(void *priv, struct sk_buff *skb,if (unlikely (wmi->stopped)) goto free_skb; +/* Validate the obtained SKB. */ +if (unlikely (skb->len <sizeof (struct wmi_cmd_hdr ))) + goto free_skb; + hdr = (struct wmi_cmd_hdr *) skb->data; cmd_id =be16_to_cpu (hdr->command_id);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 30/313 samples/bpf: Fix buffer overflow in tcp_basertt
In reply to Greg Kroah-HartmanFrom: Pengcheng Yang <[email protected]>
[ Upstream commit f4dea9689c5fea3d07170c2cb0703e216f1a0922 ]
Using sizeof(nv) or strlen(nv)+1 is correct.
--- samples/bpf/tcp_basertt_kern.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
samples/bpf/tcp_basertt_kern.c +1 -1
@@ -47,7 +47,7 @@ int bpf_basertt(struct bpf_sock_ops *skops)case BPF_SOCK_OPS_BASE_RTT : n =bpf_getsockopt (skops,SOL_TCP ,TCP_CONGESTION , cong,sizeof (cong)); -if (!n && !__builtin_memcmp (cong, nv,sizeof (nv)+1 )) { +if (!n && !__builtin_memcmp (cong, nv,sizeof (nv))) {/* Set base_rtt to 80us */ rv =80 ; }else if (n) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 31/313 spi: spi-geni-qcom: Correct CS_TOGGLE bit in SPI_TRANS_CFG
In reply to Greg Kroah-HartmanFrom: Vijaya Krishna Nivarthi <[email protected]>
[ Upstream commit 5fd7c99ecf45c8ee8a9b1268f0ffc91cc6271da2 ]
The CS_TOGGLE bit when set is supposed to instruct FW to toggle CS line between words. The driver with intent of disabling this behaviour has been unsetting BIT(0). This has not caused any trouble so far because the original BIT(1) is untouched and BIT(0) likely wasn't being used.
Correct this to prevent a potential future bug.
--- drivers/spi/spi-geni-qcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-geni-qcom.c +1 -1
@@ -32,7 +32,7 @@#define CS_DEMUX_OUTPUT_SEL GENMASK(3, 0)#define SE_SPI_TRANS_CFG 0x25c -#define CS_TOGGLE BIT(0) +#define CS_TOGGLE BIT(1)#define SE_SPI_WORD_LEN 0x268#define WORD_LEN_MSK GENMASK(9, 0)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 32/313 wifi: mwifiex: Fix the size of a memory allocation in mwifiex_ret_802_11_scan()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit d9aef04fcfa81ee4fb2804a21a3712b7bbd936af ]
The type of "mwifiex_adapter->nd_info" is "struct cfg80211_wowlan_nd_info", not "struct cfg80211_wowlan_nd_match".
Use struct_size() to ease the computation of the needed size.
The current code over-allocates some memory, so is safe. But it wastes 32 bytes.
--- drivers/net/wireless/marvell/mwifiex/scan.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/marvell/mwifiex/scan.c +3 -3
@@ -2202,9 +2202,9 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,if (nd_config) { adapter->nd_info = -kzalloc (sizeof (struct cfg80211_wowlan_nd_match ) + -sizeof (struct cfg80211_wowlan_nd_match *) * - scan_rsp->number_of_sets,GFP_ATOMIC ); +kzalloc (struct_size (adapter->nd_info, matches, + scan_rsp->number_of_sets), +GFP_ATOMIC );if (adapter->nd_info) adapter->nd_info->n_matches = scan_rsp->number_of_sets;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 33/313 nfc: constify several pointers to u8, char and sk_buff
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 3df40eb3a2ea58bf404a38f15a7a2768e4762cb0 ]
Several functions receive pointers to u8, char or sk_buff but do not modify the contents so make them const. This allows doing the same for local variables and in total makes the code a little bit safer.
Stable-dep-of: 0d9b41daa590 ("nfc: llcp: fix possible use of uninitialized variable in nfc_llcp_send_connect()")
--- include/net/nfc/nfc.h | 4 ++-- net/nfc/core.c | 4 ++-- net/nfc/hci/llc_shdlc.c | 10 ++++----- net/nfc/llcp.h | 8 +++---- net/nfc/llcp_commands.c | 46 ++++++++++++++++++++++------------------- net/nfc/llcp_core.c | 44 +++++++++++++++++++++------------------ net/nfc/nfc.h | 2 +- 7 files changed, 63 insertions(+), 55 deletions(-)
include/net/nfc/nfc.h +2 -2
@@ -266,7 +266,7 @@ struct sk_buff *nfc_alloc_send_skb(struct nfc_dev *dev, struct sock *sk,struct sk_buff *nfc_alloc_recv_skb (unsigned int size,gfp_t gfp);int nfc_set_remote_general_bytes (struct nfc_dev *dev, -u8 *gt,u8 gt_len); +const u8 *gt,u8 gt_len);u8 *nfc_get_local_general_bytes (struct nfc_dev *dev,size_t *gb_len); int nfc_fw_download_done(struct nfc_dev *dev, const char *firmware_name,
@@ -280,7 +280,7 @@ int nfc_dep_link_is_up(struct nfc_dev *dev, u32 target_idx, u8 comm_mode, u8 rf_mode);int nfc_tm_activated (struct nfc_dev *dev,u32 protocol,u8 comm_mode, -u8 *gb,size_t gb_len); +const u8 *gb,size_t gb_len);int nfc_tm_deactivated (struct nfc_dev *dev);int nfc_tm_data_received (struct nfc_dev *dev,struct sk_buff *skb);
net/nfc/core.c +2 -2
@@ -634,7 +634,7 @@ int nfc_disable_se(struct nfc_dev *dev, u32 se_idx)return rc; } -int nfc_set_remote_general_bytes (struct nfc_dev *dev,u8 *gb,u8 gb_len) +int nfc_set_remote_general_bytes (struct nfc_dev *dev,const u8 *gb,u8 gb_len) {pr_debug ("dev_name=%s gb_len=%d\n" ,dev_name (&dev->dev), gb_len);
@@ -663,7 +663,7 @@ int nfc_tm_data_received(struct nfc_dev *dev, struct sk_buff *skb)EXPORT_SYMBOL (nfc_tm_data_received);int nfc_tm_activated (struct nfc_dev *dev,u32 protocol,u8 comm_mode, -u8 *gb,size_t gb_len) +const u8 *gb,size_t gb_len) {int rc;
net/nfc/hci/llc_shdlc.c +5 -5
@@ -123,7 +123,7 @@ static bool llc_shdlc_x_lteq_y_lt_z(int x, int y, int z)return ((y >= x) || (y < z)) ? true : false; } -static struct sk_buff *llc_shdlc_alloc_skb (struct llc_shdlc *shdlc, +static struct sk_buff *llc_shdlc_alloc_skb (const struct llc_shdlc *shdlc,int payload_len) {struct sk_buff *skb;
@@ -137,7 +137,7 @@ static struct sk_buff *llc_shdlc_alloc_skb(struct llc_shdlc *shdlc, }/* immediately sends an S frame. */ -static int llc_shdlc_send_s_frame (struct llc_shdlc *shdlc, +static int llc_shdlc_send_s_frame (const struct llc_shdlc *shdlc,enum sframe_type sframe_type,int nr) {int r;
@@ -159,7 +159,7 @@ static int llc_shdlc_send_s_frame(struct llc_shdlc *shdlc, }/* immediately sends an U frame. skb may contain optional payload */ -static int llc_shdlc_send_u_frame (struct llc_shdlc *shdlc, +static int llc_shdlc_send_u_frame (const struct llc_shdlc *shdlc,struct sk_buff *skb,enum uframe_modifier uframe_modifier) {
@@ -361,7 +361,7 @@ static void llc_shdlc_connect_complete(struct llc_shdlc *shdlc, int r)wake_up (shdlc->connect_wq); } -static int llc_shdlc_connect_initiate (struct llc_shdlc *shdlc) +static int llc_shdlc_connect_initiate (const struct llc_shdlc *shdlc) {struct sk_buff *skb;
@@ -377,7 +377,7 @@ static int llc_shdlc_connect_initiate(struct llc_shdlc *shdlc)return llc_shdlc_send_u_frame (shdlc, skb,U_FRAME_RSET ); } -static int llc_shdlc_connect_send_ua (struct llc_shdlc *shdlc) +static int llc_shdlc_connect_send_ua (const struct llc_shdlc *shdlc) {struct sk_buff *skb;
net/nfc/llcp.h +4 -4
@@ -221,15 +221,15 @@ struct sock *nfc_llcp_accept_dequeue(struct sock *sk, struct socket *newsock);/* TLV API */ int nfc_llcp_parse_gb_tlv (struct nfc_llcp_local *local, -u8 *tlv_array,u16 tlv_array_len); +const u8 *tlv_array,u16 tlv_array_len);int nfc_llcp_parse_connection_tlv (struct nfc_llcp_sock *sock, -u8 *tlv_array,u16 tlv_array_len); +const u8 *tlv_array,u16 tlv_array_len);/* Commands API */ void nfc_llcp_recv (void *data,struct sk_buff *skb,int err); -u8 *nfc_llcp_build_tlv (u8 type,u8 *value,u8 value_length,u8 *tlv_length); +u8 *nfc_llcp_build_tlv (u8 type,const u8 *value,u8 value_length,u8 *tlv_length);struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdres_tlv (u8 tid,u8 sap); -struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdreq_tlv (u8 tid,char *uri, +struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdreq_tlv (u8 tid,const char *uri,size_t uri_len);void nfc_llcp_free_sdp_tlv (struct nfc_llcp_sdp_tlv *sdp);void nfc_llcp_free_sdp_tlv_list (struct hlist_head *sdp_head);
net/nfc/llcp_commands.c +25 -21
132 lines not on this page · raw message
net/nfc/llcp_core.c +24 -20
142 lines not on this page · raw message
net/nfc/nfc.h +1 -1
@@ -48,7 +48,7 @@ void nfc_llcp_mac_is_up(struct nfc_dev *dev, u32 target_idx, u8 comm_mode, u8 rf_mode);int nfc_llcp_register_device (struct nfc_dev *dev);void nfc_llcp_unregister_device (struct nfc_dev *dev); -int nfc_llcp_set_remote_gb (struct nfc_dev *dev,u8 *gb,u8 gb_len); +int nfc_llcp_set_remote_gb (struct nfc_dev *dev,const u8 *gb,u8 gb_len);u8 *nfc_llcp_general_bytes (struct nfc_dev *dev,size_t *general_bytes_len);int nfc_llcp_data_received (struct nfc_dev *dev,struct sk_buff *skb);struct nfc_llcp_local *nfc_llcp_find_local (struct nfc_dev *dev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 34/313 nfc: llcp: fix possible use of uninitialized variable in nfc_llcp_send_connect()
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 0d9b41daa5907756a31772d8af8ac5ff25cf17c1 ]
If sock->service_name is NULL, the local variable service_name_tlv_length will not be assigned by nfc_llcp_build_tlv(), later leading to using value frmo the stack. Smatch warning:
net/nfc/llcp_commands.c:442 nfc_llcp_send_connect() error: uninitialized symbol 'service_name_tlv_length'.
--- net/nfc/llcp_commands.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/nfc/llcp_commands.c +2 -1
@@ -394,7 +394,8 @@ int nfc_llcp_send_connect(struct nfc_llcp_sock *sock)const u8 *service_name_tlv =NULL ;const u8 *miux_tlv =NULL ;const u8 *rw_tlv =NULL ; -u8 service_name_tlv_length, miux_tlv_length, rw_tlv_length, rw; +u8 service_name_tlv_length =0 ; +u8 miux_tlv_length, rw_tlv_length, rw;int err;u16 size =0 ;__be16 miux;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 35/313 regulator: core: Fix more error checking for debugfs_create_dir()
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 2715bb11cfff964aa33946847f9527cfbd4874f5 ]
In case of failure, debugfs_create_dir() does not return NULL, but an error pointer. Most incorrect error checks were fixed, but the one in create_regulator() was forgotten.
Fix the remaining error check.
--- drivers/regulator/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/core.c +1 -1
@@ -1710,7 +1710,7 @@ static struct regulator *create_regulator(struct regulator_dev *rdev,if (err != -EEXIST ) regulator->debugfs =debugfs_create_dir (supply_name, rdev->debugfs); -if (!regulator->debugfs) { +if (IS_ERR (regulator->debugfs)) {rdev_dbg (rdev,"Failed to create debugfs directory\n" ); }else { debugfs_create_u32("uA_load", 0444, regulator->debugfs,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 36/313 regulator: core: Streamline debugfs operations
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 08880713ceec023dd94d634f1e8902728c385939 ]
If CONFIG_DEBUG_FS is not set:
regulator: Failed to create debugfs directory
...
regulator-dummy: Failed to create debugfs directory
As per the comments for debugfs_create_dir(), errors returned by this function should be expected, and ignored:
* If debugfs is not enabled in the kernel, the value -%ENODEV will be
* returned.
*
* NOTE: it's expected that most callers should _ignore_ the errors returned
* by this function. Other debugfs functions handle the fact that the "dentry"
* passed to them could be an error and they don't crash in that case.
* Drivers should generally work fine even if debugfs fails to init anyway.
Adhere to the debugfs spirit, and streamline all operations by:
1. Demoting the importance of the printed error messages to debug level, like is already done in create_regulator(),
2. Further ignoring any returned errors, as by design, all debugfs functions are no-ops when passed an error pointer.
--- drivers/regulator/core.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-)
drivers/regulator/core.c +13 -17
@@ -1710,19 +1710,17 @@ static struct regulator *create_regulator(struct regulator_dev *rdev,if (err != -EEXIST ) regulator->debugfs =debugfs_create_dir (supply_name, rdev->debugfs); -if (IS_ERR (regulator->debugfs)) { +if (IS_ERR (regulator->debugfs))rdev_dbg (rdev,"Failed to create debugfs directory\n" ); - }else { -debugfs_create_u32 ("uA_load" ,0444 , regulator->debugfs, - ®ulator->uA_load); -debugfs_create_u32 ("min_uV" ,0444 , regulator->debugfs, - ®ulator->voltage[PM_SUSPEND_ON ].min_uV); -debugfs_create_u32 ("max_uV" ,0444 , regulator->debugfs, - ®ulator->voltage[PM_SUSPEND_ON ].max_uV); -debugfs_create_file ("constraint_flags" ,0444 , - regulator->debugfs, regulator, - &constraint_flags_fops); - } + +debugfs_create_u32 ("uA_load" ,0444 , regulator->debugfs, + ®ulator->uA_load); +debugfs_create_u32 ("min_uV" ,0444 , regulator->debugfs, + ®ulator->voltage[PM_SUSPEND_ON ].min_uV); +debugfs_create_u32 ("max_uV" ,0444 , regulator->debugfs, + ®ulator->voltage[PM_SUSPEND_ON ].max_uV); +debugfs_create_file ("constraint_flags" ,0444 , regulator->debugfs, + regulator, &constraint_flags_fops);/* * Check now if the regulator is an always on regulator - if
@@ -4906,10 +4904,8 @@ static void rdev_init_debugfs(struct regulator_dev *rdev) } rdev->debugfs =debugfs_create_dir (rname, debugfs_root); -if (IS_ERR (rdev->debugfs)) { -rdev_warn (rdev,"Failed to create debugfs directory\n" ); -return ; - } +if (IS_ERR (rdev->debugfs)) +rdev_dbg (rdev,"Failed to create debugfs directory\n" );debugfs_create_u32 ("use_count" ,0444 , rdev->debugfs, &rdev->use_count);
@@ -5797,7 +5793,7 @@ static int __init regulator_init(void) debugfs_root =debugfs_create_dir ("regulator" ,NULL );if (IS_ERR (debugfs_root)) -pr_warn ("regulator: Failed to create debugfs directory\n" ); +pr_debug ("regulator: Failed to create debugfs directory\n" );#ifdef CONFIG_DEBUG_FS debugfs_create_file("supply_map", 0444, debugfs_root, NULL,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 37/313 wifi: orinoco: Fix an error handling path in spectrum_cs_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 925244325159824385209e3e0e3f91fa6bf0646c ]
Should spectrum_cs_config() fail, some resources need to be released as already done in the remove function.
While at it, remove a useless and erroneous comment. The probe is spectrum_cs_probe(), not spectrum_cs_attach().
--- drivers/net/wireless/intersil/orinoco/spectrum_cs.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/net/wireless/intersil/orinoco/spectrum_cs.c +11 -2
@@ -157,6 +157,7 @@ spectrum_cs_probe(struct pcmcia_device *link) {struct orinoco_private *priv;struct orinoco_pccard *card; +int ret; priv = alloc_orinocodev(sizeof(*card), &link->dev, spectrum_cs_hard_reset,
@@ -169,8 +170,16 @@ spectrum_cs_probe(struct pcmcia_device *link) card->p_dev = link; link->priv = priv; -return spectrum_cs_config (link); -}/* spectrum_cs_attach */ + ret =spectrum_cs_config (link); +if (ret) + goto err_free_orinocodev; + +return 0 ; + +err_free_orinocodev: +free_orinocodev (priv); +return ret; +}static void spectrum_cs_detach (struct pcmcia_device *link) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 38/313 wifi: orinoco: Fix an error handling path in orinoco_cs_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 67a81d911c01225f426cc6bee2373df044c1a9b7 ]
Should orinoco_cs_config() fail, some resources need to be released as already done in the remove function.
While at it, remove a useless and erroneous comment. The probe is orinoco_cs_probe(), not orinoco_cs_attach().
--- drivers/net/wireless/intersil/orinoco/orinoco_cs.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/net/wireless/intersil/orinoco/orinoco_cs.c +11 -2
@@ -96,6 +96,7 @@ orinoco_cs_probe(struct pcmcia_device *link) {struct orinoco_private *priv;struct orinoco_pccard *card; +int ret; priv =alloc_orinocodev (sizeof (*card), &link->dev, orinoco_cs_hard_reset,NULL );
@@ -107,8 +108,16 @@ orinoco_cs_probe(struct pcmcia_device *link) card->p_dev = link; link->priv = priv; -return orinoco_cs_config (link); -}/* orinoco_cs_attach */ + ret =orinoco_cs_config (link); +if (ret) + goto err_free_orinocodev; + +return 0 ; + +err_free_orinocodev: +free_orinocodev (priv); +return ret; +}static void orinoco_cs_detach (struct pcmcia_device *link) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 39/313 wifi: atmel: Fix an error handling path in atmel_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 6b92e4351a29af52c285fe235e6e4d1a75de04b2 ]
Should atmel_config() fail, some resources need to be released as already done in the remove function.
While at it, remove a useless and erroneous comment. The probe is atmel_probe(), not atmel_attach().
--- drivers/net/wireless/atmel/atmel_cs.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/net/wireless/atmel/atmel_cs.c +11 -2
@@ -73,6 +73,7 @@ struct local_info {static int atmel_probe (struct pcmcia_device *p_dev) {struct local_info *local; +int ret;dev_dbg (&p_dev->dev,"atmel_attach()\n" );
@@ -83,8 +84,16 @@ static int atmel_probe(struct pcmcia_device *p_dev) p_dev->priv = local; -return atmel_config (p_dev); -}/* atmel_attach */ + ret =atmel_config (p_dev); +if (ret) + goto err_free_priv; + +return 0 ; + +err_free_priv: +kfree (p_dev->priv); +return ret; +}static void atmel_detach (struct pcmcia_device *link) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 40/313 wl3501_cs: Fix a bunch of formatting issues related to function docs
In reply to Greg Kroah-HartmanFrom: Lee Jones <[email protected]>
[ Upstream commit 2307d0bc9d8b60299f255d1771ce0d997162a957 ]
Fixes the following W=1 kernel build warning(s):
In file included from drivers/net/wireless/wl3501_cs.c:57:
drivers/net/wireless/wl3501_cs.c:143: warning: Function parameter or member 'reg_domain' not described in 'iw_valid_channel' drivers/net/wireless/wl3501_cs.c:143: warning: Function parameter or member 'channel' not described in 'iw_valid_channel' drivers/net/wireless/wl3501_cs.c:162: warning: Function parameter or member 'reg_domain' not described in 'iw_default_channel' drivers/net/wireless/wl3501_cs.c:248: warning: Function parameter or member 'this' not described in 'wl3501_set_to_wla' drivers/net/wireless/wl3501_cs.c:270: warning: Function parameter or member 'this' not described in 'wl3501_get_from_wla' drivers/net/wireless/wl3501_cs.c:467: warning: Function parameter or member 'this' not described in 'wl3501_send_pkt' drivers/net/wireless/wl3501_cs.c:467: warning: Function parameter or member 'data' not described in 'wl3501_send_pkt' drivers/net/wireless/wl3501_cs.c:467: warning: Function parameter or member 'len' not described in 'wl3501_send_pkt' drivers/net/wireless/wl3501_cs.c:729: warning: Function parameter or member 'this' not described in 'wl3501_block_interrupt' drivers/net/wireless/wl3501_cs.c:746: warning: Function parameter or member 'this' not described in 'wl3501_unblock_interrupt' drivers/net/wireless/wl3501_cs.c:1124: warning: Function parameter or member 'irq' not described in 'wl3501_interrupt' drivers/net/wireless/wl3501_cs.c:1124: warning: Function parameter or member 'dev_id' not described in 'wl3501_interrupt' drivers/net/wireless/wl3501_cs.c:1257: warning: Function parameter or member 'dev' not described in 'wl3501_reset' drivers/net/wireless/wl3501_cs.c:1420: warning: Function parameter or member 'link' not described in 'wl3501_detach'
Stable-dep-of: 391af06a02e7 ("wifi: wl3501_cs: Fix an error handling path in wl3501_probe()")
--- drivers/net/wireless/wl3501_cs.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
drivers/net/wireless/wl3501_cs.c +12 -10
@@ -134,8 +134,8 @@ static const struct {/** * iw_valid_channel - validate channel in regulatory domain -* @reg_comain - regulatory domain -* @channel - channel to validate +* @reg_comain: regulatory domain +* @channel: channel to validate * * Returns 0 if invalid in the specified regulatory domain, non-zero if valid. */
@@ -154,7 +154,7 @@ static int iw_valid_channel(int reg_domain, int channel)/** * iw_default_channel - get default channel for a regulatory domain -* @reg_comain - regulatory domain +* @reg_domain: regulatory domain * * Returns the default channel for a regulatory domain */
@@ -237,6 +237,7 @@ static int wl3501_get_flash_mac_addr(struct wl3501_card *this)/** * wl3501_set_to_wla - Move 'size' bytes from PC to card +* @this: Card * @dest: Card addressing space * @src: PC addressing space * @size: Bytes to move
@@ -259,6 +260,7 @@ static void wl3501_set_to_wla(struct wl3501_card *this, u16 dest, void *src,/** * wl3501_get_from_wla - Move 'size' bytes from card to PC +* @this: Card * @src: Card addressing space * @dest: PC addressing space * @size: Bytes to move
@@ -455,7 +457,7 @@ static int wl3501_pwr_mgmt(struct wl3501_card *this, int suspend)/** * wl3501_send_pkt - Send a packet. -* @this - card +* @this: Card * * Send a packet. *
@@ -723,7 +725,7 @@ static void wl3501_mgmt_scan_confirm(struct wl3501_card *this, u16 addr)/** * wl3501_block_interrupt - Mask interrupt from SUTRO -* @this - card +* @this: Card * * Mask interrupt from SUTRO. (i.e. SUTRO cannot interrupt the HOST) * Return: 1 if interrupt is originally enabled
@@ -740,7 +742,7 @@ static int wl3501_block_interrupt(struct wl3501_card *this)/** * wl3501_unblock_interrupt - Enable interrupt from SUTRO -* @this - card +* @this: Card * * Enable interrupt from SUTRO. (i.e. SUTRO can interrupt the HOST) * Return: 1 if interrupt is originally enabled
@@ -1114,8 +1116,8 @@ static inline void wl3501_ack_interrupt(struct wl3501_card *this)/** * wl3501_interrupt - Hardware interrupt from card. -* @irq - Interrupt number -* @dev_id - net_device +* @irq: Interrupt number +* @dev_id: net_device * * We must acknowledge the interrupt as soon as possible, and block the * interrupt from the same card immediately to prevent re-entry.
@@ -1251,7 +1253,7 @@ static int wl3501_close(struct net_device *dev)/** * wl3501_reset - Reset the SUTRO. -* @dev - network device +* @dev: network device * * It is almost the same as wl3501_open(). In fact, we may just wl3501_close() * and wl3501_open() again, but I wouldn't like to free_irq() when the driver
@@ -1414,7 +1416,7 @@ static struct iw_statistics *wl3501_get_wireless_stats(struct net_device *dev)/** * wl3501_detach - deletes a driver "instance" -* @link - FILL_IN +* @link: FILL_IN * * This deletes a driver "instance". The device is de-registered with Card * Services. If it has been released, all local data structures are freed.
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 41/313 wl3501_cs: Remove unnecessary NULL check
In reply to Greg Kroah-HartmanFrom: Alex Dewar <[email protected]>
[ Upstream commit 1d2a85382282e7c77cbde5650335c3ffc6073fa1 ]
In wl3501_detach(), link->priv is checked for a NULL value before being passed to free_netdev(). However, it cannot be NULL at this point as it has already been passed to other functions, so just remove the check.
Addresses-Coverity: CID 710499: Null pointer dereferences (REVERSE_INULL)
Stable-dep-of: 391af06a02e7 ("wifi: wl3501_cs: Fix an error handling path in wl3501_probe()")
--- drivers/net/wireless/wl3501_cs.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/wireless/wl3501_cs.c +1 -3
@@ -1437,9 +1437,7 @@ static void wl3501_detach(struct pcmcia_device *link)wl3501_release (link);unregister_netdev (dev); - -if (link->priv) -free_netdev (link->priv); +free_netdev (dev); } static int wl3501_get_name(struct net_device *dev, struct iw_request_info *info,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 42/313 wl3501_cs: Fix misspelling and provide missing documentation
In reply to Greg Kroah-HartmanFrom: Lee Jones <[email protected]>
[ Upstream commit 8b8a6f8c3b50193d161c598a6784e721128d6dc3 ]
Fixes the following W=1 kernel build warning(s):
In file included from drivers/net/wireless/wl3501_cs.c:57:
drivers/net/wireless/wl3501_cs.c:143: warning: Function parameter or member 'reg_domain' not described in 'iw_valid_channel' drivers/net/wireless/wl3501_cs.c:143: warning: Excess function parameter 'reg_comain' description in 'iw_valid_channel' drivers/net/wireless/wl3501_cs.c:469: warning: Function parameter or member 'data' not described in 'wl3501_send_pkt' drivers/net/wireless/wl3501_cs.c:469: warning: Function parameter or member 'len' not described in 'wl3501_send_pkt'
Stable-dep-of: 391af06a02e7 ("wifi: wl3501_cs: Fix an error handling path in wl3501_probe()")
--- drivers/net/wireless/wl3501_cs.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/net/wireless/wl3501_cs.c +3 -5
@@ -134,7 +134,7 @@ static const struct {/** * iw_valid_channel - validate channel in regulatory domain -* @reg_comain: regulatory domain +* @reg_domain: regulatory domain * @channel: channel to validate * * Returns 0 if invalid in the specified regulatory domain, non-zero if valid.
@@ -458,11 +458,9 @@ static int wl3501_pwr_mgmt(struct wl3501_card *this, int suspend)/** * wl3501_send_pkt - Send a packet. * @this: Card -* -* Send a packet. -* -* data = Ethernet raw frame. (e.g. data[0] - data[5] is Dest MAC Addr, +* @data: Ethernet raw frame. (e.g. data[0] - data[5] is Dest MAC Addr, * data[6] - data[11] is Src MAC Addr) +* @len: Packet length * Ref: IEEE 802.11 */ static int wl3501_send_pkt (struct wl3501_card *this,u8 *data,u16 len)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 43/313 net: create netdev->dev_addr assignment helpers
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 48eab831ae8b9f7002a533fa4235eed63ea1f1a3 ]
Recent work on converting address list to a tree made it obvious we need an abstraction around writing netdev->dev_addr. Without such abstraction updating the main device address is invisible to the core.
Introduce a number of helpers which for now just wrap memcpy() but in the future can make necessary changes to the address tree.
Stable-dep-of: 391af06a02e7 ("wifi: wl3501_cs: Fix an error handling path in wl3501_probe()")
--- include/linux/etherdevice.h | 12 ++++++++++++ include/linux/netdevice.h | 18 ++++++++++++++++++ 2 files changed, 30 insertions(+)
include/linux/etherdevice.h +12 -0
@@ -288,6 +288,18 @@ static inline void ether_addr_copy(u8 *dst, const u8 *src)#endif } +/** +* eth_hw_addr_set - Assign Ethernet address to a net_device +* @dev: pointer to net_device structure +* @addr: address to assign +* +* Assign given address to the net_device, addr_assign_type is not changed. +*/ +static inline void eth_hw_addr_set (struct net_device *dev,const u8 *addr) +{ +ether_addr_copy (dev->dev_addr, addr); +} +/** * eth_hw_addr_inherit - Copy dev_addr from another net_device * @dst: pointer to net_device to copy dev_addr to
include/linux/netdevice.h +18 -0
@@ -4189,6 +4189,24 @@ void __hw_addr_unsync_dev(struct netdev_hw_addr_list *list,void __hw_addr_init (struct netdev_hw_addr_list *list);/* Functions used for device addresses handling */ +static inline void +__dev_addr_set (struct net_device *dev,const u8 *addr,size_t len) +{ +memcpy (dev->dev_addr, addr, len); +} + +static inline void dev_addr_set (struct net_device *dev,const u8 *addr) +{ +__dev_addr_set (dev, addr, dev->addr_len); +} + +static inline void +dev_addr_mod (struct net_device *dev,unsigned int offset, +const u8 *addr,size_t len) +{ +memcpy (&dev->dev_addr[offset], addr, len); +} +int dev_addr_add (struct net_device *dev,const unsigned char *addr,unsigned char addr_type); int dev_addr_del(struct net_device *dev, const unsigned char *addr,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 44/313 wl3501_cs: use eth_hw_addr_set()
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 18774612246d036c04ce9fee7f67192f96f48725 ]
Commit 406f42fa0d3c ("net-next: When a bond have a massive amount of VLANs...") introduced a rbtree for faster Ethernet address look up. To maintain netdev->dev_addr in this tree we need to make all the writes to it got through appropriate helpers.
Stable-dep-of: 391af06a02e7 ("wifi: wl3501_cs: Fix an error handling path in wl3501_probe()")
--- drivers/net/wireless/wl3501_cs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/wl3501_cs.c +1 -2
@@ -1945,8 +1945,7 @@ static int wl3501_config(struct pcmcia_device *link) goto failed; } -for (i =0 ; i <6 ; i++) - dev->dev_addr[i] = ((char *)&this->mac_addr)[i]; +eth_hw_addr_set (dev, this->mac_addr);/* print probe information */ printk(KERN_INFO "%s: wl3501 @ 0x%3.3x, IRQ %d, "
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 45/313 wifi: wl3501_cs: Fix an error handling path in wl3501_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 391af06a02e7642039ac5f6c4b2c034ab0992b5d ]
Should wl3501_config() fail, some resources need to be released as already done in the remove function.
--- drivers/net/wireless/wl3501_cs.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/net/wireless/wl3501_cs.c +11 -5
@@ -1862,6 +1862,7 @@ static int wl3501_probe(struct pcmcia_device *p_dev) {struct net_device *dev;struct wl3501_card *this; +int ret;/* The io structure describes IO port mapping */ p_dev->resource[0 ]->end =16 ;
@@ -1873,8 +1874,7 @@ static int wl3501_probe(struct pcmcia_device *p_dev) dev =alloc_etherdev (sizeof (struct wl3501_card ));if (!dev) - goto out_link; - +return -ENOMEM ; dev->netdev_ops = &wl3501_netdev_ops; dev->watchdog_timeo =5 *HZ ;
@@ -1887,9 +1887,15 @@ static int wl3501_probe(struct pcmcia_device *p_dev)netif_stop_queue (dev); p_dev->priv = dev; -return wl3501_config (p_dev); -out_link: -return -ENOMEM ; + ret =wl3501_config (p_dev); +if (ret) + goto out_free_etherdev; + +return 0 ; + +out_free_etherdev: +free_netdev (dev); +return ret; }static int wl3501_config (struct pcmcia_device *link)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 46/313 wifi: ray_cs: Utilize strnlen() in parse_addr()
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 9e8e9187673cb24324f9165dd47b2b28f60b0b10 ]
Instead of doing simple operations and using an additional variable on stack, utilize strnlen() and reuse len variable.
Stable-dep-of: 4f8d66a9fb2e ("wifi: ray_cs: Fix an error handling path in ray_probe()")
--- drivers/net/wireless/ray_cs.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/net/wireless/ray_cs.c +7 -9
@@ -1641,31 +1641,29 @@ static void authenticate_timeout(struct timer_list *t)/*===========================================================================*/ static int parse_addr (char *in_str,UCHAR *out) { +int i, k;int len; -int i, j, k;int status;if (in_str ==NULL )return 0 ; -if ((len =strlen (in_str)) <2 ) + len =strnlen (in_str,ADDRLEN *2 +1 ) -1 ; +if (len <1 )return 0 ;memset (out,0 ,ADDRLEN ); status =1 ; - j = len -1 ; -if (j >12 ) - j =12 ; i =5 ; -while (j >0 ) { -if ((k =hex_to_bin (in_str[j--])) !=-1 ) +while (len >0 ) { +if ((k =hex_to_bin (in_str[len--])) !=-1 ) out[i] = k;else return 0 ; -if (j ==0 ) +if (len ==0 )break ; -if ((k =hex_to_bin (in_str[j--])) !=-1 ) +if ((k =hex_to_bin (in_str[len--])) !=-1 ) out[i] += k <<4 ;else return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 47/313 wifi: ray_cs: Drop useless status variable in parse_addr()
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 4dfc63c002a555a2c3c34d89009532ad803be876 ]
The status variable assigned only once and used also only once. Replace it's usage by actual value.
Stable-dep-of: 4f8d66a9fb2e ("wifi: ray_cs: Fix an error handling path in ray_probe()")
--- drivers/net/wireless/ray_cs.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/wireless/ray_cs.c +1 -3
@@ -1643,7 +1643,6 @@ static int parse_addr(char *in_str, UCHAR *out) {int i, k;int len; -int status;if (in_str ==NULL )return 0 ;
@@ -1652,7 +1651,6 @@ static int parse_addr(char *in_str, UCHAR *out)return 0 ;memset (out,0 ,ADDRLEN ); - status =1 ; i =5 ;while (len >0 ) {
@@ -1670,7 +1668,7 @@ static int parse_addr(char *in_str, UCHAR *out)if (!i--)break ; } -return status; +return 1 ; }/*===========================================================================*/
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 48/313 wifi: ray_cs: Fix an error handling path in ray_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 4f8d66a9fb2edcd05c1e563456a55a08910bfb37 ]
Should ray_config() fail, some resources need to be released as already done in the remove function.
While at it, remove a useless and erroneous comment. The probe is ray_probe(), not ray_attach().
--- drivers/net/wireless/ray_cs.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/net/wireless/ray_cs.c +11 -5
@@ -270,13 +270,14 @@ static int ray_probe(struct pcmcia_device *p_dev) {ray_dev_t *local;struct net_device *dev; +int ret;dev_dbg (&p_dev->dev,"ray_attach()\n" );/* Allocate space for private device-specific data */ dev =alloc_etherdev (sizeof (ray_dev_t));if (!dev) - goto fail_alloc_dev; +return -ENOMEM ; local =netdev_priv (dev); local->finder = p_dev;
@@ -313,11 +314,16 @@ static int ray_probe(struct pcmcia_device *p_dev)timer_setup (&local->timer,NULL ,0 ); this_device = p_dev; -return ray_config (p_dev); + ret =ray_config (p_dev); +if (ret) + goto err_free_dev; + +return 0 ; -fail_alloc_dev: -return -ENOMEM ; -}/* ray_attach */ +err_free_dev: +free_netdev (dev); +return ret; +}static void ray_detach (struct pcmcia_device *link) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 49/313 wifi: ath9k: dont allow to overwrite ENDPOINT0 attributes
In reply to Greg Kroah-HartmanFrom: Fedor Pchelkin <[email protected]>
[ Upstream commit 061b0cb9327b80d7a0f63a33e7c3e2a91a71f142 ]
A bad USB device is able to construct a service connection response message with target endpoint being ENDPOINT0 which is reserved for HTC_CTRL_RSVD_SVC and should not be modified to be used for any other services.
Reject such service connection responses.
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
--- drivers/net/wireless/ath/ath9k/htc_hst.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath9k/htc_hst.c +7 -1
@@ -114,7 +114,13 @@ static void htc_process_conn_rsp(struct htc_target *target,if (svc_rspmsg->status ==HTC_SERVICE_SUCCESS ) { epid = svc_rspmsg->endpoint_id; -if (epid <0 || epid >=ENDPOINT_MAX ) + +/* Check that the received epid for the endpoint to attach +* a new service is valid. ENDPOINT0 can't be used here as it +* is already reserved for HTC_CTRL_RSVD_SVC service and thus +* should not be modified. +*/ +if (epid <=ENDPOINT0 || epid >=ENDPOINT_MAX )return ; service_id =be16_to_cpu (svc_rspmsg->service_id);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 50/313 wifi: rsi: Do not set MMC_PM_KEEP_POWER in shutdown
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit e74f562328b03fbe9cf438f958464dff3a644dfc ]
It makes no sense to set MMC_PM_KEEP_POWER in shutdown. The flag indicates to the MMC subsystem to keep the slot powered on during suspend, but in shutdown the slot should actually be powered off. Drop this call.
--- drivers/net/wireless/rsi/rsi_91x_sdio.c | 3 --- 1 file changed, 3 deletions(-)
drivers/net/wireless/rsi/rsi_91x_sdio.c +0 -3
@@ -1479,9 +1479,6 @@ static void rsi_shutdown(struct device *dev)if (sdev->write_fail)rsi_dbg (INFO_ZONE ,"###### Device is not ready #######\n" ); -if (rsi_set_sdio_pm_caps (adapter)) -rsi_dbg (INFO_ZONE ,"Setting power management caps failed\n" ); -rsi_dbg (INFO_ZONE ,"***** RSI module shut down *****\n" ); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 51/313 watchdog/perf: define dummy watchdog_update_hrtimer_threshold() on correct config
In reply to Greg Kroah-HartmanFrom: Douglas Anderson <[email protected]>
[ Upstream commit 5e008df11c55228a86a1bae692cc2002503572c9 ]
Patch series "watchdog/hardlockup: Add the buddy hardlockup detector", v5.
This patch series adds the "buddy" hardlockup detector. In brief, the buddy hardlockup detector can detect hardlockups without arch-level support by having CPUs checkup on a "buddy" CPU periodically.
Given the new design of this patch series, testing all combinations is fairly difficult. I've attempted to make sure that all combinations of CONFIG_ options are good, but it wouldn't surprise me if I missed something. I apologize in advance and I'll do my best to fix any problems that are found.
This patch (of 18):
The real watchdog_update_hrtimer_threshold() is defined in kernel/watchdog_hld.c. That file is included if CONFIG_HARDLOCKUP_DETECTOR_PERF and the function is defined in that file if CONFIG_HARDLOCKUP_CHECK_TIMESTAMP.
The dummy version of the function in "nmi.h" didn't get that quite right. While this doesn't appear to be a huge deal, it's nice to make it consistent.
It doesn't break builds because CHECK_TIMESTAMP is only defined by x86 so others don't get a double definition, and x86 uses perf lockup detector, so it gets the out of line version.
--- include/linux/nmi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/nmi.h +1 -1
@@ -197,7 +197,7 @@ u64 hw_nmi_get_sample_period(int watchdog_thresh);#endif #if defined(CONFIG_HARDLOCKUP_CHECK_TIMESTAMP ) && \ - defined(CONFIG_HARDLOCKUP_DETECTOR ) + defined(CONFIG_HARDLOCKUP_DETECTOR_PERF )void watchdog_update_hrtimer_threshold (u64 period);#else static inline void watchdog_update_hrtimer_threshold (u64 period) { }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 52/313 watchdog/perf: more properly prevent false positives with turbo modes
In reply to Greg Kroah-HartmanFrom: Douglas Anderson <[email protected]>
[ Upstream commit 4379e59fe5665cfda737e45b8bf2f05321ef049c ]
Currently, in the watchdog_overflow_callback() we first check to see if the watchdog had been touched and _then_ we handle the workaround for turbo mode. This order should be reversed.
Specifically, "touching" the hardlockup detector's watchdog should avoid lockups being detected for one period that should be roughly the same regardless of whether we're running turbo or not. That means that we should do the extra accounting for turbo _before_ we look at (and clear) the global indicating that we've been touched.
NOTE: this fix is made based on code inspection. I am not aware of any reports where the old code would have generated false positives. That being said, this order seems more correct and also makes it easier down the line to share code with the "buddy" hardlockup detector.
--- kernel/watchdog_hld.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/watchdog_hld.c +3 -3
@@ -114,14 +114,14 @@ static void watchdog_overflow_callback(struct perf_event *event,/* Ensure the watchdog never gets throttled */ event->hw.interrupts =0 ; +if (!watchdog_check_timestamp ()) +return ; +if (__this_cpu_read (watchdog_nmi_touch) == true) {__this_cpu_write (watchdog_nmi_touch, false);return ; } -if (!watchdog_check_timestamp ()) -return ; -/* check for a hardlockup * This is done by making sure our timer interrupt * is incrementing. The timer interrupt should have
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 53/313 kexec: fix a memory leak in crash_shrink_memory()
In reply to Greg Kroah-HartmanFrom: Zhen Lei <[email protected]>
[ Upstream commit 1cba6c4309f03de570202c46f03df3f73a0d4c82 ]
Patch series "kexec: enable kexec_crash_size to support two crash kernel regions".
When crashkernel=X fails to reserve region under 4G, it will fall back to reserve region above 4G and a region of the default size will also be reserved under 4G. Unfortunately, /sys/kernel/kexec_crash_size only supports one crash kernel region now, the user cannot sense the low memory reserved by reading /sys/kernel/kexec_crash_size. Also, low memory cannot be freed by writing this file.
For example:resource_size(crashk_res) = 512Mresource_size(crashk_low_res) = 256M
The result of 'cat /sys/kernel/kexec_crash_size' is 512M, but it should be 768M. When we execute 'echo 0 > /sys/kernel/kexec_crash_size', the size of crashk_res becomes 0 and resource_size(crashk_low_res) is still 256 MB, which is incorrect.
Since crashk_res manages the memory with high address and crashk_low_res manages the memory with low address, crashk_low_res is shrunken only when all crashk_res is shrunken. And because when there is only one crash kernel region, crashk_res is always used. Therefore, if all crashk_res is shrunken and crashk_low_res still exists, swap them.
This patch (of 6):
If the value of parameter 'new_size' is in the semi-open and semi-closed interval (crashk_res.end - KEXEC_CRASH_MEM_ALIGN + 1, crashk_res.end], the calculation result of ram_res is:
ram_res->start = crashk_res.end + 1 ram_res->end = crashk_res.end
The operation of insert_resource() fails, and ram_res is not added to iomem_resource. As a result, the memory of the control block ram_res is leaked.
In fact, on all architectures, the start address and size of crashk_res are already aligned by KEXEC_CRASH_MEM_ALIGN. Therefore, we do not need to round up crashk_res.start again. Instead, we should round up 'new_size' in advance.
--- kernel/kexec_core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
kernel/kexec_core.c +2 -3
@@ -1019,6 +1019,7 @@ int crash_shrink_memory(unsigned long new_size) start = crashk_res.start; end = crashk_res.end; old_size = (end ==0 ) ?0 : end - start +1 ; + new_size =roundup (new_size,KEXEC_CRASH_MEM_ALIGN );if (new_size >= old_size) { ret = (new_size == old_size) ?0 : -EINVAL ; goto unlock;
@@ -1030,9 +1031,7 @@ int crash_shrink_memory(unsigned long new_size) goto unlock; } - start =roundup (start,KEXEC_CRASH_MEM_ALIGN ); - end =roundup (start + new_size,KEXEC_CRASH_MEM_ALIGN ); - + end = start + new_size;crash_free_reserved_phys_range (end, crashk_res.end);if ((start == end) && (crashk_res.parent !=NULL ))
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 54/313 memstick r592: make memstick_debug_get_tpc_name() static
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 434587df9f7fd68575f99a889cc5f2efc2eaee5e ]
There are no other files referencing this function, apparently it was left global to avoid an 'unused function' warning when the only caller is left out. With a 'W=1' build, it causes a 'missing prototype' warning though:
drivers/memstick/host/r592.c:47:13: error: no previous prototype for 'memstick_debug_get_tpc_name' [-Werror=missing-prototypes]
Annotate the function as 'static __maybe_unused' to avoid both problems.
--- drivers/memstick/host/r592.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/memstick/host/r592.c +1 -3
@@ -44,12 +44,10 @@ static const char *tpc_names[] = {* memstick_debug_get_tpc_name - debug helper that returns string for * a TPC number */ -const char *memstick_debug_get_tpc_name (int tpc) +static __maybe_unused const char *memstick_debug_get_tpc_name (int tpc) {return tpc_names[tpc-1 ]; } -EXPORT_SYMBOL (memstick_debug_get_tpc_name); -/* Read a register*/ static inline u32 r592_read_reg (struct r592_device *dev,int address)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 55/313 wifi: ath9k: Fix possible stall on ath9k_txq_list_has_key()
In reply to Greg Kroah-HartmanFrom: Remi Pommarel <[email protected]>
[ Upstream commit 75086cc6dee046e3fbb3dba148b376d8802f83bc ]
On EDMA capable hardware, ath9k_txq_list_has_key() can enter infinite loop if it is called while all txq_fifos have packets that use different key that the one we are looking for. Fix it by exiting the loop if all txq_fifos have been checked already.
Because this loop is called under spin_lock_bh() (see ath_txq_lock) it causes the following rcu stall:
rcu: INFO: rcu_sched self-detected stall on CPU
ath10k_pci 0000:01:00.0: failed to read temperature -11
rcu: 1-....: (5254 ticks this GP) idle=189/1/0x4000000000000002 softirq=8442983/8442984 fqs=2579
(t=5257 jiffies g=17983297 q=334)
Task dump for CPU 1:
task:hostapd state:R running task stack: 0 pid: 297 ppid: 289 flags:0x0000000a
Call trace:
dump_backtrace+0x0/0x170
show_stack+0x1c/0x24
sched_show_task+0x140/0x170
dump_cpu_task+0x48/0x54
rcu_dump_cpu_stacks+0xf0/0x134
rcu_sched_clock_irq+0x8d8/0x9fc
update_process_times+0xa0/0xec
tick_sched_timer+0x5c/0xd0
__hrtimer_run_queues+0x154/0x320
hrtimer_interrupt+0x120/0x2f0
arch_timer_handler_virt+0x38/0x44
handle_percpu_devid_irq+0x9c/0x1e0
handle_domain_irq+0x64/0x90
gic_handle_irq+0x78/0xb0
call_on_irq_stack+0x28/0x38
do_interrupt_handler+0x54/0x5c
el1_interrupt+0x2c/0x4c
el1h_64_irq_handler+0x14/0x1c
el1h_64_irq+0x74/0x78
ath9k_txq_has_key+0x1bc/0x250 [ath9k]
ath9k_set_key+0x1cc/0x3dc [ath9k]
drv_set_key+0x78/0x170
ieee80211_key_replace+0x564/0x6cc
ieee80211_key_link+0x174/0x220
ieee80211_add_key+0x11c/0x300
nl80211_new_key+0x12c/0x330
genl_family_rcv_msg_doit+0xbc/0x11c
genl_rcv_msg+0xd8/0x1c4
netlink_rcv_skb+0x40/0x100
genl_rcv+0x3c/0x50
netlink_unicast+0x1ec/0x2c0
netlink_sendmsg+0x198/0x3c0
____sys_sendmsg+0x210/0x250
___sys_sendmsg+0x78/0xc4
__sys_sendmsg+0x4c/0x90
__arm64_sys_sendmsg+0x28/0x30
invoke_syscall.constprop.0+0x60/0x100
do_el0_svc+0x48/0xd0
el0_svc+0x14/0x50
el0t_64_sync_handler+0xa8/0xb0
el0t_64_sync+0x158/0x15cThis rcu stall is hard to reproduce as is, but changing ATH_TXFIFO_DEPTH from 8 to 2 makes it reasonably easy to reproduce.
--- drivers/net/wireless/ath/ath9k/main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath9k/main.c +4 -3
@@ -847,7 +847,7 @@ static bool ath9k_txq_list_has_key(struct list_head *txq_list, u32 keyix)static bool ath9k_txq_has_key (struct ath_softc *sc,u32 keyix) {struct ath_hw *ah = sc->sc_ah; -int i; +int i, j;struct ath_txq *txq;bool key_in_use = false;
@@ -865,8 +865,9 @@ static bool ath9k_txq_has_key(struct ath_softc *sc, u32 keyix)if (sc->sc_ah->caps.hw_caps &ATH9K_HW_CAP_EDMA ) {int idx = txq->txq_tailidx; -while (!key_in_use && - !list_empty (&txq->txq_fifo[idx])) { +for (j =0 ; !key_in_use && + !list_empty (&txq->txq_fifo[idx]) && + j <ATH_TXFIFO_DEPTH ; j++) { key_in_use =ath9k_txq_list_has_key ( &txq->txq_fifo[idx], keyix);INCR (idx,ATH_TXFIFO_DEPTH );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 56/313 rtnetlink: extend RTEXT_FILTER_SKIP_STATS to IFLA_VF_INFO
In reply to Greg Kroah-HartmanFrom: Edwin Peer <[email protected]>
[ Upstream commit fa0e21fa44438a0e856d42224bfa24641d37b979 ]
This filter already exists for excluding IPv6 SNMP stats. Extend its definition to also exclude IFLA_VF_INFO stats in RTM_GETLINK.
This patch constitutes a partial fix for a netlink attribute nesting overflow bug in IFLA_VFINFO_LIST. By excluding the stats when the requester doesn't need them, the truncation of the VF list is avoided.
While it was technically only the stats added in commit c5a9f6f0ab40 ("net/core: Add drop counters to VF statistics") breaking the camel's back, the appreciable size of the stats data should never have been included without due consideration for the maximum number of VFs supported by PCI.
--- net/core/rtnetlink.c | 96 +++++++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 45 deletions(-)
net/core/rtnetlink.c +51 -45
@@ -922,24 +922,27 @@ static inline int rtnl_vfinfo_size(const struct net_device *dev,nla_total_size (sizeof (struct ifla_vf_rate )) +nla_total_size (sizeof (struct ifla_vf_link_state )) +nla_total_size (sizeof (struct ifla_vf_rss_query_en )) + -nla_total_size (0 ) +/* nest IFLA_VF_STATS */ -/* IFLA_VF_STATS_RX_PACKETS */ -nla_total_size_64bit (sizeof (__u64)) + -/* IFLA_VF_STATS_TX_PACKETS */ -nla_total_size_64bit (sizeof (__u64)) + -/* IFLA_VF_STATS_RX_BYTES */ -nla_total_size_64bit (sizeof (__u64)) + -/* IFLA_VF_STATS_TX_BYTES */ -nla_total_size_64bit (sizeof (__u64)) + -/* IFLA_VF_STATS_BROADCAST */ -nla_total_size_64bit (sizeof (__u64)) + -/* IFLA_VF_STATS_MULTICAST */ -nla_total_size_64bit (sizeof (__u64)) + -/* IFLA_VF_STATS_RX_DROPPED */ -nla_total_size_64bit (sizeof (__u64)) + -/* IFLA_VF_STATS_TX_DROPPED */ -nla_total_size_64bit (sizeof (__u64)) + nla_total_size(sizeof(struct ifla_vf_trust))); +if (~ext_filter_mask &RTEXT_FILTER_SKIP_STATS ) { + size += num_vfs * + (nla_total_size (0 ) +/* nest IFLA_VF_STATS */ +/* IFLA_VF_STATS_RX_PACKETS */ +nla_total_size_64bit (sizeof (__u64)) + +/* IFLA_VF_STATS_TX_PACKETS */ +nla_total_size_64bit (sizeof (__u64)) + +/* IFLA_VF_STATS_RX_BYTES */ +nla_total_size_64bit (sizeof (__u64)) + +/* IFLA_VF_STATS_TX_BYTES */ +nla_total_size_64bit (sizeof (__u64)) + +/* IFLA_VF_STATS_BROADCAST */ +nla_total_size_64bit (sizeof (__u64)) + +/* IFLA_VF_STATS_MULTICAST */ +nla_total_size_64bit (sizeof (__u64)) + +/* IFLA_VF_STATS_RX_DROPPED */ +nla_total_size_64bit (sizeof (__u64)) + +/* IFLA_VF_STATS_TX_DROPPED */ +nla_total_size_64bit (sizeof (__u64))); + }return size; }else return 0 ;
@@ -1189,7 +1192,8 @@ static noinline_for_stack int rtnl_fill_stats(struct sk_buff *skb, static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb,struct net_device *dev,int vfs_num, -struct nlattr *vfinfo) +struct nlattr *vfinfo, +u32 ext_filter_mask) {struct ifla_vf_rss_query_en vf_rss_query_en;struct nlattr *vf, *vfstats, *vfvlanlist;
@@ -1279,33 +1283,35 @@ static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb, goto nla_put_vf_failure; }nla_nest_end (skb, vfvlanlist); -memset (&vf_stats,0 ,sizeof (vf_stats)); -if (dev->netdev_ops->ndo_get_vf_stats) - dev->netdev_ops->ndo_get_vf_stats (dev, vfs_num, - &vf_stats); - vfstats =nla_nest_start_noflag (skb,IFLA_VF_STATS ); -if (!vfstats) - goto nla_put_vf_failure; -if (nla_put_u64_64bit (skb,IFLA_VF_STATS_RX_PACKETS , - vf_stats.rx_packets,IFLA_VF_STATS_PAD ) || -nla_put_u64_64bit (skb,IFLA_VF_STATS_TX_PACKETS , - vf_stats.tx_packets,IFLA_VF_STATS_PAD ) || -nla_put_u64_64bit (skb,IFLA_VF_STATS_RX_BYTES , - vf_stats.rx_bytes,IFLA_VF_STATS_PAD ) || -nla_put_u64_64bit (skb,IFLA_VF_STATS_TX_BYTES , - vf_stats.tx_bytes,IFLA_VF_STATS_PAD ) || -nla_put_u64_64bit (skb,IFLA_VF_STATS_BROADCAST , - vf_stats.broadcast,IFLA_VF_STATS_PAD ) || -nla_put_u64_64bit (skb,IFLA_VF_STATS_MULTICAST , - vf_stats.multicast,IFLA_VF_STATS_PAD ) || -nla_put_u64_64bit (skb,IFLA_VF_STATS_RX_DROPPED , - vf_stats.rx_dropped,IFLA_VF_STATS_PAD ) || -nla_put_u64_64bit (skb,IFLA_VF_STATS_TX_DROPPED , - vf_stats.tx_dropped,IFLA_VF_STATS_PAD )) { -nla_nest_cancel (skb, vfstats); - goto nla_put_vf_failure; +if (~ext_filter_mask &RTEXT_FILTER_SKIP_STATS ) { +memset (&vf_stats,0 ,sizeof (vf_stats)); +if (dev->netdev_ops->ndo_get_vf_stats) + dev->netdev_ops->ndo_get_vf_stats (dev, vfs_num, + &vf_stats); + vfstats =nla_nest_start_noflag (skb,IFLA_VF_STATS ); +if (!vfstats) + goto nla_put_vf_failure; +if (nla_put_u64_64bit (skb,IFLA_VF_STATS_RX_PACKETS , + vf_stats.rx_packets,IFLA_VF_STATS_PAD ) || +nla_put_u64_64bit (skb,IFLA_VF_STATS_TX_PACKETS , + vf_stats.tx_packets,IFLA_VF_STATS_PAD ) || +nla_put_u64_64bit (skb,IFLA_VF_STATS_RX_BYTES , + vf_stats.rx_bytes,IFLA_VF_STATS_PAD ) || +nla_put_u64_64bit (skb,IFLA_VF_STATS_TX_BYTES , + vf_stats.tx_bytes,IFLA_VF_STATS_PAD ) || +nla_put_u64_64bit (skb,IFLA_VF_STATS_BROADCAST , + vf_stats.broadcast,IFLA_VF_STATS_PAD ) || +nla_put_u64_64bit (skb,IFLA_VF_STATS_MULTICAST , + vf_stats.multicast,IFLA_VF_STATS_PAD ) || +nla_put_u64_64bit (skb,IFLA_VF_STATS_RX_DROPPED , + vf_stats.rx_dropped,IFLA_VF_STATS_PAD ) || +nla_put_u64_64bit (skb,IFLA_VF_STATS_TX_DROPPED , + vf_stats.tx_dropped,IFLA_VF_STATS_PAD )) { +nla_nest_cancel (skb, vfstats); + goto nla_put_vf_failure; + } +nla_nest_end (skb, vfstats); } -nla_nest_end (skb, vfstats);nla_nest_end (skb, vf);return 0 ;
@@ -1338,7 +1344,7 @@ static noinline_for_stack int rtnl_fill_vf(struct sk_buff *skb,return -EMSGSIZE ;for (i =0 ; i < num_vfs; i++) { -if (rtnl_fill_vfinfo (skb, dev, i, vfinfo)) +if (rtnl_fill_vfinfo (skb, dev, i, vfinfo, ext_filter_mask))return -EMSGSIZE ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 57/313 wifi: iwlwifi: pull from TXQs with softirqs disabled
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
[ Upstream commit 96fb6f47db24a712d650b0a9b9074873f273fb0e ]
In mac80211, it's required that we pull from TXQs by calling ieee80211_tx_dequeue() only with softirqs disabled. However, in iwl_mvm_queue_state_change() we're often called with them enabled, e.g. from flush if anything was flushed, triggering a mac80211 warning.
Fix that by disabling the softirqs across the TX call.
--- drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/ops.c +4 -1
@@ -1167,8 +1167,11 @@ static void iwl_mvm_queue_state_change(struct iwl_op_mode *op_mode, mvmtxq =iwl_mvm_txq_from_mac80211 (txq); mvmtxq->stopped = !start; -if (start && mvmsta->sta_state !=IEEE80211_STA_NOTEXIST ) +if (start && mvmsta->sta_state !=IEEE80211_STA_NOTEXIST ) { +local_bh_disable ();iwl_mvm_mac_itxq_xmit (mvm->hw, txq); +local_bh_enable (); + } } out:
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 58/313 wifi: cfg80211: rewrite merging of inherited elements
In reply to Greg Kroah-HartmanFrom: Benjamin Berg <[email protected]>
[ Upstream commit dfd9aa3e7a456d57b18021d66472ab7ff8373ab7 ]
The cfg80211_gen_new_ie function merges the IEs using inheritance rules. Rewrite this function to fix issues around inheritance rules. In particular, vendor elements do not require any special handling, as they are either all inherited or overridden by the subprofile. Also, add fragmentation handling as this may be needed in some cases.
This also changes the function to not require making a copy. The new version could be optimized a bit by explicitly tracking which IEs have been handled already rather than looking that up again every time.
Note that a small behavioural change is the removal of the SSID special handling. This should be fine for the MBSSID element, as the SSID must be included in the subelement.
--- net/wireless/scan.c | 213 ++++++++++++++++++++++++++------------------ 1 file changed, 124 insertions(+), 89 deletions(-)
net/wireless/scan.c +124 -89
@@ -223,117 +223,152 @@ bool cfg80211_is_element_inherited(const struct element *elem, }EXPORT_SYMBOL (cfg80211_is_element_inherited); -static size_t cfg80211_gen_new_ie (const u8 *ie,size_t ielen, -const u8 *subelement,size_t subie_len, -u8 *new_ie,gfp_t gfp) +static size_t cfg80211_copy_elem_with_frags (const struct element *elem, +const u8 *ie,size_t ie_len, +u8 **pos,u8 *buf,size_t buf_len) { -u8 *pos, *tmp; -const u8 *tmp_old, *tmp_new; -const struct element *non_inherit_elem; -u8 *sub_copy; +if (WARN_ON ((u8 *)elem < ie || elem->data > ie + ie_len || + elem->data + elem->datalen > ie + ie_len)) +return 0 ; -/* copy subelement as we need to change its content to -* mark an ie after it is processed. -*/ - sub_copy =kmemdup (subelement, subie_len, gfp); -if (!sub_copy) +if (elem->datalen +2 > buf + buf_len - *pos)return 0 ; - pos = &new_ie[0 ]; +memcpy (*pos, elem, elem->datalen +2 ); + *pos += elem->datalen +2 ; -/* set new ssid */ - tmp_new =cfg80211_find_ie (WLAN_EID_SSID , sub_copy, subie_len); -if (tmp_new) { -memcpy (pos, tmp_new, tmp_new[1 ] +2 ); - pos += (tmp_new[1 ] +2 ); +/* Finish if it is not fragmented */ +if (elem->datalen !=255 ) +return *pos - buf; + + ie_len = ie + ie_len - elem->data - elem->datalen; + ie = (const u8 *)elem->data + elem->datalen; + +for_each_element (elem, ie, ie_len) { +if (elem->id !=WLAN_EID_FRAGMENT ) +break ; + +if (elem->datalen +2 > buf + buf_len - *pos) +return 0 ; + +memcpy (*pos, elem, elem->datalen +2 ); + *pos += elem->datalen +2 ; + +if (elem->datalen !=255 ) +break ; } -/* get non inheritance list if exists */ - non_inherit_elem = -cfg80211_find_ext_elem (WLAN_EID_EXT_NON_INHERITANCE , - sub_copy, subie_len); +return *pos - buf; +} -/* go through IEs in ie (skip SSID) and subelement, -* merge them into new_ie +static size_t cfg80211_gen_new_ie (const u8 *ie,size_t ielen, +const u8 *subie,size_t subie_len, +u8 *new_ie,size_t new_ie_len) +{ +const struct element *non_inherit_elem, *parent, *sub; +u8 *pos = new_ie; +u8 id, ext_id; +unsigned int match_len; + + non_inherit_elem =cfg80211_find_ext_elem (WLAN_EID_EXT_NON_INHERITANCE , + subie, subie_len); + +/* We copy the elements one by one from the parent to the generated +* elements. +* If they are not inherited (included in subie or in the non +* inheritance element), then we copy all occurrences the first time +* we see this element type. */ - tmp_old =cfg80211_find_ie (WLAN_EID_SSID , ie, ielen); - tmp_old = (tmp_old) ? tmp_old + tmp_old[1 ] +2 : ie; - -while (tmp_old +2 - ie <= ielen && - tmp_old + tmp_old[1 ] +2 - ie <= ielen) { -if (tmp_old[0 ] ==0 ) { - tmp_old++; +for_each_element (parent, ie, ielen) { +if (parent->id ==WLAN_EID_FRAGMENT )continue ; + +if (parent->id ==WLAN_EID_EXTENSION ) { +if (parent->datalen <1 ) +continue ; + + id =WLAN_EID_EXTENSION ; + ext_id = parent->data[0 ]; + match_len =1 ; + }else { + id = parent->id; + match_len =0 ; } -if (tmp_old[0 ] ==WLAN_EID_EXTENSION ) - tmp = (u8 *)cfg80211_find_ext_ie (tmp_old[2 ], sub_copy, - subie_len); -else - tmp = (u8 *)cfg80211_find_ie (tmp_old[0 ], sub_copy, - subie_len); +/* Find first occurrence in subie */ + sub =cfg80211_find_elem_match (id, subie, subie_len, + &ext_id, match_len,0 ); -if (!tmp) { -const struct element *old_elem = (void *)tmp_old; +/* Copy from parent if not in subie and inherited */ +if (!sub && +cfg80211_is_element_inherited (parent, non_inherit_elem)) { +if (!cfg80211_copy_elem_with_frags (parent, + ie, ielen, + &pos, new_ie, + new_ie_len)) +return 0 ; -/* ie in old ie but not in subelement */ -if (cfg80211_is_element_inherited (old_elem, - non_inherit_elem)) { -memcpy (pos, tmp_old, tmp_old[1 ] +2 ); - pos += tmp_old[1 ] +2 ; - } - }else { -/* ie in transmitting ie also in subelement, -* copy from subelement and flag the ie in subelement -* as copied (by setting eid field to WLAN_EID_SSID, -* which is skipped anyway). -* For vendor ie, compare OUI + type + subType to -* determine if they are the same ie. -*/ -if (tmp_old[0 ] ==WLAN_EID_VENDOR_SPECIFIC ) { -if (tmp_old[1 ] >=5 && tmp[1 ] >=5 && - !memcmp (tmp_old +2 , tmp +2 ,5 )) { -/* same vendor ie, copy from -* subelement -*/ -memcpy (pos, tmp, tmp[1 ] +2 ); - pos += tmp[1 ] +2 ; - tmp[0 ] =WLAN_EID_SSID ; - }else { -memcpy (pos, tmp_old, tmp_old[1 ] +2 ); - pos += tmp_old[1 ] +2 ; - } - }else { -/* copy ie from subelement into new ie */ -memcpy (pos, tmp, tmp[1 ] +2 ); - pos += tmp[1 ] +2 ; - tmp[0 ] =WLAN_EID_SSID ; - } +continue ; } -if (tmp_old + tmp_old[1 ] +2 - ie == ielen) -break ; +/* Already copied if an earlier element had the same type */ +if (cfg80211_find_elem_match (id, ie, (u8 *)parent - ie, + &ext_id, match_len,0 )) +continue ; - tmp_old += tmp_old[1 ] +2 ; +/* Not inheriting, copy all similar elements from subie */ +while (sub) { +if (!cfg80211_copy_elem_with_frags (sub, + subie, subie_len, + &pos, new_ie, + new_ie_len)) +return 0 ; + + sub =cfg80211_find_elem_match (id, + sub->data + sub->datalen, + subie_len + subie - + (sub->data + + sub->datalen), + &ext_id, match_len,0 ); + } } -/* go through subelement again to check if there is any ie not -* copied to new ie, skip ssid, capability, bssid-index ie +/* The above misses elements that are included in subie but not in the +* parent, so do a pass over subie and append those. +* Skip the non-tx BSSID caps and non-inheritance element. */ - tmp_new = sub_copy; -while (tmp_new +2 - sub_copy <= subie_len && - tmp_new + tmp_new[1 ] +2 - sub_copy <= subie_len) { -if (!(tmp_new[0 ] ==WLAN_EID_NON_TX_BSSID_CAP || - tmp_new[0 ] ==WLAN_EID_SSID )) { -memcpy (pos, tmp_new, tmp_new[1 ] +2 ); - pos += tmp_new[1 ] +2 ; +for_each_element (sub, subie, subie_len) { +if (sub->id ==WLAN_EID_NON_TX_BSSID_CAP ) +continue ; + +if (sub->id ==WLAN_EID_FRAGMENT ) +continue ; + +if (sub->id ==WLAN_EID_EXTENSION ) { +if (sub->datalen <1 ) +continue ; + + id =WLAN_EID_EXTENSION ; + ext_id = sub->data[0 ]; + match_len =1 ; + +if (ext_id ==WLAN_EID_EXT_NON_INHERITANCE ) +continue ; + }else { + id = sub->id; + match_len =0 ; } -if (tmp_new + tmp_new[1 ] +2 - sub_copy == subie_len) -break ; - tmp_new += tmp_new[1 ] +2 ; + +/* Processed if one was included in the parent */ +if (cfg80211_find_elem_match (id, ie, ielen, + &ext_id, match_len,0 )) +continue ; + +if (!cfg80211_copy_elem_with_frags (sub, subie, subie_len, + &pos, new_ie, new_ie_len)) +return 0 ; } -kfree (sub_copy);return pos - new_ie; }
@@ -1659,7 +1694,7 @@ static void cfg80211_parse_mbssid_data(struct wiphy *wiphy, new_ie_len =cfg80211_gen_new_ie (ie, ielen, profile, profile_len, new_ie, - gfp); +IEEE80211_MAX_DATA_LEN );if (!new_ie_len)continue ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 59/313 wifi: ath9k: convert msecs to jiffies where needed
In reply to Greg Kroah-HartmanFrom: Dmitry Antipov <[email protected]>
[ Upstream commit 2aa083acea9f61be3280184384551178f510ff51 ]
Since 'ieee80211_queue_delayed_work()' expects timeout in jiffies and not milliseconds, 'msecs_to_jiffies()' should be used in 'ath_restart_work()' and '__ath9k_flush()'.
--- drivers/net/wireless/ath/ath9k/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath9k/main.c +2 -2
@@ -200,7 +200,7 @@ void ath_cancel_work(struct ath_softc *sc)void ath_restart_work (struct ath_softc *sc) {ieee80211_queue_delayed_work (sc->hw, &sc->hw_check_work, -ATH_HW_CHECK_POLL_INT ); +msecs_to_jiffies (ATH_HW_CHECK_POLL_INT ));if (AR_SREV_9340 (sc->sc_ah) ||AR_SREV_9330 (sc->sc_ah)) ieee80211_queue_delayed_work(sc->hw, &sc->hw_pll_work,
@@ -2228,7 +2228,7 @@ void __ath9k_flush(struct ieee80211_hw *hw, u32 queues, bool drop, }ieee80211_queue_delayed_work (hw, &sc->hw_check_work, -ATH_HW_CHECK_POLL_INT ); +msecs_to_jiffies (ATH_HW_CHECK_POLL_INT )); }static bool ath9k_tx_frames_pending (struct ieee80211_hw *hw)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 60/313 netlink: fix potential deadlock in netlink_set_err()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 8d61f926d42045961e6b65191c09e3678d86a9cf ]
syzbot reported a possible deadlock in netlink_set_err() [1]
A similar issue was fixed in commit 1d482e666b8e ("netlink: disable IRQs for netlink_lock_table()") in netlink_lock_table()
This patch adds IRQ safety to netlink_set_err() and __netlink_diag_dump() which were not covered by cited commit.
[1]
WARNING: possible irq lock inversion dependency detected 6.4.0-rc6-syzkaller-00240-g4e9f0ec38852 #0 Not tainted
syz-executor.2/23011 just changed the state of lock:ffffffff8e1a7a58 (nl_table_lock){.+.?}-{2:2}, at: netlink_set_err+0x2e/0x3a0 net/netlink/af_netlink.c:1612 but this lock was taken by another, SOFTIRQ-safe lock in the past:
(&local->queue_stop_reason_lock){..-.}-{2:2}
and interrupts could create inverse lock ordering between them.
other info that might help us debug this:
Possible interrupt unsafe locking scenario:
CPU0 CPU1
---- ----
lock(nl_table_lock);
local_irq_disable();
lock(&local->queue_stop_reason_lock);
lock(nl_table_lock);
<Interrupt>
lock(&local->queue_stop_reason_lock);*** DEADLOCK ***
--- net/netlink/af_netlink.c | 5 +++-- net/netlink/diag.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-)
net/netlink/af_netlink.c +3 -2
@@ -1601,6 +1601,7 @@ static int do_one_set_err(struct sock *sk, struct netlink_set_err_data *p)int netlink_set_err (struct sock *ssk,u32 portid,u32 group,int code) {struct netlink_set_err_data info; +unsigned long flags;struct sock *sk;int ret =0 ;
@@ -1610,12 +1611,12 @@ int netlink_set_err(struct sock *ssk, u32 portid, u32 group, int code)/* sk->sk_err wants a positive error value */ info.code = -code; -read_lock (&nl_table_lock); +read_lock_irqsave (&nl_table_lock, flags);sk_for_each_bound (sk, &nl_table[ssk->sk_protocol].mc_list) ret +=do_one_set_err (sk, &info); -read_unlock (&nl_table_lock); +read_unlock_irqrestore (&nl_table_lock, flags);return ret; }EXPORT_SYMBOL (netlink_set_err);
net/netlink/diag.c +3 -2
@@ -94,6 +94,7 @@ static int __netlink_diag_dump(struct sk_buff *skb, struct netlink_callback *cb,struct net *net =sock_net (skb->sk);struct netlink_diag_req *req;struct netlink_sock *nlsk; +unsigned long flags;struct sock *sk;int num =2 ;int ret =0 ;
@@ -152,7 +153,7 @@ static int __netlink_diag_dump(struct sk_buff *skb, struct netlink_callback *cb, num++; mc_list: -read_lock (&nl_table_lock); +read_lock_irqsave (&nl_table_lock, flags);sk_for_each_bound (sk, &tbl->mc_list) {if (sk_hashed (sk))continue ;
@@ -173,7 +174,7 @@ static int __netlink_diag_dump(struct sk_buff *skb, struct netlink_callback *cb, } num++; } -read_unlock (&nl_table_lock); +read_unlock_irqrestore (&nl_table_lock, flags); done: cb->args[0 ] = num;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 61/313 netlink: do not hard code device address lenth in fdb dumps
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit aa5406950726e336c5c9585b09799a734b6e77bf ]
syzbot reports that some netdev devices do not have a six bytes address [1]
Replace ETH_ALEN by dev->addr_len.
[1] (Case of a device where dev->addr_len = 4)
BUG: KMSAN: kernel-infoleak in instrument_copy_to_user include/linux/instrumented.h:114 [inline] BUG: KMSAN: kernel-infoleak in copyout+0xb8/0x100 lib/iov_iter.c:169 instrument_copy_to_user include/linux/instrumented.h:114 [inline] copyout+0xb8/0x100 lib/iov_iter.c:169 _copy_to_iter+0x6d8/0x1d00 lib/iov_iter.c:536 copy_to_iter include/linux/uio.h:206 [inline] simple_copy_to_iter+0x68/0xa0 net/core/datagram.c:513 __skb_datagram_iter+0x123/0xdc0 net/core/datagram.c:419 skb_copy_datagram_iter+0x5c/0x200 net/core/datagram.c:527 skb_copy_datagram_msg include/linux/skbuff.h:3960 [inline] netlink_recvmsg+0x4ae/0x15a0 net/netlink/af_netlink.c:1970 sock_recvmsg_nosec net/socket.c:1019 [inline] sock_recvmsg net/socket.c:1040 [inline] ____sys_recvmsg+0x283/0x7f0 net/socket.c:2722 ___sys_recvmsg+0x223/0x840 net/socket.c:2764 do_recvmmsg+0x4f9/0xfd0 net/socket.c:2858 __sys_recvmmsg net/socket.c:2937 [inline] __do_sys_recvmmsg net/socket.c:2960 [inline] __se_sys_recvmmsg net/socket.c:2953 [inline] __x64_sys_recvmmsg+0x397/0x490 net/socket.c:2953 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x41/0xc0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
Uninit was stored to memory at:
__nla_put lib/nlattr.c:1009 [inline] nla_put+0x1c6/0x230 lib/nlattr.c:1067 nlmsg_populate_fdb_fill+0x2b8/0x600 net/core/rtnetlink.c:4071 nlmsg_populate_fdb net/core/rtnetlink.c:4418 [inline] ndo_dflt_fdb_dump+0x616/0x840 net/core/rtnetlink.c:4456 rtnl_fdb_dump+0x14ff/0x1fc0 net/core/rtnetlink.c:4629 netlink_dump+0x9d1/0x1310 net/netlink/af_netlink.c:2268 netlink_recvmsg+0xc5c/0x15a0 net/netlink/af_netlink.c:1995 sock_recvmsg_nosec+0x7a/0x120 net/socket.c:1019 ____sys_recvmsg+0x664/0x7f0 net/socket.c:2720 ___sys_recvmsg+0x223/0x840 net/socket.c:2764 do_recvmmsg+0x4f9/0xfd0 net/socket.c:2858 __sys_recvmmsg net/socket.c:2937 [inline] __do_sys_recvmmsg net/socket.c:2960 [inline] __se_sys_recvmmsg net/socket.c:2953 [inline] __x64_sys_recvmmsg+0x397/0x490 net/socket.c:2953 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x41/0xc0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
Uninit was created at:
slab_post_alloc_hook+0x12d/0xb60 mm/slab.h:716 slab_alloc_node mm/slub.c:3451 [inline] __kmem_cache_alloc_node+0x4ff/0x8b0 mm/slub.c:3490 kmalloc_trace+0x51/0x200 mm/slab_common.c:1057 kmalloc include/linux/slab.h:559 [inline] __hw_addr_create net/core/dev_addr_lists.c:60 [inline] __hw_addr_add_ex+0x2e5/0x9e0 net/core/dev_addr_lists.c:118 __dev_mc_add net/core/dev_addr_lists.c:867 [inline] dev_mc_add+0x9a/0x130 net/core/dev_addr_lists.c:885 igmp6_group_added+0x267/0xbc0 net/ipv6/mcast.c:680 ipv6_mc_up+0x296/0x3b0 net/ipv6/mcast.c:2754 ipv6_mc_remap+0x1e/0x30 net/ipv6/mcast.c:2708 addrconf_type_change net/ipv6/addrconf.c:3731 [inline] addrconf_notify+0x4d3/0x1d90 net/ipv6/addrconf.c:3699 notifier_call_chain kernel/notifier.c:93 [inline] raw_notifier_call_chain+0xe4/0x430 kernel/notifier.c:461 call_netdevice_notifiers_info net/core/dev.c:1935 [inline] call_netdevice_notifiers_extack net/core/dev.c:1973 [inline] call_netdevice_notifiers+0x1ee/0x2d0 net/core/dev.c:1987 bond_enslave+0xccd/0x53f0 drivers/net/bonding/bond_main.c:1906 do_set_master net/core/rtnetlink.c:2626 [inline] rtnl_newlink_create net/core/rtnetlink.c:3460 [inline] __rtnl_newlink net/core/rtnetlink.c:3660 [inline] rtnl_newlink+0x378c/0x40e0 net/core/rtnetlink.c:3673 rtnetlink_rcv_msg+0x16a6/0x1840 net/core/rtnetlink.c:6395 netlink_rcv_skb+0x371/0x650 net/netlink/af_netlink.c:2546 rtnetlink_rcv+0x34/0x40 net/core/rtnetlink.c:6413 netlink_unicast_kernel net/netlink/af_netlink.c:1339 [inline] netlink_unicast+0xf28/0x1230 net/netlink/af_netlink.c:1365 netlink_sendmsg+0x122f/0x13d0 net/netlink/af_netlink.c:1913 sock_sendmsg_nosec net/socket.c:724 [inline] sock_sendmsg net/socket.c:747 [inline] ____sys_sendmsg+0x999/0xd50 net/socket.c:2503 ___sys_sendmsg+0x28d/0x3c0 net/socket.c:2557 __sys_sendmsg net/socket.c:2586 [inline] __do_sys_sendmsg net/socket.c:2595 [inline] __se_sys_sendmsg net/socket.c:2593 [inline] __x64_sys_sendmsg+0x304/0x490 net/socket.c:2593 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x41/0xc0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
Bytes 2856-2857 of 3500 are uninitialized Memory access of size 3500 starts at ffff888018d99104 Data copied to user address 0000000020000480
--- net/core/rtnetlink.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/core/rtnetlink.c +4 -4
@@ -3586,7 +3586,7 @@ static int nlmsg_populate_fdb_fill(struct sk_buff *skb, ndm->ndm_ifindex = dev->ifindex; ndm->ndm_state = ndm_state; -if (nla_put (skb,NDA_LLADDR ,ETH_ALEN , addr)) +if (nla_put (skb,NDA_LLADDR , dev->addr_len, addr)) goto nla_put_failure;if (vid)if (nla_put (skb,NDA_VLAN ,sizeof (u16), &vid))
@@ -3600,10 +3600,10 @@ static int nlmsg_populate_fdb_fill(struct sk_buff *skb,return -EMSGSIZE ; } -static inline size_t rtnl_fdb_nlmsg_size (void ) +static inline size_t rtnl_fdb_nlmsg_size (const struct net_device *dev) {return NLMSG_ALIGN (sizeof (struct ndmsg )) + -nla_total_size (ETH_ALEN ) +/* NDA_LLADDR */ +nla_total_size (dev->addr_len) +/* NDA_LLADDR */ nla_total_size (sizeof (u16)) +/* NDA_VLAN */ 0 ; }
@@ -3615,7 +3615,7 @@ static void rtnl_fdb_notify(struct net_device *dev, u8 *addr, u16 vid, int type,struct sk_buff *skb;int err = -ENOBUFS ; - skb =nlmsg_new (rtnl_fdb_nlmsg_size (),GFP_ATOMIC ); + skb =nlmsg_new (rtnl_fdb_nlmsg_size (dev),GFP_ATOMIC );if (!skb) goto errout;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 62/313 selftests: rtnetlink: remove netdevsim device after ipsec offload test
In reply to Greg Kroah-HartmanFrom: Sabrina Dubroca <[email protected]>
[ Upstream commit 5f789f103671fec3733ebe756e56adf15c90c21d ]
On systems where netdevsim is built-in or loaded before the test starts, kci_test_ipsec_offload doesn't remove the netdevsim device it created during the test.
--- tools/testing/selftests/net/rtnetlink.sh | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/net/rtnetlink.sh +1 -0
@@ -833,6 +833,7 @@ EOF fi # clean up any leftovers + echo 0 > /sys/bus/netdevsim/del_device $probed && rmmod netdevsim if [ $ret -ne 0 ]; then
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 63/313 gtp: Fix use-after-free in __gtp_encap_destroy().
In reply to Greg Kroah-HartmanFrom: Kuniyuki Iwashima <[email protected]>
[ Upstream commit ce3aee7114c575fab32a5e9e939d4bbb3dcca79f ]
syzkaller reported use-after-free in __gtp_encap_destroy(). [0]
It shows the same process freed sk and touched it illegally.
Commit e198987e7dd7 ("gtp: fix suspicious RCU usage") added lock_sock() and release_sock() in __gtp_encap_destroy() to protect sk->sk_user_data, but release_sock() is called after sock_put() releases the last refcnt.
[0]:
BUG: KASAN: slab-use-after-free in instrument_atomic_read_write include/linux/instrumented.h:96 [inline] BUG: KASAN: slab-use-after-free in atomic_try_cmpxchg_acquire include/linux/atomic/atomic-instrumented.h:541 [inline] BUG: KASAN: slab-use-after-free in queued_spin_lock include/asm-generic/qspinlock.h:111 [inline] BUG: KASAN: slab-use-after-free in do_raw_spin_lock include/linux/spinlock.h:186 [inline] BUG: KASAN: slab-use-after-free in __raw_spin_lock_bh include/linux/spinlock_api_smp.h:127 [inline] BUG: KASAN: slab-use-after-free in _raw_spin_lock_bh+0x75/0xe0 kernel/locking/spinlock.c:178 Write of size 4 at addr ffff88800dbef398 by task syz-executor.2/2401 CPU: 1 PID: 2401 Comm: syz-executor.2 Not tainted 6.4.0-rc5-01219-gfa0e21fa4443 #2 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.0-0-gd239552ce722-prebuilt.qemu.org 04/01/2014 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x72/0xa0 lib/dump_stack.c:106 print_address_description mm/kasan/report.c:351 [inline] print_report+0xcc/0x620 mm/kasan/report.c:462 kasan_report+0xb2/0xe0 mm/kasan/report.c:572 check_region_inline mm/kasan/generic.c:181 [inline] kasan_check_range+0x39/0x1c0 mm/kasan/generic.c:187 instrument_atomic_read_write include/linux/instrumented.h:96 [inline] atomic_try_cmpxchg_acquire include/linux/atomic/atomic-instrumented.h:541 [inline] queued_spin_lock include/asm-generic/qspinlock.h:111 [inline] do_raw_spin_lock include/linux/spinlock.h:186 [inline] __raw_spin_lock_bh include/linux/spinlock_api_smp.h:127 [inline] _raw_spin_lock_bh+0x75/0xe0 kernel/locking/spinlock.c:178 spin_lock_bh include/linux/spinlock.h:355 [inline] release_sock+0x1f/0x1a0 net/core/sock.c:3526 gtp_encap_disable_sock drivers/net/gtp.c:651 [inline] gtp_encap_disable+0xb9/0x220 drivers/net/gtp.c:664 gtp_dev_uninit+0x19/0x50 drivers/net/gtp.c:728 unregister_netdevice_many_notify+0x97e/0x1520 net/core/dev.c:10841 rtnl_delete_link net/core/rtnetlink.c:3216 [inline] rtnl_dellink+0x3c0/0xb30 net/core/rtnetlink.c:3268 rtnetlink_rcv_msg+0x450/0xb10 net/core/rtnetlink.c:6423 netlink_rcv_skb+0x15d/0x450 net/netlink/af_netlink.c:2548 netlink_unicast_kernel net/netlink/af_netlink.c:1339 [inline] netlink_unicast+0x700/0x930 net/netlink/af_netlink.c:1365 netlink_sendmsg+0x91c/0xe30 net/netlink/af_netlink.c:1913 sock_sendmsg_nosec net/socket.c:724 [inline] sock_sendmsg+0x1b7/0x200 net/socket.c:747 ____sys_sendmsg+0x75a/0x990 net/socket.c:2493 ___sys_sendmsg+0x11d/0x1c0 net/socket.c:2547 __sys_sendmsg+0xfe/0x1d0 net/socket.c:2576 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3f/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x72/0xdc RIP: 0033:0x7f1168b1fe5d Code: ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 73 9f 1b 00 f7 d8 64 89 01 48 RSP: 002b:00007f1167edccc8 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 00000000004bbf80 RCX: 00007f1168b1fe5d RDX: 0000000000000000 RSI: 00000000200002c0 RDI: 0000000000000003 RBP: 00000000004bbf80 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 000000000000000b R14: 00007f1168b80530 R15: 0000000000000000 </TASK> Allocated by task 1483: kasan_save_stack+0x22/0x50 mm/kasan/common.c:45 kasan_set_track+0x25/0x30 mm/kasan/common.c:52 __kasan_slab_alloc+0x59/0x70 mm/kasan/common.c:328 kasan_slab_alloc include/linux/kasan.h:186 [inline] slab_post_alloc_hook mm/slab.h:711 [inline] slab_alloc_node mm/slub.c:3451 [inline] slab_alloc mm/slub.c:3459 [inline] __kmem_cache_alloc_lru mm/slub.c:3466 [inline] kmem_cache_alloc+0x16d/0x340 mm/slub.c:3475 sk_prot_alloc+0x5f/0x280 net/core/sock.c:2073 sk_alloc+0x34/0x6c0 net/core/sock.c:2132 inet6_create net/ipv6/af_inet6.c:192 [inline] inet6_create+0x2c7/0xf20 net/ipv6/af_inet6.c:119 __sock_create+0x2a1/0x530 net/socket.c:1535 sock_create net/socket.c:1586 [inline] __sys_socket_create net/socket.c:1623 [inline] __sys_socket_create net/socket.c:1608 [inline] __sys_socket+0x137/0x250 net/socket.c:1651 __do_sys_socket net/socket.c:1664 [inline] __se_sys_socket net/socket.c:1662 [inline] __x64_sys_socket+0x72/0xb0 net/socket.c:1662 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3f/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x72/0xdc Freed by task 2401: kasan_save_stack+0x22/0x50 mm/kasan/common.c:45 kasan_set_track+0x25/0x30 mm/kasan/common.c:52 kasan_save_free_info+0x2e/0x50 mm/kasan/generic.c:521 ____kasan_slab_free mm/kasan/common.c:236 [inline] ____kasan_slab_free mm/kasan/common.c:200 [inline] __kasan_slab_free+0x10c/0x1b0 mm/kasan/common.c:244 kasan_slab_free include/linux/kasan.h:162 [inline] slab_free_hook mm/slub.c:1781 [inline] slab_free_freelist_hook mm/slub.c:1807 [inline] slab_free mm/slub.c:3786 [inline] kmem_cache_free+0xb4/0x490 mm/slub.c:3808 sk_prot_free net/core/sock.c:2113 [inline] __sk_destruct+0x500/0x720 net/core/sock.c:2207 sk_destruct+0xc1/0xe0 net/core/sock.c:2222 __sk_free+0xed/0x3d0 net/core/sock.c:2233 sk_free+0x7c/0xa0 net/core/sock.c:2244 sock_put include/net/sock.h:1981 [inline] __gtp_encap_destroy+0x165/0x1b0 drivers/net/gtp.c:634 gtp_encap_disable_sock drivers/net/gtp.c:651 [inline] gtp_encap_disable+0xb9/0x220 drivers/net/gtp.c:664 gtp_dev_uninit+0x19/0x50 drivers/net/gtp.c:728 unregister_netdevice_many_notify+0x97e/0x1520 net/core/dev.c:10841 rtnl_delete_link net/core/rtnetlink.c:3216 [inline] rtnl_dellink+0x3c0/0xb30 net/core/rtnetlink.c:3268 rtnetlink_rcv_msg+0x450/0xb10 net/core/rtnetlink.c:6423 netlink_rcv_skb+0x15d/0x450 net/netlink/af_netlink.c:2548 netlink_unicast_kernel net/netlink/af_netlink.c:1339 [inline] netlink_unicast+0x700/0x930 net/netlink/af_netlink.c:1365 netlink_sendmsg+0x91c/0xe30 net/netlink/af_netlink.c:1913 sock_sendmsg_nosec net/socket.c:724 [inline] sock_sendmsg+0x1b7/0x200 net/socket.c:747 ____sys_sendmsg+0x75a/0x990 net/socket.c:2493 ___sys_sendmsg+0x11d/0x1c0 net/socket.c:2547 __sys_sendmsg+0xfe/0x1d0 net/socket.c:2576 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3f/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x72/0xdc The buggy address belongs to the object at ffff88800dbef300 which belongs to the cache UDPv6 of size 1344
The buggy address is located 152 bytes inside of
freed 1344-byte region [ffff88800dbef300, ffff88800dbef840)
The buggy address belongs to the physical page:
page:00000000d31bfed5 refcount:1 mapcount:0 mapping:0000000000000000 index:0xffff88800dbeed40 pfn:0xdbe8 head:00000000d31bfed5 order:3 entire_mapcount:0 nr_pages_mapped:0 pincount:0 memcg:ffff888008ee0801
flags: 0x100000000010200(slab|head|node=0|zone=1)page_type: 0xffffffff()
raw: 0100000000010200 ffff88800c7a3000 dead000000000122 0000000000000000
raw: ffff88800dbeed40 0000000080160015 00000001ffffffff ffff888008ee0801
page dumped because: kasan: bad access detected
Memory state around the buggy address:
ffff88800dbef280: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
ffff88800dbef300: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
>ffff88800dbef380: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
^
ffff88800dbef400: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff88800dbef480: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb--- drivers/net/gtp.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/gtp.c +2 -0
@@ -297,7 +297,9 @@ static void __gtp_encap_destroy(struct sock *sk) gtp->sk1u =NULL ;udp_sk (sk)->encap_type =0 ;rcu_assign_sk_user_data (sk,NULL ); +release_sock (sk);sock_put (sk); +return ; }release_sock (sk); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 64/313 nfc: llcp: simplify llcp_sock_connect() error paths
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit ec10fd154d934cc4195da3cbd017a12817b41d51 ]
The llcp_sock_connect() error paths were using a mixed way of central exit (goto) and cleanup
Stable-dep-of: 6709d4b7bc2e ("net: nfc: Fix use-after-free caused by nfc_llcp_find_local")
--- net/nfc/llcp_sock.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
net/nfc/llcp_sock.c +4 -3
@@ -712,10 +712,8 @@ static int llcp_sock_connect(struct socket *sock, struct sockaddr *_addr, llcp_sock->local =nfc_llcp_local_get (local); llcp_sock->ssap =nfc_llcp_get_local_ssap (local);if (llcp_sock->ssap ==LLCP_SAP_MAX ) { -nfc_llcp_local_put (llcp_sock->local); - llcp_sock->local =NULL ; ret = -ENOMEM ; - goto put_dev; + goto sock_llcp_put_local; } llcp_sock->reserved_ssap = llcp_sock->ssap;
@@ -760,8 +758,11 @@ static int llcp_sock_connect(struct socket *sock, struct sockaddr *_addr, sock_llcp_release:nfc_llcp_put_ssap (local, llcp_sock->ssap); + +sock_llcp_put_local:nfc_llcp_local_put (llcp_sock->local); llcp_sock->local =NULL ; + llcp_sock->dev =NULL ; put_dev:nfc_put_device (dev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 65/313 net: nfc: Fix use-after-free caused by nfc_llcp_find_local
In reply to Greg Kroah-HartmanFrom: Lin Ma <[email protected]>
[ Upstream commit 6709d4b7bc2e079241fdef15d1160581c5261c10 ]
This commit fixes several use-after-free that caused by function nfc_llcp_find_local(). For example, one UAF can happen when below buggy time window occurs.
// nfc_genl_llc_get_params | // nfc_unregister_device
|
dev = nfc_get_device(idx); | device_lock(...)
if (!dev) | dev->shutting_down = true;
return -ENODEV; | device_unlock(...);
|
device_lock(...); | // nfc_llcp_unregister_device
| nfc_llcp_find_local()
nfc_llcp_find_local(...); |
| local_cleanup()
if (!local) { |
rc = -ENODEV; | // nfc_llcp_local_put
goto exit; | kref_put(.., local_release)
} |
| // local_release
| list_del(&local->list)
// nfc_genl_send_params | kfree()
local->dev->idx !!!UAF!!! |
|and the crash trace for the one of the discussed UAF like:
BUG: KASAN: slab-use-after-free in nfc_genl_llc_get_params+0x72f/0x780 net/nfc/netlink.c:1045 Read of size 8 at addr ffff888105b0e410 by task 20114 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x72/0xa0 lib/dump_stack.c:106 print_address_description mm/kasan/report.c:319 [inline] print_report+0xcc/0x620 mm/kasan/report.c:430 kasan_report+0xb2/0xe0 mm/kasan/report.c:536 nfc_genl_send_params net/nfc/netlink.c:999 [inline] nfc_genl_llc_get_params+0x72f/0x780 net/nfc/netlink.c:1045 genl_family_rcv_msg_doit.isra.0+0x1ee/0x2e0 net/netlink/genetlink.c:968 genl_family_rcv_msg net/netlink/genetlink.c:1048 [inline] genl_rcv_msg+0x503/0x7d0 net/netlink/genetlink.c:1065 netlink_rcv_skb+0x161/0x430 net/netlink/af_netlink.c:2548 genl_rcv+0x28/0x40 net/netlink/genetlink.c:1076 netlink_unicast_kernel net/netlink/af_netlink.c:1339 [inline] netlink_unicast+0x644/0x900 net/netlink/af_netlink.c:1365 netlink_sendmsg+0x934/0xe70 net/netlink/af_netlink.c:1913 sock_sendmsg_nosec net/socket.c:724 [inline] sock_sendmsg+0x1b6/0x200 net/socket.c:747 ____sys_sendmsg+0x6e9/0x890 net/socket.c:2501 ___sys_sendmsg+0x110/0x1b0 net/socket.c:2555 __sys_sendmsg+0xf7/0x1d0 net/socket.c:2584 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3f/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x72/0xdc RIP: 0033:0x7f34640a2389 RSP: 002b:00007f3463415168 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 00007f34641c1f80 RCX: 00007f34640a2389 RDX: 0000000000000000 RSI: 0000000020000240 RDI: 0000000000000006 RBP: 00007f34640ed493 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 00007ffe38449ecf R14: 00007f3463415300 R15: 0000000000022000 </TASK> Allocated by task 20116: kasan_save_stack+0x22/0x50 mm/kasan/common.c:45 kasan_set_track+0x25/0x30 mm/kasan/common.c:52 ____kasan_kmalloc mm/kasan/common.c:374 [inline] __kasan_kmalloc+0x7f/0x90 mm/kasan/common.c:383 kmalloc include/linux/slab.h:580 [inline] kzalloc include/linux/slab.h:720 [inline] nfc_llcp_register_device+0x49/0xa40 net/nfc/llcp_core.c:1567 nfc_register_device+0x61/0x260 net/nfc/core.c:1124 nci_register_device+0x776/0xb20 net/nfc/nci/core.c:1257 virtual_ncidev_open+0x147/0x230 drivers/nfc/virtual_ncidev.c:148 misc_open+0x379/0x4a0 drivers/char/misc.c:165 chrdev_open+0x26c/0x780 fs/char_dev.c:414 do_dentry_open+0x6c4/0x12a0 fs/open.c:920 do_open fs/namei.c:3560 [inline] path_openat+0x24fe/0x37e0 fs/namei.c:3715 do_filp_open+0x1ba/0x410 fs/namei.c:3742 do_sys_openat2+0x171/0x4c0 fs/open.c:1356 do_sys_open fs/open.c:1372 [inline] __do_sys_openat fs/open.c:1388 [inline] __se_sys_openat fs/open.c:1383 [inline] __x64_sys_openat+0x143/0x200 fs/open.c:1383 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3f/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x72/0xdc Freed by task 20115: kasan_save_stack+0x22/0x50 mm/kasan/common.c:45 kasan_set_track+0x25/0x30 mm/kasan/common.c:52 kasan_save_free_info+0x2e/0x50 mm/kasan/generic.c:521 ____kasan_slab_free mm/kasan/common.c:236 [inline] ____kasan_slab_free mm/kasan/common.c:200 [inline] __kasan_slab_free+0x10a/0x190 mm/kasan/common.c:244 kasan_slab_free include/linux/kasan.h:162 [inline] slab_free_hook mm/slub.c:1781 [inline] slab_free_freelist_hook mm/slub.c:1807 [inline] slab_free mm/slub.c:3787 [inline] __kmem_cache_free+0x7a/0x190 mm/slub.c:3800 local_release net/nfc/llcp_core.c:174 [inline] kref_put include/linux/kref.h:65 [inline] nfc_llcp_local_put net/nfc/llcp_core.c:182 [inline] nfc_llcp_local_put net/nfc/llcp_core.c:177 [inline] nfc_llcp_unregister_device+0x206/0x290 net/nfc/llcp_core.c:1620 nfc_unregister_device+0x160/0x1d0 net/nfc/core.c:1179 virtual_ncidev_close+0x52/0xa0 drivers/nfc/virtual_ncidev.c:163 __fput+0x252/0xa20 fs/file_table.c:321 task_work_run+0x174/0x270 kernel/task_work.c:179 resume_user_mode_work include/linux/resume_user_mode.h:49 [inline] exit_to_user_mode_loop kernel/entry/common.c:171 [inline] exit_to_user_mode_prepare+0x108/0x110 kernel/entry/common.c:204 __syscall_exit_to_user_mode_work kernel/entry/common.c:286 [inline] syscall_exit_to_user_mode+0x21/0x50 kernel/entry/common.c:297 do_syscall_64+0x4c/0x90 arch/x86/entry/common.c:86 entry_SYSCALL_64_after_hwframe+0x72/0xdc Last potentially related work creation: kasan_save_stack+0x22/0x50 mm/kasan/common.c:45 __kasan_record_aux_stack+0x95/0xb0 mm/kasan/generic.c:491 kvfree_call_rcu+0x29/0xa80 kernel/rcu/tree.c:3328 drop_sysctl_table+0x3be/0x4e0 fs/proc/proc_sysctl.c:1735 unregister_sysctl_table.part.0+0x9c/0x190 fs/proc/proc_sysctl.c:1773 unregister_sysctl_table+0x24/0x30 fs/proc/proc_sysctl.c:1753 neigh_sysctl_unregister+0x5f/0x80 net/core/neighbour.c:3895 addrconf_notify+0x140/0x17b0 net/ipv6/addrconf.c:3684 notifier_call_chain+0xbe/0x210 kernel/notifier.c:87 call_netdevice_notifiers_info+0xb5/0x150 net/core/dev.c:1937 call_netdevice_notifiers_extack net/core/dev.c:1975 [inline] call_netdevice_notifiers net/core/dev.c:1989 [inline] dev_change_name+0x3c3/0x870 net/core/dev.c:1211 dev_ifsioc+0x800/0xf70 net/core/dev_ioctl.c:376 dev_ioctl+0x3d9/0xf80 net/core/dev_ioctl.c:542 sock_do_ioctl+0x160/0x260 net/socket.c:1213 sock_ioctl+0x3f9/0x670 net/socket.c:1316 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:870 [inline] __se_sys_ioctl fs/ioctl.c:856 [inline] __x64_sys_ioctl+0x19e/0x210 fs/ioctl.c:856 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3f/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x72/0xdc The buggy address belongs to the object at ffff888105b0e400 which belongs to the cache kmalloc-1k of size 1024
The buggy address is located 16 bytes inside of
freed 1024-byte region [ffff888105b0e400, ffff888105b0e800)
The buggy address belongs to the physical page:
head:ffffea000416c200 order:3 entire_mapcount:0 nr_pages_mapped:0 pincount:0
flags: 0x200000000010200(slab|head|node=0|zone=2)
raw: 0200000000010200 ffff8881000430c0 ffffea00044c7010 ffffea0004510e10
raw: 0000000000000000 00000000000a000a 00000001ffffffff 0000000000000000
page dumped because: kasan: bad access detected
Memory state around the buggy address:
ffff888105b0e300: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
ffff888105b0e380: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
>ffff888105b0e400: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
^
ffff888105b0e480: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff888105b0e500: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fbIn summary, this patch solves those use-after-free by
1. Re-implement the nfc_llcp_find_local(). The current version does not grab the reference when getting the local from the linked list. For example, the llcp_sock_bind() gets the reference like below:
// llcp_sock_bind()
local = nfc_llcp_find_local(dev); // A
..... \
| raceable
..... /
llcp_sock->local = nfc_llcp_local_get(local); // BThere is an apparent race window that one can drop the reference and free the local object fetched in (A) before (B) gets the reference.
2. Some callers of the nfc_llcp_find_local() do not grab the reference at all. For example, the nfc_genl_llc_{{get/set}_params/sdreq} functions. We add the nfc_llcp_local_put() for them. Moreover, we add the necessary error handling function to put the reference.
3. Add the nfc_llcp_remove_local() helper. The local object is removed from the linked list in local_release() when all reference is gone. This patch removes it when nfc_llcp_unregister_device() is called.
Therefore, every caller of nfc_llcp_find_local() will get a reference even when the nfc_llcp_unregister_device() is called. This promises no use-after-free for the local object is ever possible.
--- net/nfc/llcp.h | 1 - net/nfc/llcp_commands.c | 12 +++++++--- net/nfc/llcp_core.c | 49 +++++++++++++++++++++++++++++++++++------ net/nfc/llcp_sock.c | 18 ++++++++------- net/nfc/netlink.c | 20 ++++++++++++----- net/nfc/nfc.h | 1 + 6 files changed, 77 insertions(+), 24 deletions(-)
net/nfc/llcp.h +0 -1
@@ -202,7 +202,6 @@ void nfc_llcp_sock_link(struct llcp_sock_list *l, struct sock *s);void nfc_llcp_sock_unlink (struct llcp_sock_list *l,struct sock *s);void nfc_llcp_socket_remote_param_init (struct nfc_llcp_sock *sock);struct nfc_llcp_local *nfc_llcp_find_local (struct nfc_dev *dev); -struct nfc_llcp_local *nfc_llcp_local_get (struct nfc_llcp_local *local);int nfc_llcp_local_put (struct nfc_llcp_local *local);u8 nfc_llcp_get_sdp_ssap (struct nfc_llcp_local *local,struct nfc_llcp_sock *sock);
net/nfc/llcp_commands.c +9 -3
@@ -361,6 +361,7 @@ int nfc_llcp_send_symm(struct nfc_dev *dev)struct sk_buff *skb;struct nfc_llcp_local *local;u16 size =0 ; +int err;pr_debug ("Sending SYMM\n" );
@@ -372,8 +373,10 @@ int nfc_llcp_send_symm(struct nfc_dev *dev) size += dev->tx_headroom + dev->tx_tailroom +NFC_HEADER_SIZE ; skb =alloc_skb (size,GFP_KERNEL ); -if (skb ==NULL ) -return -ENOMEM ; +if (skb ==NULL ) { + err = -ENOMEM ; + goto out; + }skb_reserve (skb, dev->tx_headroom +NFC_HEADER_SIZE );
@@ -383,8 +386,11 @@ int nfc_llcp_send_symm(struct nfc_dev *dev)nfc_llcp_send_to_raw_sock (local, skb,NFC_DIRECTION_TX ); -return nfc_data_exchange (dev, local->target_idx, skb, + err =nfc_data_exchange (dev, local->target_idx, skb, nfc_llcp_recv, local); +out: +nfc_llcp_local_put (local); +return err; }int nfc_llcp_send_connect (struct nfc_llcp_sock *sock)
net/nfc/llcp_core.c +42 -7
123 lines not on this page · raw message
net/nfc/llcp_sock.c +10 -8
@@ -99,7 +99,7 @@ static int llcp_sock_bind(struct socket *sock, struct sockaddr *addr, int alen) } llcp_sock->dev = dev; - llcp_sock->local =nfc_llcp_local_get (local); + llcp_sock->local = local; llcp_sock->nfc_protocol = llcp_addr.nfc_protocol; llcp_sock->service_name_len = min_t(unsigned int, llcp_addr.service_name_len,
@@ -181,7 +181,7 @@ static int llcp_raw_sock_bind(struct socket *sock, struct sockaddr *addr, } llcp_sock->dev = dev; - llcp_sock->local =nfc_llcp_local_get (local); + llcp_sock->local = local; llcp_sock->nfc_protocol = llcp_addr.nfc_protocol;nfc_llcp_sock_link (&local->raw_sockets, sk);
@@ -698,22 +698,22 @@ static int llcp_sock_connect(struct socket *sock, struct sockaddr *_addr,if (dev->dep_link_up == false) { ret = -ENOLINK ;device_unlock (&dev->dev); - goto put_dev; + goto sock_llcp_put_local; }device_unlock (&dev->dev);if (local->rf_mode ==NFC_RF_INITIATOR && addr->target_idx != local->target_idx) { ret = -ENOLINK ; - goto put_dev; + goto sock_llcp_put_local; } llcp_sock->dev = dev; - llcp_sock->local =nfc_llcp_local_get (local); + llcp_sock->local = local; llcp_sock->ssap =nfc_llcp_get_local_ssap (local);if (llcp_sock->ssap ==LLCP_SAP_MAX ) { ret = -ENOMEM ; - goto sock_llcp_put_local; + goto sock_llcp_nullify; } llcp_sock->reserved_ssap = llcp_sock->ssap;
@@ -759,11 +759,13 @@ static int llcp_sock_connect(struct socket *sock, struct sockaddr *_addr, sock_llcp_release:nfc_llcp_put_ssap (local, llcp_sock->ssap); -sock_llcp_put_local: -nfc_llcp_local_put (llcp_sock->local); +sock_llcp_nullify: llcp_sock->local =NULL ; llcp_sock->dev =NULL ; +sock_llcp_put_local: +nfc_llcp_local_put (local); + put_dev:nfc_put_device (dev);
net/nfc/netlink.c +15 -5
@@ -1047,11 +1047,14 @@ static int nfc_genl_llc_get_params(struct sk_buff *skb, struct genl_info *info) msg =nlmsg_new (NLMSG_DEFAULT_SIZE ,GFP_KERNEL );if (!msg) { rc = -ENOMEM ; - goto exit; + goto put_local; } rc =nfc_genl_send_params (msg, local, info->snd_portid, info->snd_seq); +put_local: +nfc_llcp_local_put (local); + exit:device_unlock (&dev->dev);
@@ -1113,7 +1116,7 @@ static int nfc_genl_llc_set_params(struct sk_buff *skb, struct genl_info *info)if (info->attrs[NFC_ATTR_LLC_PARAM_LTO ]) {if (dev->dep_link_up) { rc = -EINPROGRESS ; - goto exit; + goto put_local; } local->lto =nla_get_u8 (info->attrs[NFC_ATTR_LLC_PARAM_LTO ]);
@@ -1125,6 +1128,9 @@ static int nfc_genl_llc_set_params(struct sk_buff *skb, struct genl_info *info)if (info->attrs[NFC_ATTR_LLC_PARAM_MIUX ]) local->miux =cpu_to_be16 (miux); +put_local: +nfc_llcp_local_put (local); + exit:device_unlock (&dev->dev);
@@ -1180,7 +1186,7 @@ static int nfc_genl_llc_sdreq(struct sk_buff *skb, struct genl_info *info)if (rc !=0 ) { rc = -EINVAL ; - goto exit; + goto put_local; }if (!sdp_attrs[NFC_SDP_ATTR_URI ])
@@ -1199,7 +1205,7 @@ static int nfc_genl_llc_sdreq(struct sk_buff *skb, struct genl_info *info) sdreq =nfc_llcp_build_sdreq_tlv (tid, uri, uri_len);if (sdreq ==NULL ) { rc = -ENOMEM ; - goto exit; + goto put_local; } tlvs_len += sdreq->tlv_len;
@@ -1209,10 +1215,14 @@ static int nfc_genl_llc_sdreq(struct sk_buff *skb, struct genl_info *info)if (hlist_empty (&sdreq_list)) { rc = -EINVAL ; - goto exit; + goto put_local; } rc =nfc_llcp_send_snl_sdreq (local, &sdreq_list, tlvs_len); + +put_local: +nfc_llcp_local_put (local); + exit:device_unlock (&dev->dev);
net/nfc/nfc.h +1 -0
@@ -52,6 +52,7 @@ int nfc_llcp_set_remote_gb(struct nfc_dev *dev, const u8 *gb, u8 gb_len);u8 *nfc_llcp_general_bytes (struct nfc_dev *dev,size_t *general_bytes_len);int nfc_llcp_data_received (struct nfc_dev *dev,struct sk_buff *skb);struct nfc_llcp_local *nfc_llcp_find_local (struct nfc_dev *dev); +int nfc_llcp_local_put (struct nfc_llcp_local *local);int __init nfc_llcp_init (void );void nfc_llcp_exit (void );void nfc_llcp_free_sdp_tlv (struct nfc_llcp_sdp_tlv *sdp);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 66/313 lib/ts_bm: reset initial match offset for every block of text
In reply to Greg Kroah-HartmanFrom: Jeremy Sowden <[email protected]>
[ Upstream commit 6f67fbf8192da80c4db01a1800c7fceaca9cf1f9 ]
The shift variable which indicates the offset in the string at which to start matching the pattern is initialized to bm->patlen - 1, but it is not reset when a new block is retrieved. This means the implemen- tation may start looking at later and later positions in each successive block and miss occurrences of the pattern at the beginning. E.g., consider a HTTP packet held in a non-linear skb, where the HTTP request line occurs in the second block:
[... 52 bytes of packet headers ...]
GET /bmtest HTTP/1.1\r\nHost: www.example.com\r\n\r\n
and the pattern is "GET /bmtest".
Once the first block comprising the packet headers has been examined, shift will be pointing to somewhere near the end of the block, and so when the second block is examined the request line at the beginning will be missed.
Reinitialize the variable for each new block.
--- lib/ts_bm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
lib/ts_bm.c +3 -1
@@ -60,10 +60,12 @@ static unsigned int bm_find(struct ts_config *conf, struct ts_state *state)struct ts_bm *bm =ts_config_priv (conf);unsigned int i, text_len, consumed = state->offset;const u8 *text; -int shift = bm->patlen -1 , bs; +int bs;const u8 icase = conf->flags &TS_IGNORECASE ;for (;;) { +int shift = bm->patlen -1 ; + text_len = conf->get_next_block (consumed, &text, conf, state);if (unlikely (text_len ==0 ))
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 67/313 netfilter: conntrack: dccp: copy entire header to stack buffer, not just basic one
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
[ Upstream commit ff0a3a7d52ff7282dbd183e7fc29a1fe386b0c30 ]
Eric Dumazet says:
nf_conntrack_dccp_packet() has an unique:
dh = skb_header_pointer(skb, dataoff, sizeof(_dh), &_dh);
And nothing more is 'pulled' from the packet, depending on the content. dh->dccph_doff, and/or dh->dccph_x ...)
So dccp_ack_seq() is happily reading stuff past the _dh buffer.
BUG: KASAN: stack-out-of-bounds in nf_conntrack_dccp_packet+0x1134/0x11c0 Read of size 4 at addr ffff000128f66e0c by task syz-executor.2/29371
[..]
Fix this by increasing the stack buffer to also include room for the extra sequence numbers and all the known dccp packet type headers, then pull again after the initial validation of the basic header.
While at it, mark packets invalid that lack 48bit sequence bit but where RFC says the type MUST use them.
Compile tested only.
v2: first skb_header_pointer() now needs to adjust the size to
only pull the generic header. (Eric)
Heads-up: I intend to remove dccp conntrack support later this year.
--- net/netfilter/nf_conntrack_proto_dccp.c | 52 +++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 3 deletions(-)
net/netfilter/nf_conntrack_proto_dccp.c +49 -3
@@ -430,9 +430,19 @@ static bool dccp_error(const struct dccp_hdr *dh, struct sk_buff *skb, unsigned int dataoff, const struct nf_hook_state *state) { +static const unsigned long require_seq48 =1 <<DCCP_PKT_REQUEST | +1 <<DCCP_PKT_RESPONSE | +1 <<DCCP_PKT_CLOSEREQ | +1 <<DCCP_PKT_CLOSE | +1 <<DCCP_PKT_RESET | +1 <<DCCP_PKT_SYNC | +1 <<DCCP_PKT_SYNCACK ;unsigned int dccp_len = skb->len - dataoff;unsigned int cscov;const char *msg; +u8 type; + +BUILD_BUG_ON (DCCP_PKT_INVALID >=BITS_PER_LONG );if (dh->dccph_doff *4 <sizeof (struct dccp_hdr ) || dh->dccph_doff *4 > dccp_len) {
@@ -457,10 +467,17 @@ static bool dccp_error(const struct dccp_hdr *dh, goto out_invalid; } -if (dh->dccph_type >=DCCP_PKT_INVALID ) { + type = dh->dccph_type; +if (type >=DCCP_PKT_INVALID ) { msg ="nf_ct_dccp: reserved packet type " ; goto out_invalid; } + +if (test_bit (type, &require_seq48) && !dh->dccph_x) { + msg ="nf_ct_dccp: type lacks 48bit sequence numbers" ; + goto out_invalid; + } +return false; out_invalid: nf_l4proto_log_invalid(skb, state->net, state->pf,
@@ -468,24 +485,53 @@ static bool dccp_error(const struct dccp_hdr *dh,return true; } +struct nf_conntrack_dccp_buf { +struct dccp_hdr dh;/* generic header part */ +struct dccp_hdr_ext ext;/* optional depending dh->dccph_x */ +union {/* depends on header type */ +struct dccp_hdr_ack_bits ack; +struct dccp_hdr_request req; +struct dccp_hdr_response response; +struct dccp_hdr_reset rst; + } u; +}; + +static struct dccp_hdr * +dccp_header_pointer (const struct sk_buff *skb,int offset,const struct dccp_hdr *dh, +struct nf_conntrack_dccp_buf *buf) +{ +unsigned int hdrlen =__dccp_hdr_len (dh); + +if (hdrlen >sizeof (*buf)) +return NULL ; + +return skb_header_pointer (skb, offset, hdrlen, buf); +} +int nf_conntrack_dccp_packet (struct nf_conn *ct,struct sk_buff *skb,unsigned int dataoff,enum ip_conntrack_info ctinfo,const struct nf_hook_state *state) {enum ip_conntrack_dir dir =CTINFO2DIR (ctinfo); -struct dccp_hdr _dh, *dh; +struct nf_conntrack_dccp_buf _dh;u_int8_t type, old_state, new_state;enum ct_dccp_roles role;unsigned int *timeouts; +struct dccp_hdr *dh; - dh =skb_header_pointer (skb, dataoff,sizeof (_dh), &_dh); + dh =skb_header_pointer (skb, dataoff,sizeof (*dh), &_dh.dh);if (!dh)return NF_DROP ;if (dccp_error (dh, skb, dataoff, state))return -NF_ACCEPT ; +/* pull again, including possible 48 bit sequences and subtype header */ + dh =dccp_header_pointer (skb, dataoff, dh, &_dh); +if (!dh) +return NF_DROP ; + type = dh->dccph_type;if (!nf_ct_is_confirmed (ct) && !dccp_new (ct, skb, dh))return -NF_ACCEPT ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 68/313 netfilter: nf_conntrack_sip: fix the ct_sip_parse_numerical_param() return value.
In reply to Greg Kroah-HartmanFrom: Ilia.Gavrilov <[email protected]>
[ Upstream commit f188d30087480eab421cd8ca552fb15f55d57f4d ]
ct_sip_parse_numerical_param() returns only 0 or 1 now.
But process_register_request() and process_register_response() imply checking for a negative value if parsing of a numerical header parameter failed.
The invocation in nf_nat_sip() looks correct:
if (ct_sip_parse_numerical_param(...) > 0 &&
...) { ... }
Make the return value of the function ct_sip_parse_numerical_param() a tristate to fix all the cases
a) return 1 if value is found; *val is set
b) return 0 if value is not found; *val is unchanged
c) return -1 on error; *val is undefined
Found by InfoTeCS on behalf of Linux Verification Center (linuxtesting.org) with SVACE.
--- net/netfilter/nf_conntrack_sip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nf_conntrack_sip.c +1 -1
@@ -611,7 +611,7 @@ int ct_sip_parse_numerical_param(const struct nf_conn *ct, const char *dptr, start +=strlen (name); *val =simple_strtoul (start, &end,0 );if (start == end) -return 0 ; +return -1 ;if (matchoff && matchlen) { *matchoff = start - dptr; *matchlen = end - start;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 69/313 ipvlan: Fix return value of ipvlan_queue_xmit()
In reply to Greg Kroah-HartmanFrom: Cambda Zhu <[email protected]>
[ Upstream commit 8a9922e7be6d042fa00f894c376473b17a162b66 ]
ipvlan_queue_xmit() should return NET_XMIT_XXX, but ipvlan_xmit_mode_l2/l3() returns rx_handler_result_t or NET_RX_XXX in some cases. ipvlan_rcv_frame() will only return RX_HANDLER_CONSUMED in ipvlan_xmit_mode_l2/l3() because 'local' is true. It's equal to NET_XMIT_SUCCESS. But dev_forward_skb() can return NET_RX_SUCCESS or NET_RX_DROP, and returning NET_RX_DROP(NET_XMIT_DROP) will increase both ipvlan and ipvlan->phy_dev drops counter.
The skb to forward can be treated as xmitted successfully. This patch makes ipvlan_queue_xmit() return NET_XMIT_SUCCESS for forward skb.
--- drivers/net/ipvlan/ipvlan_core.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/ipvlan/ipvlan_core.c +6 -3
@@ -586,7 +586,8 @@ static int ipvlan_xmit_mode_l3(struct sk_buff *skb, struct net_device *dev)consume_skb (skb);return NET_XMIT_DROP ; } -return ipvlan_rcv_frame (addr, &skb, true); +ipvlan_rcv_frame (addr, &skb, true); +return NET_XMIT_SUCCESS ; } } out:
@@ -612,7 +613,8 @@ static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev)consume_skb (skb);return NET_XMIT_DROP ; } -return ipvlan_rcv_frame (addr, &skb, true); +ipvlan_rcv_frame (addr, &skb, true); +return NET_XMIT_SUCCESS ; } } skb =skb_share_check (skb,GFP_ATOMIC );
@@ -624,7 +626,8 @@ static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev)* the skb for the main-dev. At the RX side we just return * RX_PASS for it to be processed further on the stack. */ -return dev_forward_skb (ipvlan->phy_dev, skb); +dev_forward_skb (ipvlan->phy_dev, skb); +return NET_XMIT_SUCCESS ; }else if (is_multicast_ether_addr (eth->h_dest)) {skb_reset_mac_header (skb);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 70/313 netlink: Add __sock_i_ino() for __netlink_diag_dump().
In reply to Greg Kroah-HartmanFrom: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 25a9c8a4431c364f97f75558cb346d2ad3f53fbb ]
syzbot reported a warning in __local_bh_enable_ip(). [0]
Commit 8d61f926d420 ("netlink: fix potential deadlock in netlink_set_err()") converted read_lock(&nl_table_lock) to read_lock_irqsave() in __netlink_diag_dump() to prevent a deadlock.
However, __netlink_diag_dump() calls sock_i_ino() that uses read_lock_bh() and read_unlock_bh(). If CONFIG_TRACE_IRQFLAGS=y, read_unlock_bh() finally enables IRQ even though it should stay disabled until the following read_unlock_irqrestore().
Using read_lock() in sock_i_ino() would trigger a lockdep splat in another place that was fixed in commit f064af1e500a ("net: fix a lockdep splat"), so let's add __sock_i_ino() that would be safe to use under BH disabled.
[0]:
WARNING: CPU: 0 PID: 5012 at kernel/softirq.c:376 __local_bh_enable_ip+0xbe/0x130 kernel/softirq.c:376 Modules linked in: CPU: 0 PID: 5012 Comm: syz-executor487 Not tainted 6.4.0-rc7-syzkaller-00202-g6f68fc395f49 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 05/27/2023 RIP: 0010:__local_bh_enable_ip+0xbe/0x130 kernel/softirq.c:376 Code: 45 bf 01 00 00 00 e8 91 5b 0a 00 e8 3c 15 3d 00 fb 65 8b 05 ec e9 b5 7e 85 c0 74 58 5b 5d c3 65 8b 05 b2 b6 b4 7e 85 c0 75 a2 <0f> 0b eb 9e e8 89 15 3d 00 eb 9f 48 89 ef e8 6f 49 18 00 eb a8 0f RSP: 0018:ffffc90003a1f3d0 EFLAGS: 00010046 RAX: 0000000000000000 RBX: 0000000000000201 RCX: 1ffffffff1cf5996 RDX: 0000000000000000 RSI: 0000000000000201 RDI: ffffffff8805c6f3 RBP: ffffffff8805c6f3 R08: 0000000000000001 R09: ffff8880152b03a3 R10: ffffed1002a56074 R11: 0000000000000005 R12: 00000000000073e4 R13: dffffc0000000000 R14: 0000000000000002 R15: 0000000000000000 FS: 0000555556726300(0000) GS:ffff8880b9800000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000000000045ad50 CR3: 000000007c646000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> sock_i_ino+0x83/0xa0 net/core/sock.c:2559 __netlink_diag_dump+0x45c/0x790 net/netlink/diag.c:171 netlink_diag_dump+0xd6/0x230 net/netlink/diag.c:207 netlink_dump+0x570/0xc50 net/netlink/af_netlink.c:2269 __netlink_dump_start+0x64b/0x910 net/netlink/af_netlink.c:2374 netlink_dump_start include/linux/netlink.h:329 [inline] netlink_diag_handler_dump+0x1ae/0x250 net/netlink/diag.c:238 __sock_diag_cmd net/core/sock_diag.c:238 [inline] sock_diag_rcv_msg+0x31e/0x440 net/core/sock_diag.c:269 netlink_rcv_skb+0x165/0x440 net/netlink/af_netlink.c:2547 sock_diag_rcv+0x2a/0x40 net/core/sock_diag.c:280 netlink_unicast_kernel net/netlink/af_netlink.c:1339 [inline] netlink_unicast+0x547/0x7f0 net/netlink/af_netlink.c:1365 netlink_sendmsg+0x925/0xe30 net/netlink/af_netlink.c:1914 sock_sendmsg_nosec net/socket.c:724 [inline] sock_sendmsg+0xde/0x190 net/socket.c:747 ____sys_sendmsg+0x71c/0x900 net/socket.c:2503 ___sys_sendmsg+0x110/0x1b0 net/socket.c:2557 __sys_sendmsg+0xf7/0x1c0 net/socket.c:2586 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x39/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x7f5303aaabb9 Code: 28 c3 e8 2a 14 00 00 66 2e 0f 1f 84 00 00 00 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 c0 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007ffc7506e548 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f5303aaabb9 RDX: 0000000000000000 RSI: 0000000020000180 RDI: 0000000000000003 RBP: 00007f5303a6ed60 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00007f5303a6edf0 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 </TASK>
--- include/net/sock.h | 1 + net/core/sock.c | 17 ++++++++++++++--- net/netlink/diag.c | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-)
include/net/sock.h +1 -0
@@ -1863,6 +1863,7 @@ static inline void sock_graft(struct sock *sk, struct socket *parent) }kuid_t sock_i_uid (struct sock *sk); +unsigned long __sock_i_ino (struct sock *sk);unsigned long sock_i_ino (struct sock *sk);static inline kuid_t sock_net_uid (const struct net *net,const struct sock *sk)
net/core/sock.c +14 -3
@@ -2085,13 +2085,24 @@ kuid_t sock_i_uid(struct sock *sk) }EXPORT_SYMBOL (sock_i_uid); -unsigned long sock_i_ino (struct sock *sk) +unsigned long __sock_i_ino (struct sock *sk) {unsigned long ino; -read_lock_bh (&sk->sk_callback_lock); +read_lock (&sk->sk_callback_lock); ino = sk->sk_socket ?SOCK_INODE (sk->sk_socket)->i_ino :0 ; -read_unlock_bh (&sk->sk_callback_lock); +read_unlock (&sk->sk_callback_lock); +return ino; +} +EXPORT_SYMBOL (__sock_i_ino); + +unsigned long sock_i_ino (struct sock *sk) +{ +unsigned long ino; + +local_bh_disable (); + ino =__sock_i_ino (sk); +local_bh_enable ();return ino; }EXPORT_SYMBOL (sock_i_ino);
net/netlink/diag.c +1 -1
@@ -168,7 +168,7 @@ static int __netlink_diag_dump(struct sk_buff *skb, struct netlink_callback *cb, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, NLM_F_MULTI, - sock_i_ino(sk)) < 0) { + __sock_i_ino(sk)) < 0) { ret =1 ;break ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 71/313 radeon: avoid double free in ci_dpm_init()
In reply to Greg Kroah-HartmanFrom: Nikita Zhandarovich <[email protected]>
[ Upstream commit 20c3dffdccbd494e0dd631d1660aeecbff6775f2 ]
Several calls to ci_dpm_fini() will attempt to free resources that either have been freed before or haven't been allocated yet. This may lead to undefined or dangerous behaviour.
For instance, if r600_parse_extended_power_table() fails, it might call r600_free_extended_power_table() as will ci_dpm_fini() later during error handling.
Fix this by only freeing pointers to objects previously allocated.
Found by Linux Verification Center (linuxtesting.org) with static analysis tool SVACE.
--- drivers/gpu/drm/radeon/ci_dpm.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-)
drivers/gpu/drm/radeon/ci_dpm.c +20 -8
@@ -5556,6 +5556,7 @@ static int ci_parse_power_table(struct radeon_device *rdev)u8 frev, crev;u8 *power_state_offset;struct ci_ps *ps; +int ret;if (!atom_parse_data_header (mode_info->atom_context, index,NULL , &frev, &crev, &data_offset))
@@ -5585,11 +5586,15 @@ static int ci_parse_power_table(struct radeon_device *rdev) non_clock_array_index = power_state->v2.nonClockInfoIndex; non_clock_info = (struct _ATOM_PPLIB_NONCLOCK_INFO *) &non_clock_info_array->nonClockInfo[non_clock_array_index]; -if (!rdev->pm.power_state[i].clock_info) -return -EINVAL ; +if (!rdev->pm.power_state[i].clock_info) { + ret = -EINVAL ; + goto err_free_ps; + } ps =kzalloc (sizeof (struct ci_ps ),GFP_KERNEL ); -if (ps ==NULL ) -return -ENOMEM ; +if (ps ==NULL ) { + ret = -ENOMEM ; + goto err_free_ps; + } rdev->pm.dpm.ps[i].ps_priv = ps; ci_parse_pplib_non_clock_info(rdev, &rdev->pm.dpm.ps[i], non_clock_info,
@@ -5629,6 +5634,12 @@ static int ci_parse_power_table(struct radeon_device *rdev) }return 0 ; + +err_free_ps: +for (i =0 ; i < rdev->pm.dpm.num_ps; i++) +kfree (rdev->pm.dpm.ps[i].ps_priv); +kfree (rdev->pm.dpm.ps); +return ret; } static int ci_get_vbios_boot_values(struct radeon_device *rdev,
@@ -5717,25 +5728,26 @@ int ci_dpm_init(struct radeon_device *rdev) ret =ci_get_vbios_boot_values (rdev, &pi->vbios_boot_state);if (ret) { -ci_dpm_fini (rdev); +kfree (rdev->pm.dpm.priv);return ret; } ret =r600_get_platform_caps (rdev);if (ret) { -ci_dpm_fini (rdev); +kfree (rdev->pm.dpm.priv);return ret; } ret =r600_parse_extended_power_table (rdev);if (ret) { -ci_dpm_fini (rdev); +kfree (rdev->pm.dpm.priv);return ret; } ret =ci_parse_power_table (rdev);if (ret) { -ci_dpm_fini (rdev); +kfree (rdev->pm.dpm.priv); +r600_free_extended_power_table (rdev);return ret; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 72/313 Input: drv260x - sleep between polling GO bit
In reply to Greg Kroah-HartmanFrom: Luca Weiss <[email protected]>
[ Upstream commit efef661dfa6bf8cbafe4cd6a97433fcef0118967 ]
When doing the initial startup there's no need to poll without any delay and spam the I2C bus.
Let's sleep 15ms between each attempt, which is the same time as used in the vendor driver.
--- drivers/input/misc/drv260x.c | 1 + 1 file changed, 1 insertion(+)
drivers/input/misc/drv260x.c +1 -0
@@ -435,6 +435,7 @@ static int drv260x_init(struct drv260x_data *haptics) } do { + usleep_range(15000, 15500); error = regmap_read(haptics->regmap, DRV260X_GO, &cal_buf); if (error) { dev_err(&haptics->client->dev,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 73/313 ARM: dts: BCM5301X: Drop "clock-names" from the SPI node
In reply to Greg Kroah-HartmanFrom: Rafał Miłecki <[email protected]>
[ Upstream commit d3c8e2c5757153bbfad70019ec1decbca86f3def ]
There is no such property in the SPI controller binding documentation. Also Linux driver doesn't look for it.
This fixes:arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dtb: spi@18029200: Unevaluated properties are not allowed ('clock-names' was unexpected)
From schema: Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.yaml
--- arch/arm/boot/dts/bcm5301x.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm/boot/dts/bcm5301x.dtsi +0 -1
@@ -511,7 +511,6 @@ spi@18029200 { "spi_lr_session_done", "spi_lr_overread"; clocks = <&iprocmed>; - clock-names = "iprocmed"; num-cs = <2>; #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 74/313 Input: adxl34x - do not hardcode interrupt trigger type
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit e96220bce5176ed2309f77f061dcc0430b82b25e ]
Instead of hardcoding IRQ trigger type to IRQF_TRIGGER_HIGH, let's respect the settings specified in the firmware description.
--- drivers/input/misc/adxl34x.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/input/misc/adxl34x.c +1 -2
@@ -811,8 +811,7 @@ struct adxl34x *adxl34x_probe(struct device *dev, int irq,AC_WRITE (ac,POWER_CTL ,0 ); err =request_threaded_irq (ac->irq,NULL , adxl34x_irq, -IRQF_TRIGGER_HIGH |IRQF_ONESHOT , -dev_name (dev), ac); +IRQF_ONESHOT ,dev_name (dev), ac);if (err) {dev_err (dev,"irq %d busy?\n" , ac->irq); goto err_free_mem;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 75/313 drm: sun4i_tcon: use devm_clk_get_enabled in `sun4i_tcon_init_clocks`
In reply to Greg Kroah-HartmanFrom: XuDong Liu <[email protected]>
[ Upstream commit 123ee07ba5b7123e0ce0e0f9d64938026c16a2ce ]
Smatch reports:drivers/gpu/drm/sun4i/sun4i_tcon.c:805 sun4i_tcon_init_clocks() warn:
'tcon->clk' from clk_prepare_enable() not released on lines: 792,801.
In the function sun4i_tcon_init_clocks(), tcon->clk and tcon->sclk0 are not disabled in the error handling, which affects the release of these variable. Although sun4i_tcon_bind(), which calls sun4i_tcon_init_clocks(), use sun4i_tcon_free_clocks to disable the variables mentioned, but the error handling branch of sun4i_tcon_init_clocks() ignores the required disable process.
To fix this issue, use the devm_clk_get_enabled to automatically balance enable and disabled calls. As original implementation use sun4i_tcon_free_clocks() to disable clk explicitly, we delete the related calls and error handling that are no longer needed.
--- drivers/gpu/drm/sun4i/sun4i_tcon.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)
drivers/gpu/drm/sun4i/sun4i_tcon.c +4 -15
@@ -753,21 +753,19 @@ static irqreturn_t sun4i_tcon_handler(int irq, void *private)static int sun4i_tcon_init_clocks (struct device *dev,struct sun4i_tcon *tcon) { - tcon->clk =devm_clk_get (dev,"ahb" ); + tcon->clk =devm_clk_get_enabled (dev,"ahb" );if (IS_ERR (tcon->clk)) {dev_err (dev,"Couldn't get the TCON bus clock\n" );return PTR_ERR (tcon->clk); } -clk_prepare_enable (tcon->clk);if (tcon->quirks->has_channel_0) { - tcon->sclk0 =devm_clk_get (dev,"tcon-ch0" ); + tcon->sclk0 =devm_clk_get_enabled (dev,"tcon-ch0" );if (IS_ERR (tcon->sclk0)) {dev_err (dev,"Couldn't get the TCON channel 0 clock\n" );return PTR_ERR (tcon->sclk0); } } -clk_prepare_enable (tcon->sclk0);if (tcon->quirks->has_channel_1) { tcon->sclk1 =devm_clk_get (dev,"tcon-ch1" );
@@ -780,12 +778,6 @@ static int sun4i_tcon_init_clocks(struct device *dev,return 0 ; } -static void sun4i_tcon_free_clocks (struct sun4i_tcon *tcon) -{ -clk_disable_unprepare (tcon->sclk0); -clk_disable_unprepare (tcon->clk); -} -static int sun4i_tcon_init_irq (struct device *dev,struct sun4i_tcon *tcon) {
@@ -1202,14 +1194,14 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master, ret =sun4i_tcon_init_regmap (dev, tcon);if (ret) {dev_err (dev,"Couldn't init our TCON regmap\n" ); - goto err_free_clocks; + goto err_assert_reset; }if (tcon->quirks->has_channel_0) { ret =sun4i_dclk_create (dev, tcon);if (ret) {dev_err (dev,"Couldn't create our TCON dot clock\n" ); - goto err_free_clocks; + goto err_assert_reset; } }
@@ -1272,8 +1264,6 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master, err_free_dotclock:if (tcon->quirks->has_channel_0)sun4i_dclk_free (tcon); -err_free_clocks: -sun4i_tcon_free_clocks (tcon); err_assert_reset:reset_control_assert (tcon->lcd_rst);return ret;
@@ -1287,7 +1277,6 @@ static void sun4i_tcon_unbind(struct device *dev, struct device *master,list_del (&tcon->list);if (tcon->quirks->has_channel_0)sun4i_dclk_free (tcon); -sun4i_tcon_free_clocks (tcon); }static const struct component_ops sun4i_tcon_ops = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 76/313 RDMA/bnxt_re: Fix to remove an unnecessary log
In reply to Greg Kroah-HartmanFrom: Kalesh AP <[email protected]>
[ Upstream commit 43774bc156614346fe5dacabc8e8c229167f2536 ]
During destroy_qp, driver sets the qp handle in the existing CQEs belonging to the QP being destroyed to NULL. As a result, a poll_cq after destroy_qp can report unnecessary messages. Remove this noise from system logs.
--- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/infiniband/hw/bnxt_re/qplib_fp.c +1 -4
@@ -2606,11 +2606,8 @@ static int bnxt_qplib_cq_process_terminal(struct bnxt_qplib_cq *cq, qp = (struct bnxt_qplib_qp *)((unsigned long )le64_to_cpu (hwcqe->qp_handle)); -if (!qp) { -dev_err (&cq->hwq.pdev->dev, -"FP: CQ Process terminal qp is NULL\n" ); +if (!qp)return -EINVAL ; - }/* Must block new posting of SQ and RQ */ qp->state =CMDQ_MODIFY_QP_NEW_STATE_ERR ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 77/313 ARM: dts: gta04: Move model property out of pinctrl node
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit 4ffec92e70ac5097b9f67ec154065305b16a3b46 ]
The model property should be at the top level, let's move it out of the pinctrl node.
--- arch/arm/boot/dts/omap3-gta04a5one.dts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/boot/dts/omap3-gta04a5one.dts +3 -1
@@ -5,9 +5,11 @@ #include "omap3-gta04a5.dts" -&omap3_pmx_core { +/ { model = "Goldelico GTA04A5/Letux 2804 with OneNAND"; +}; +&omap3_pmx_core { gpmc_pins: pinmux_gpmc_pins { pinctrl-single,pins = <
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 78/313 arm64: dts: qcom: msm8916: correct camss unit address
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 48798d992ce276cf0d57bf75318daf8eabd02aa4 ]
Match unit-address to reg entry to fix dtbs W=1 warnings:
Warning (simple_bus_reg): /soc@0/camss@1b00000: simple-bus unit address format error, expected "1b0ac00"
--- arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8916.dtsi +1 -1
@@ -1451,7 +1451,7 @@ video-encoder { }; }; - camss: camss@1b00000 { + camss: camss@1b0ac00 { compatible = "qcom,msm8916-camss"; reg = <0x1b0ac00 0x200>, <0x1b00030 0x4>,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 79/313 drm/panel: simple: fix active size for Ampire AM-480272H3TMQW-T01H
In reply to Greg Kroah-HartmanFrom: Dario Binacchi <[email protected]>
[ Upstream commit f24b49550814fdee4a98b9552e35e243ccafd4a8 ]
The previous setting was related to the overall dimension and not to the active display area.
In the "PHYSICAL SPECIFICATIONS" section, the datasheet shows the following parameters:
----------------------------------------------------------
| Item | Specifications | unit |
----------------------------------------------------------
| Display area | 98.7 (W) x 57.5 (H) | mm |
----------------------------------------------------------
| Overall dimension | 105.5(W) x 67.2(H) x 4.96(D) | mm |
----------------------------------------------------------
--- drivers/gpu/drm/panel/panel-simple.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/panel/panel-simple.c +2 -2
@@ -531,8 +531,8 @@ static const struct panel_desc ampire_am_480272h3tmqw_t01h = { .num_modes = 1, .bpc = 8, .size = { - .width = 105, - .height = 67, + .width = 99, + .height = 58, }, .bus_format = MEDIA_BUS_FMT_RGB888_1X24, };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 80/313 ARM: ep93xx: fix missing-prototype warnings
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 419013740ea1e4343d8ade535d999f59fa28e460 ]
ep93xx_clocksource_read() is only called from the file it is declared in, while ep93xx_timer_init() is declared in a header that is not included here.
arch/arm/mach-ep93xx/timer-ep93xx.c:120:13: error: no previous prototype for 'ep93xx_timer_init' arch/arm/mach-ep93xx/timer-ep93xx.c:63:5: error: no previous prototype for 'ep93xx_clocksource_read'
--- arch/arm/mach-ep93xx/timer-ep93xx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-ep93xx/timer-ep93xx.c +2 -1
@@ -9,6 +9,7 @@#include <linux/io.h> #include <asm/mach/time.h> #include "soc.h" +#include "platform.h" /************************************************************************* * Timer handling for EP93xx
@@ -60,7 +61,7 @@ static u64 notrace ep93xx_read_sched_clock(void)return ret; } -u64 ep93xx_clocksource_read (struct clocksource *c) +static u64 ep93xx_clocksource_read (struct clocksource *c) {u64 ret;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 81/313 memory: brcmstb_dpfe: fix testing array offset after use
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 1d9e93fad549bc38f593147479ee063f2872c170 ]
Code should first check for valid value of array offset, then use it as the index. Fixes smatch warning:
drivers/memory/brcmstb_dpfe.c:443 __send_command() error: testing array offset 'cmd' after use.
--- drivers/memory/brcmstb_dpfe.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/memory/brcmstb_dpfe.c +3 -1
@@ -398,15 +398,17 @@ static void __finalize_command(struct private_data *priv)static int __send_command (struct private_data *priv,unsigned int cmd,u32 result[]) { -const u32 *msg = priv->dpfe_api->command[cmd];void __iomem *regs = priv->regs;unsigned int i, chksum, chksum_idx; +const u32 *msg;int ret =0 ;u32 resp;if (cmd >=DPFE_CMD_MAX )return -1 ; + msg = priv->dpfe_api->command[cmd]; +mutex_lock (&priv->lock);/* Wait for DCPU to become ready */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 82/313 ASoC: es8316: Increment max value for ALC Capture Target Volume control
In reply to Greg Kroah-HartmanFrom: Cristian Ciocaltea <[email protected]>
[ Upstream commit 6f073429037cd79d7311cd8236311c53f5ea8f01 ]
The following error occurs when trying to restore a previously saved ALSA mixer state (tested on a Rock 5B board):
$ alsactl --no-ucm -f /tmp/asound.state store hw:Analog $ alsactl --no-ucm -I -f /tmp/asound.state restore hw:Analog alsactl: set_control:1475: Cannot write control '2:0:0:ALC Capture Target Volume:0' : Invalid argument
According to ES8316 datasheet, the register at address 0x2B, which is related to the above mixer control, contains by default the value 0xB0. Considering the corresponding ALC target bits (ALCLVL) are 7:4, the control is initialized with 11, which is one step above the maximum value allowed by the driver:
ALCLVL | dB gain
-------+--------
0000 | -16.5 0001 | -15.0 0010 | -13.5 .... | ..... 0111 | -6.0 1000 | -4.5 1001 | -3.0 1010 | -1.5 .... | ..... 1111 | -1.5
The tests performed using the VU meter feature (--vumeter=TYPE) of arecord/aplay confirm the specs are correct and there is no measured gain if the 1011-1111 range would have been mapped to 0 dB:
dB gain | VU meter %
--------+-----------
-6.0 | 30-31
-4.5 | 35-36
-3.0 | 42-43
-1.5 | 50-51
0.0 | 50-51Increment the max value allowed for ALC Capture Target Volume control, so that it matches the hardware default. Additionally, update the related TLV to prevent an artificial extension of the dB gain range.
--- sound/soc/codecs/es8316.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
sound/soc/codecs/es8316.c +7 -2
@@ -52,7 +52,12 @@ static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(dac_vol_tlv, -9600, 50, 1); static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(adc_vol_tlv, -9600, 50, 1); static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(alc_max_gain_tlv, -650, 150, 0); static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(alc_min_gain_tlv, -1200, 150, 0); -static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(alc_target_tlv, -1650, 150, 0); + +static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(alc_target_tlv, +0 ,10 ,TLV_DB_SCALE_ITEM (-1650 ,150 ,0 ), + 11, 11, TLV_DB_SCALE_ITEM(-150, 0, 0), +); + static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(hpmixer_gain_tlv,0 ,4 ,TLV_DB_SCALE_ITEM (-1200 ,150 ,0 ), 8, 11, TLV_DB_SCALE_ITEM(-450, 150, 0),
@@ -115,7 +120,7 @@ static const struct snd_kcontrol_new es8316_snd_controls[] = { alc_max_gain_tlv),SOC_SINGLE_TLV ("ALC Capture Min Volume" ,ES8316_ADC_ALC2 ,0 ,28 ,0 , alc_min_gain_tlv), -SOC_SINGLE_TLV ("ALC Capture Target Volume" ,ES8316_ADC_ALC3 ,4 ,10 ,0 , +SOC_SINGLE_TLV ("ALC Capture Target Volume" ,ES8316_ADC_ALC3 ,4 ,11 ,0 , alc_target_tlv),SOC_SINGLE ("ALC Capture Hold Time" ,ES8316_ADC_ALC3 ,0 ,10 ,0 ), SOC_SINGLE("ALC Capture Decay Time", ES8316_ADC_ALC4, 4, 10, 0),
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 83/313 ASoC: es8316: Do not set rate constraints for unsupported MCLKs
In reply to Greg Kroah-HartmanFrom: Cristian Ciocaltea <[email protected]>
[ Upstream commit 60413129ee2b38a80347489270af7f6e1c1de4d0 ]
When using the codec through the generic audio graph card, there are at least two calls of es8316_set_dai_sysclk(), with the effect of limiting the allowed sample rates according to the MCLK/LRCK ratios supported by the codec:
1. During audio card setup, to set the initial MCLK - see asoc_simple_init_dai().
2. Before opening a stream, to update MCLK, according to the stream sample rate and the multiplication factor - see asoc_simple_hw_params().
In some cases the initial MCLK might be set to a frequency that doesn't match any of the supported ratios, e.g. 12287999 instead of 12288000, which is only 1 Hz below the supported clock, as that is what the hardware reports. This creates an empty list of rate constraints, which is further passed to snd_pcm_hw_constraint_list() via es8316_pcm_startup(), and causes the following error on the very first access of the sound card:
$ speaker-test -D hw:Analog,0 -F S16_LE -c 2 -t wav Broken configuration for playback: no configurations available: Invalid argument Setting of hwparams failed: Invalid argument
Note that all subsequent retries succeed thanks to the updated MCLK set at point 2 above, which uses a computed frequency value instead of a reading from the hardware registers. Normally this would have mitigated the issue, but es8316_pcm_startup() executes before the 2nd call to es8316_set_dai_sysclk(), hence it cannot make use of the updated constraints.
Since es8316_pcm_hw_params() performs anyway a final validation of MCLK against the stream sample rate and the supported MCLK/LRCK ratios, fix the issue by ensuring that sysclk_constraints list is only set when at least one supported sample rate is autodetected by the codec.
--- sound/soc/codecs/es8316.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
sound/soc/codecs/es8316.c +7 -7
@@ -369,13 +369,11 @@ static int es8316_set_dai_sysclk(struct snd_soc_dai *codec_dai,int count =0 ; es8316->sysclk = freq; + es8316->sysclk_constraints.list =NULL ; + es8316->sysclk_constraints.count =0 ; -if (freq ==0 ) { - es8316->sysclk_constraints.list =NULL ; - es8316->sysclk_constraints.count =0 ; - +if (freq ==0 )return 0 ; - } ret =clk_set_rate (es8316->mclk, freq);if (ret)
@@ -391,8 +389,10 @@ static int es8316_set_dai_sysclk(struct snd_soc_dai *codec_dai, es8316->allowed_rates[count++] = freq / ratio; } - es8316->sysclk_constraints.list = es8316->allowed_rates; - es8316->sysclk_constraints.count = count; +if (count) { + es8316->sysclk_constraints.list = es8316->allowed_rates; + es8316->sysclk_constraints.count = count; + }return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 84/313 soc/fsl/qe: fix usb.c build errors
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 7b1a78babd0d2cd27aa07255dee0c2d7ac0f31e3 ]
Fix build errors in soc/fsl/qe/usb.c when QUICC_ENGINE is not set. This happens when PPC_EP88XC is set, which selects CPM1 & CPM. When CPM is set, USB_FSL_QE can be set without QUICC_ENGINE being set. When USB_FSL_QE is set, QE_USB deafults to y, which causes build errors when QUICC_ENGINE is not set. Making QE_USB depend on QUICC_ENGINE prevents QE_USB from defaulting to y.
Fixes these build errors:
drivers/soc/fsl/qe/usb.o: in function `qe_usb_clock_set':
usb.c:(.text+0x1e): undefined reference to `qe_immr'
powerpc-linux-ld: usb.c:(.text+0x2a): undefined reference to `qe_immr'
powerpc-linux-ld: usb.c:(.text+0xbc): undefined reference to `qe_setbrg'
powerpc-linux-ld: usb.c:(.text+0xca): undefined reference to `cmxgcr_lock'
powerpc-linux-ld: usb.c:(.text+0xce): undefined reference to `cmxgcr_lock'
--- drivers/soc/fsl/qe/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/soc/fsl/qe/Kconfig +1 -0
@@ -38,6 +38,7 @@ config QE_TDM config QE_USB bool + depends on QUICC_ENGINE default y if USB_FSL_QE help QE USB Controller support
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 85/313 IB/hfi1: Fix sdma.h tx->num_descs off-by-one errors
In reply to Greg Kroah-HartmanFrom: Patrick Kelsey <[email protected]>
[ Upstream commit fd8958efe8779d3db19c9124fce593ce681ac709 ]
Fix three sources of error involving struct sdma_txreq.num_descs.
When _extend_sdma_tx_descs() extends the descriptor array, it uses the value of tx->num_descs to determine how many existing entries from the tx's original, internal descriptor array to copy to the newly allocated one. As this value was incremented before the call, the copy loop will access one entry past the internal descriptor array, copying its contents into the corresponding slot in the new array.
If the call to _extend_sdma_tx_descs() fails, _pad_smda_tx_descs() then invokes __sdma_tx_clean() which uses the value of tx->num_desc to drive a loop that unmaps all descriptor entries in use. As this value was incremented before the call, the unmap loop will invoke sdma_unmap_desc() on a descriptor entry whose contents consist of whatever random data was copied into it during (1), leading to cascading further calls into the kernel and driver using arbitrary data.
_sdma_close_tx() was using tx->num_descs instead of tx->num_descs - 1.
Fix all of the above by:
- Only increment .num_descs after .descp is extended.
- Use .num_descs - 1 instead of .num_descs for last .descp entry.
--- drivers/infiniband/hw/hfi1/sdma.c | 4 ++-- drivers/infiniband/hw/hfi1/sdma.h | 15 +++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-)
drivers/infiniband/hw/hfi1/sdma.c +2 -2
@@ -3203,8 +3203,7 @@ int _pad_sdma_tx_descs(struct hfi1_devdata *dd, struct sdma_txreq *tx) {int rval =0 ; - tx->num_desc++; -if ((unlikely (tx->num_desc == tx->desc_limit))) { +if ((unlikely (tx->num_desc +1 == tx->desc_limit))) { rval =_extend_sdma_tx_descs (dd, tx);if (rval) {__sdma_txclean (dd, tx);
@@ -3217,6 +3216,7 @@ int _pad_sdma_tx_descs(struct hfi1_devdata *dd, struct sdma_txreq *tx)SDMA_MAP_NONE , dd->sdma_pad_phys, sizeof(u32) - (tx->packet_len & (sizeof(u32) - 1))); + tx->num_desc++;_sdma_close_tx (dd, tx);return rval; }
drivers/infiniband/hw/hfi1/sdma.h +7 -8
@@ -672,14 +672,13 @@ static inline void sdma_txclean(struct hfi1_devdata *dd, struct sdma_txreq *tx)static inline void _sdma_close_tx (struct hfi1_devdata *dd,struct sdma_txreq *tx) { - tx->descp[tx->num_desc].qw[0 ] |= -SDMA_DESC0_LAST_DESC_FLAG ; - tx->descp[tx->num_desc].qw[1 ] |= - dd->default_desc1; +u16 last_desc = tx->num_desc -1 ; + + tx->descp[last_desc].qw[0 ] |=SDMA_DESC0_LAST_DESC_FLAG ; + tx->descp[last_desc].qw[1 ] |= dd->default_desc1;if (tx->flags &SDMA_TXREQ_F_URGENT ) - tx->descp[tx->num_desc].qw[1 ] |= - (SDMA_DESC1_HEAD_TO_HOST_FLAG | -SDMA_DESC1_INT_REQ_FLAG ); + tx->descp[last_desc].qw[1 ] |= (SDMA_DESC1_HEAD_TO_HOST_FLAG | +SDMA_DESC1_INT_REQ_FLAG ); } static inline int _sdma_txadd_daddr(
@@ -696,6 +695,7 @@ static inline int _sdma_txadd_daddr( type, addr, len);WARN_ON (len > tx->tlen); + tx->num_desc++; tx->tlen -= len;/* special cases for last */ if (!tx->tlen) {
@@ -707,7 +707,6 @@ static inline int _sdma_txadd_daddr(_sdma_close_tx (dd, tx); } } - tx->num_desc++;return rval; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 86/313 arm64: dts: renesas: ulcb-kf: Remove flow control for SCIF1
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
[ Upstream commit 1a2c4e5635177939a088d22fa35c6a7032725663 ]
The schematics are misleading, the flow control is for HSCIF1. We need SCIF1 for GNSS/GPS which does not use flow control.
--- arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm64/boot/dts/renesas/ulcb-kf.dtsi +1 -2
@@ -269,7 +269,7 @@ hscif0_pins: hscif0 { }; scif1_pins: scif1 { - groups = "scif1_data_b", "scif1_ctrl"; + groups = "scif1_data_b"; function = "scif1"; };
@@ -329,7 +329,6 @@ rsnd_for_pcm3168a_capture: endpoint { &scif1 { pinctrl-0 = <&scif1_pins>; pinctrl-names = "default"; - uart-has-rtscts; status = "okay"; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 87/313 fbdev: omapfb: lcd_mipid: Fix an error handling path in mipid_spi_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 79a3908d1ea6c35157a6d907b1a9d8ec06015e7a ]
If 'mipid_detect()' fails, we must free 'md' to avoid a memory leak.
--- drivers/video/fbdev/omap/lcd_mipid.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/video/fbdev/omap/lcd_mipid.c +5 -1
@@ -563,11 +563,15 @@ static int mipid_spi_probe(struct spi_device *spi) r =mipid_detect (md);if (r <0 ) -return r; + goto free_md;omapfb_register_panel (&md->panel);return 0 ; + +free_md: +kfree (md); +return r; }static int mipid_spi_remove (struct spi_device *spi)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 88/313 drm/amdkfd: Fix potential deallocation of previously deallocated memory.
In reply to Greg Kroah-HartmanFrom: Daniil Dulov <[email protected]>
[ Upstream commit cabbdea1f1861098991768d7bbf5a49ed1608213 ]
Pointer mqd_mem_obj can be deallocated in kfd_gtt_sa_allocate(). The function then returns non-zero value, which causes the second deallocation.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c +7 -6
@@ -101,18 +101,19 @@ static struct kfd_mem_obj *allocate_mqd(struct kfd_dev *kfd, &(mqd_mem_obj->gtt_mem), &(mqd_mem_obj->gpu_addr), (void *)&(mqd_mem_obj->cpu_ptr), true); + +if (retval) { +kfree (mqd_mem_obj); +return NULL ; + } }else { retval =kfd_gtt_sa_allocate (kfd,sizeof (struct v9_mqd ), &mqd_mem_obj); - } - -if (retval) { -kfree (mqd_mem_obj); -return NULL ; +if (retval) +return NULL ; }return mqd_mem_obj; - } static void init_mqd(struct mqd_manager *mm, void **mqd,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 89/313 drm/radeon: fix possible division-by-zero errors
In reply to Greg Kroah-HartmanFrom: Nikita Zhandarovich <[email protected]>
[ Upstream commit 1becc57cd1a905e2aa0e1eca60d2a37744525c4a ]
Function rv740_get_decoded_reference_divider() may return 0 due to unpredictable reference divider value calculated in radeon_atom_get_clock_dividers(). This will lead to division-by-zero error once that value is used as a divider in calculating 'clk_s'.
While unlikely, this issue should nonetheless be prevented so add a sanity check for such cases by testing 'decoded_ref' value against 0.
Found by Linux Verification Center (linuxtesting.org) with static analysis tool SVACE.
v2: minor coding style fixes (Alex)
In practice this should actually happen as the vbios should be properly populated.
--- drivers/gpu/drm/radeon/cypress_dpm.c | 8 ++++++-- drivers/gpu/drm/radeon/ni_dpm.c | 8 ++++++-- drivers/gpu/drm/radeon/rv740_dpm.c | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-)
drivers/gpu/drm/radeon/cypress_dpm.c +6 -2
@@ -559,8 +559,12 @@ static int cypress_populate_mclk_value(struct radeon_device *rdev, ASIC_INTERNAL_MEMORY_SS, vco_freq)) {u32 reference_clock = rdev->clock.mpll.reference_freq;u32 decoded_ref =rv740_get_decoded_reference_divider (dividers.ref_div); -u32 clk_s = reference_clock *5 / (decoded_ref * ss.rate); -u32 clk_v = ss.percentage * +u32 clk_s, clk_v; + +if (!decoded_ref) +return -EINVAL ; + clk_s = reference_clock *5 / (decoded_ref * ss.rate); + clk_v = ss.percentage * (0x4000 * dividers.whole_fb_div +0x800 * dividers.frac_fb_div) / (clk_s *625 ); mpll_ss1 &= ~CLKV_MASK ;
drivers/gpu/drm/radeon/ni_dpm.c +6 -2
@@ -2241,8 +2241,12 @@ static int ni_populate_mclk_value(struct radeon_device *rdev, ASIC_INTERNAL_MEMORY_SS, vco_freq)) {u32 reference_clock = rdev->clock.mpll.reference_freq;u32 decoded_ref =rv740_get_decoded_reference_divider (dividers.ref_div); -u32 clk_s = reference_clock *5 / (decoded_ref * ss.rate); -u32 clk_v = ss.percentage * +u32 clk_s, clk_v; + +if (!decoded_ref) +return -EINVAL ; + clk_s = reference_clock *5 / (decoded_ref * ss.rate); + clk_v = ss.percentage * (0x4000 * dividers.whole_fb_div +0x800 * dividers.frac_fb_div) / (clk_s *625 ); mpll_ss1 &= ~CLKV_MASK ;
drivers/gpu/drm/radeon/rv740_dpm.c +6 -2
@@ -250,8 +250,12 @@ int rv740_populate_mclk_value(struct radeon_device *rdev, ASIC_INTERNAL_MEMORY_SS, vco_freq)) {u32 reference_clock = rdev->clock.mpll.reference_freq;u32 decoded_ref =rv740_get_decoded_reference_divider (dividers.ref_div); -u32 clk_s = reference_clock *5 / (decoded_ref * ss.rate); -u32 clk_v =0x40000 * ss.percentage * +u32 clk_s, clk_v; + +if (!decoded_ref) +return -EINVAL ; + clk_s = reference_clock *5 / (decoded_ref * ss.rate); + clk_v =0x40000 * ss.percentage * (dividers.whole_fb_div + (dividers.frac_fb_div /8 )) / (clk_s *10000 ); mpll_ss1 &= ~CLKV_MASK ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 90/313 clk: tegra: tegra124-emc: Fix potential memory leak
In reply to Greg Kroah-HartmanFrom: Yuan Can <[email protected]>
[ Upstream commit 53a06e5924c0d43c11379a08c5a78529c3e61595 ]
The tegra and tegra needs to be freed in the error handling path, otherwise it will be leaked.
--- drivers/clk/tegra/clk-emc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clk/tegra/clk-emc.c +2 -0
@@ -459,6 +459,7 @@ static int load_timings_from_dt(struct tegra_clk_emc *tegra, err =load_one_timing_from_dt (tegra, timing, child);if (err) {of_node_put (child); +kfree (tegra->timings);return err; }
@@ -510,6 +511,7 @@ struct clk *tegra_clk_register_emc(void __iomem *base, struct device_node *np, err =load_timings_from_dt (tegra, node, node_ram_code);if (err) {of_node_put (node); +kfree (tegra);return ERR_PTR (err); } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 91/313 ALSA: ac97: Fix possible NULL dereference in snd_ac97_mixer
In reply to Greg Kroah-HartmanFrom: Su Hui <[email protected]>
[ Upstream commit 79597c8bf64ca99eab385115743131d260339da5 ]
smatch error:sound/pci/ac97/ac97_codec.c:2354 snd_ac97_mixer() error:
we previously assumed 'rac97' could be null (see line 2072)
remove redundant assignment, return error if rac97 is NULL.
--- sound/pci/ac97/ac97_codec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/pci/ac97/ac97_codec.c +2 -2
@@ -2006,8 +2006,8 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template, .dev_disconnect = snd_ac97_dev_disconnect, }; -if (rac97) - *rac97 =NULL ; +if (!rac97) +return -EINVAL ;if (snd_BUG_ON (!bus || !template))return -EINVAL ;if (snd_BUG_ON (template->num >=4 ))
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 92/313 clk: cdce925: check return value of kasprintf()
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit bb7d09ddbf361d51eae46f38e7c8a2b85914ea2a ]
kasprintf() returns a pointer to dynamically allocated memory. Pointer could be NULL in case allocation fails. Check pointer validity. Identified with coccinelle (kmerr.cocci script).
Depends-on: e665f029a283 ("clk: Convert to using %pOFn instead of device_node.name")
--- drivers/clk/clk-cdce925.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/clk/clk-cdce925.c +12 -0
@@ -705,6 +705,10 @@ static int cdce925_probe(struct i2c_client *client,for (i =0 ; i < data->chip_info->num_plls; ++i) { pll_clk_name[i] =kasprintf (GFP_KERNEL ,"%pOFn.pll%d" , client->dev.of_node, i); +if (!pll_clk_name[i]) { + err = -ENOMEM ; + goto error; + } init.name = pll_clk_name[i]; data->pll[i].chip = data; data->pll[i].hw.init = &init;
@@ -746,6 +750,10 @@ static int cdce925_probe(struct i2c_client *client, init.num_parents =1 ; init.parent_names = &parent_name;/* Mux Y1 to input */ init.name =kasprintf (GFP_KERNEL ,"%pOFn.Y1" , client->dev.of_node); +if (!init.name) { + err = -ENOMEM ; + goto error; + } data->clk[0 ].chip = data; data->clk[0 ].hw.init = &init; data->clk[0 ].index =0 ;
@@ -764,6 +772,10 @@ static int cdce925_probe(struct i2c_client *client,for (i =1 ; i < data->chip_info->num_outputs; ++i) { init.name =kasprintf (GFP_KERNEL ,"%pOFn.Y%d" , client->dev.of_node, i+1 ); +if (!init.name) { + err = -ENOMEM ; + goto error; + } data->clk[i].chip = data; data->clk[i].hw.init = &init; data->clk[i].index = i;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 93/313 clk: keystone: sci-clk: check return value of kasprintf()
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit b73ed981da6d25c921aaefa7ca3df85bbd85b7fc ]
kasprintf() returns a pointer to dynamically allocated memory. Pointer could be NULL in case allocation fails. Check pointer validity. Identified with coccinelle (kmerr.cocci script).
Depends-on: 96488c09b0f4 ("clk: keystone: sci-clk: cut down the clock name length")
--- drivers/clk/keystone/sci-clk.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clk/keystone/sci-clk.c +2 -0
@@ -287,6 +287,8 @@ static int _sci_clk_build(struct sci_clk_provider *provider, name =kasprintf (GFP_KERNEL ,"clk:%d:%d" , sci_clk->dev_id, sci_clk->clk_id); +if (!name) +return -ENOMEM ; init.name = name;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 94/313 ASoC: imx-audmix: check return value of devm_kasprintf()
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit 2f76e1d6ca524a888d29aafe29f2ad2003857971 ]
devm_kasprintf() returns a pointer to dynamically allocated memory. Pointer could be NULL in case allocation fails. Check pointer validity. Identified with coccinelle (kmerr.cocci script).
--- sound/soc/fsl/imx-audmix.c | 9 +++++++++ 1 file changed, 9 insertions(+)
sound/soc/fsl/imx-audmix.c +9 -0
@@ -230,6 +230,8 @@ static int imx_audmix_probe(struct platform_device *pdev) dai_name =devm_kasprintf (&pdev->dev,GFP_KERNEL ,"%s%s" , fe_name_pref, args.np->full_name +1 ); +if (!dai_name) +return -ENOMEM ;dev_info (pdev->dev.parent,"DAI FE name:%s\n" , dai_name);
@@ -238,6 +240,8 @@ static int imx_audmix_probe(struct platform_device *pdev) capture_dai_name =devm_kasprintf (&pdev->dev,GFP_KERNEL ,"%s %s" , dai_name,"CPU-Capture" ); +if (!capture_dai_name) +return -ENOMEM ; } priv->dai[i].cpus = &dlc[0 ];
@@ -268,6 +272,8 @@ static int imx_audmix_probe(struct platform_device *pdev) "AUDMIX-Playback-%d", i); be_cp =devm_kasprintf (&pdev->dev,GFP_KERNEL ,"AUDMIX-Capture-%d" , i); +if (!be_name || !be_pb || !be_cp) +return -ENOMEM ; priv->dai[num_dai + i].cpus = &dlc[3 ]; priv->dai[num_dai + i].codecs = &dlc[4 ];
@@ -295,6 +301,9 @@ static int imx_audmix_probe(struct platform_device *pdev) priv->dapm_routes[i].source =devm_kasprintf (&pdev->dev,GFP_KERNEL ,"%s %s" , dai_name,"CPU-Playback" ); +if (!priv->dapm_routes[i].source) +return -ENOMEM ; + priv->dapm_routes[i].sink = be_pb; priv->dapm_routes[num_dai + i].source = be_pb; priv->dapm_routes[num_dai + i].sink = be_cp;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 95/313 scsi: qedf: Fix NULL dereference in error handling
In reply to Greg Kroah-HartmanFrom: Jinhong Zhu <[email protected]>
[ Upstream commit f025312b089474a54e4859f3453771314d9e3d4f ]
Smatch reported:
drivers/scsi/qedf/qedf_main.c:3056 qedf_alloc_global_queues()
warn: missing unwind goto?
At this point in the function, nothing has been allocated so we can return directly. In particular the "qedf->global_queues" have not been allocated so calling qedf_free_global_queues() will lead to a NULL dereference when we check if (!gl[i]) and "gl" is NULL.
--- drivers/scsi/qedf/qedf_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/qedf/qedf_main.c +1 -2
@@ -2914,9 +2914,8 @@ static int qedf_alloc_global_queues(struct qedf_ctx *qedf)* addresses of our queues */ if (!qedf->p_cpuq) { - status = -EINVAL ;QEDF_ERR (&qedf->dbg_ctx,"p_cpuq is NULL.\n" ); - goto mem_alloc_failure; +return -EINVAL ; } qedf->global_queues = kzalloc((sizeof(struct global_queue *)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 96/313 PCI/ASPM: Disable ASPM on MFD function removal to avoid use-after-free
In reply to Greg Kroah-HartmanFrom: Ding Hui <[email protected]>
[ Upstream commit 456d8aa37d0f56fc9e985e812496e861dcd6f2f2 ]
Struct pcie_link_state->downstream is a pointer to the pci_dev of function
0. Previously we retained that pointer when removing function 0, and subsequent ASPM policy changes dereferenced it, resulting in a use-after-free warning from KASAN, e.g.:
# echo 1 > /sys/bus/pci/devices/0000:03:00.0/remove # echo powersave > /sys/module/pcie_aspm/parameters/policy
BUG: KASAN: slab-use-after-free in pcie_config_aspm_link+0x42d/0x500 Call Trace: kasan_report+0xae/0xe0 pcie_config_aspm_link+0x42d/0x500 pcie_aspm_set_policy+0x8e/0x1a0 param_attr_store+0x162/0x2c0 module_attr_store+0x3e/0x80
PCIe spec r6.0, sec 7.5.3.7, recommends that software program the same ASPM Control value in all functions of multi-function devices.
Disable ASPM and free the pcie_link_state when any child function is removed so we can discard the dangling pcie_link_state->downstream pointer and maintain the same ASPM Control configuration for all functions.
--- drivers/pci/pcie/aspm.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
drivers/pci/pcie/aspm.c +12 -9
@@ -991,21 +991,24 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev)down_read (&pci_bus_sem);mutex_lock (&aspm_lock); -/* -* All PCIe functions are in one slot, remove one function will remove -* the whole slot, so just wait until we are the last function left. -*/ -if (!list_empty (&parent->subordinate->devices)) - goto out; link = parent->link_state; root = link->root; parent_link = link->parent; -/* All functions are removed, so just disable ASPM for the link */ +/* +* link->downstream is a pointer to the pci_dev of function 0. If +* we remove that function, the pci_dev is about to be deallocated, +* so we can't use link->downstream again. Free the link state to +* avoid this. +* +* If we're removing a non-0 function, it's possible we could +* retain the link state, but PCIe r6.0, sec 7.5.3.7, recommends +* programming the same ASPM Control value for all functions of +* multi-function devices, so disable ASPM for all of them. +*/ pcie_config_aspm_link (link,0 );list_del (&link->sibling); -/* Clock PM is for endpoint device */ free_link_state (link);/* Recheck latencies and configure upstream links */
@@ -1013,7 +1016,7 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev)pcie_update_aspm_capable (root);pcie_config_aspm_path (parent_link); } -out: +mutex_unlock (&aspm_lock);up_read (&pci_bus_sem); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 97/313 scsi: 3w-xxxx: Add error handling for initialization failure in tw_probe()
In reply to Greg Kroah-HartmanFrom: Yuchen Yang <[email protected]>
[ Upstream commit 2e2fe5ac695a00ab03cab4db1f4d6be07168ed9d ]
Smatch complains that:
tw_probe() warn: missing error code 'retval'
This patch adds error checking to tw_probe() to handle initialization failure. If tw_reset_sequence() function returns a non-zero value, the function will return -EINVAL to indicate initialization failure.
--- drivers/scsi/3w-xxxx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/scsi/3w-xxxx.c +3 -1
@@ -2310,8 +2310,10 @@ static int tw_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)TW_DISABLE_INTERRUPTS (tw_dev);/* Initialize the card */ -if (tw_reset_sequence (tw_dev)) +if (tw_reset_sequence (tw_dev)) { + retval = -EINVAL ; goto out_release_mem_region; + }/* Set host specific parameters */ host->max_id =TW_MAX_UNITS ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 98/313 PCI: pciehp: Cancel bringup sequence if card is not present
In reply to Greg Kroah-HartmanFrom: Rongguang Wei <[email protected]>
[ Upstream commit e8afd0d9fccc27c8ad263db5cf5952cfcf72d6fe ]
If a PCIe hotplug slot has an Attention Button, the normal hot-add flow is:
- Slot is empty and slot power is off
- User inserts card in slot and presses Attention Button
- OS blinks Power Indicator for 5 seconds
- After 5 seconds, OS turns on Power Indicator, turns on slot power, and enumerates the device
Previously, if a user pressed the Attention Button on an *empty* slot, pciehp logged the following messages and blinked the Power Indicator until a second button press:
[0.000] pciehp: Button press: will power on in 5 sec
[0.001] # Power Indicator starts blinking
[5.001] # 5 second timeout; slot is empty, so we should cancel the
request to power on and turn off Power Indicator[7.000] # Power Indicator still blinking [8.000] # possible card insertion [9.000] pciehp: Button press: canceling request to power on
The first button press incorrectly left the slot in BLINKINGON_STATE, so the second was interpreted as a "cancel power on" event regardless of whether a card was present.
If the slot is empty, turn off the Power Indicator and return from BLINKINGON_STATE to OFF_STATE after 5 seconds, effectively canceling the request to power on. Putting the slot in OFF_STATE also means the second button press will correctly request a slot power on if the slot is occupied.
--- drivers/pci/hotplug/pciehp_ctrl.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/pci/hotplug/pciehp_ctrl.c +8 -0
@@ -258,6 +258,14 @@ void pciehp_handle_presence_or_link_change(struct controller *ctrl, u32 events) present =pciehp_card_present (ctrl); link_active =pciehp_check_link_active (ctrl);if (present <=0 && link_active <=0 ) { +if (ctrl->state ==BLINKINGON_STATE ) { + ctrl->state =OFF_STATE ; +cancel_delayed_work (&ctrl->button_work); +pciehp_set_indicators (ctrl,PCI_EXP_SLTCTL_PWR_IND_OFF , +INDICATOR_NOOP ); +ctrl_info (ctrl,"Slot(%s): Card not present\n" , +slot_name (ctrl)); + }mutex_unlock (&ctrl->state_lock);return ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 99/313 PCI: ftpci100: Release the clock resources
In reply to Greg Kroah-HartmanFrom: Junyan Ye <[email protected]>
[ Upstream commit c60738de85f40b0b9f5cb23c21f9246e5a47908c ]
Smatch reported:
1. drivers/pci/controller/pci-ftpci100.c:526 faraday_pci_probe() warn:
'clk' from clk_prepare_enable() not released on lines: 442,451,462,478,512,517.
2. drivers/pci/controller/pci-ftpci100.c:526 faraday_pci_probe() warn:
'p->bus_clk' from clk_prepare_enable() not released on lines: 451,462,478,512,517.
The clock resource is obtained by devm_clk_get(), and then clk_prepare_enable() makes the clock resource ready for use. After that, clk_disable_unprepare() should be called to release the clock resource when it is no longer needed. However, while doing some error handling in faraday_pci_probe(), clk_disable_unprepare() is not called to release clk and p->bus_clk before returning. These return lines are exactly 442, 451, 462, 478, 512, 517.
Fix this warning by replacing devm_clk_get() with devm_clk_get_enabled(), which is equivalent to devm_clk_get() + clk_prepare_enable(). And with devm_clk_get_enabled(), the clock will automatically be disabled, unprepared and freed when the device is unbound from the bus.
--- drivers/pci/controller/pci-ftpci100.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/pci/controller/pci-ftpci100.c +2 -12
@@ -458,22 +458,12 @@ static int faraday_pci_probe(struct platform_device *pdev) p->dev = dev;/* Retrieve and enable optional clocks */ - clk =devm_clk_get (dev,"PCLK" ); + clk =devm_clk_get_enabled (dev,"PCLK" );if (IS_ERR (clk))return PTR_ERR (clk); - ret =clk_prepare_enable (clk); -if (ret) { -dev_err (dev,"could not prepare PCLK\n" ); -return ret; - } - p->bus_clk =devm_clk_get (dev,"PCICLK" ); + p->bus_clk =devm_clk_get_enabled (dev,"PCICLK" );if (IS_ERR (p->bus_clk))return PTR_ERR (p->bus_clk); - ret =clk_prepare_enable (p->bus_clk); -if (ret) { -dev_err (dev,"could not prepare PCICLK\n" ); -return ret; - } regs =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); p->base =devm_ioremap_resource (dev, regs);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 100/313 PCI: Add pci_clear_master() stub for non-CONFIG_PCI
In reply to Greg Kroah-HartmanFrom: Sui Jingfeng <[email protected]>
[ Upstream commit 2aa5ac633259843f656eb6ecff4cf01e8e810c5e ]
Add a pci_clear_master() stub when CONFIG_PCI is not set so drivers that support both PCI and platform devices don't need #ifdefs or extra Kconfig symbols for the PCI parts.
--- include/linux/pci.h | 1 + 1 file changed, 1 insertion(+)
include/linux/pci.h +1 -0
@@ -1687,6 +1687,7 @@ static inline struct pci_dev *pci_get_class(unsigned int class,#define pci_dev_put (dev) do { } while (0)static inline void pci_set_master (struct pci_dev *dev) { } +static inline void pci_clear_master (struct pci_dev *dev) { }static inline int pci_enable_device (struct pci_dev *dev) {return -EIO ; }static inline void pci_disable_device (struct pci_dev *dev) { }static inline int pci_assign_resource (struct pci_dev *dev,int i)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 101/313 pinctrl: cherryview: Return correct value if pin in push-pull mode
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 5835196a17be5cfdcad0b617f90cf4abe16951a4 ]
Currently the getter returns ENOTSUPP on pin configured in the push-pull mode. Fix this by adding the missed switch case.
--- drivers/pinctrl/intel/pinctrl-cherryview.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/pinctrl/intel/pinctrl-cherryview.c +10 -5
@@ -1021,11 +1021,6 @@ static int chv_config_get(struct pinctrl_dev *pctldev, unsigned int pin,break ; -case PIN_CONFIG_DRIVE_OPEN_DRAIN : -if (!(ctrl1 &CHV_PADCTRL1_ODEN )) -return -EINVAL ; -break ; -case PIN_CONFIG_BIAS_HIGH_IMPEDANCE : {u32 cfg;
@@ -1035,6 +1030,16 @@ static int chv_config_get(struct pinctrl_dev *pctldev, unsigned int pin,return -EINVAL ;break ; + +case PIN_CONFIG_DRIVE_PUSH_PULL : +if (ctrl1 &CHV_PADCTRL1_ODEN ) +return -EINVAL ; +break ; + +case PIN_CONFIG_DRIVE_OPEN_DRAIN : +if (!(ctrl1 &CHV_PADCTRL1_ODEN )) +return -EINVAL ; +break ; }default :
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 102/313 perf dwarf-aux: Fix off-by-one in die_get_varname()
In reply to Greg Kroah-HartmanFrom: Namhyung Kim <[email protected]>
[ Upstream commit 3abfcfd847717d232e36963f31a361747c388fe7 ]
The die_get_varname() returns "(unknown_type)" string if it failed to find a type for the variable. But it had a space before the opening parenthesis and it made the closing parenthesis cut off due to the off-by-one in the string length (14).
--- tools/perf/util/dwarf-aux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/dwarf-aux.c +1 -1
@@ -1007,7 +1007,7 @@ int die_get_varname(Dwarf_Die *vr_die, struct strbuf *buf) ret =die_get_typename (vr_die, buf);if (ret <0 ) {pr_debug ("Failed to get type, make it unknown.\n" ); - ret =strbuf_add (buf," (unknown_type)" ,14 ); + ret =strbuf_add (buf,"(unknown_type)" ,14 ); }return ret <0 ? ret :strbuf_addf (buf,"\t%s" ,dwarf_diename (vr_die));
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 103/313 pinctrl: at91-pio4: check return value of devm_kasprintf()
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit f6fd5d4ff8ca0b24cee1af4130bcb1fa96b61aa0 ]
devm_kasprintf() returns a pointer to dynamically allocated memory. Pointer could be NULL in case allocation fails. Check pointer validity. Identified with coccinelle (kmerr.cocci script).
Depends-on: 1c4e5c470a56 ("pinctrl: at91: use devm_kasprintf() to avoid potential leaks")
Depends-on: 5a8f9cf269e8 ("pinctrl: at91-pio4: use proper format specifier for unsigned int")
--- drivers/pinctrl/pinctrl-at91-pio4.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pinctrl/pinctrl-at91-pio4.c +2 -0
@@ -1013,6 +1013,8 @@ static int atmel_pinctrl_probe(struct platform_device *pdev)/* Pin naming convention: P(bank_name)(bank_pin_number). */ pin_desc[i].name =devm_kasprintf (&pdev->dev,GFP_KERNEL ,"P%c%d" , bank +'A' , line); +if (!pin_desc[i].name) +return -ENOMEM ; group->name = group_names[i] = pin_desc[i].name; group->pin = pin_desc[i].number;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 104/313 powerpc/mm/dax: Fix the condition when checking if altmap vmemap can cross-boundary
In reply to Greg Kroah-HartmanFrom: Aneesh Kumar K.V <[email protected]>
[ Upstream commit c8eebc4a99f15280654f23e914e746c40a516e50 ]
Without this fix, the last subsection vmemmap can end up in memory even if the namespace is created with -M mem and has sufficient space in the altmap area.
--- arch/powerpc/mm/init_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/mm/init_64.c +1 -1
@@ -178,7 +178,7 @@ static bool altmap_cross_boundary(struct vmem_altmap *altmap, unsigned long starunsigned long nr_pfn = page_size /sizeof (struct page );unsigned long start_pfn =page_to_pfn ((struct page *)start); -if ((start_pfn + nr_pfn) > altmap->end_pfn) +if ((start_pfn + nr_pfn -1 ) > altmap->end_pfn)return true;if (start_pfn < altmap->base_pfn)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 105/313 hwrng: virtio - add an internal buffer
In reply to Greg Kroah-HartmanFrom: Laurent Vivier <[email protected]>
[ Upstream commit bf3175bc50a3754dc427e2f5046e17a9fafc8be7 ]
hwrng core uses two buffers that can be mixed in the virtio-rng queue.
If the buffer is provided with wait=0 it is enqueued in the virtio-rng queue but unused by the caller.
On the next call, core provides another buffer but the first one is filled instead and the new one queued. And the caller reads the data from the new one that is not updated, and the data in the first one are lost.
To avoid this mix, virtio-rng needs to use its own unique internal buffer at a cost of a data copy to the caller buffer.
Stable-dep-of: ac52578d6e8d ("hwrng: virtio - Fix race on data_avail and actual data")
--- drivers/char/hw_random/virtio-rng.c | 43 ++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 10 deletions(-)
drivers/char/hw_random/virtio-rng.c +33 -10
@@ -17,13 +17,20 @@ static DEFINE_IDA(rng_index_ida);struct virtrng_info {struct hwrng hwrng;struct virtqueue *vq; -struct completion have_data;char name[25 ]; -unsigned int data_avail;int index;bool busy;bool hwrng_register_done;bool hwrng_removed; +/* data transfer */ +struct completion have_data; +unsigned int data_avail; +/* minimal size returned by rng_buffer_size() */ +#if SMP_CACHE_BYTES <32 +u8 data[32 ]; +#else +u8 data[SMP_CACHE_BYTES ]; +#endif };static void random_recv_done (struct virtqueue *vq)
@@ -38,14 +45,14 @@ static void random_recv_done(struct virtqueue *vq) }/* The host will fill any buffer we give it with sweet, sweet randomness. */ -static void register_buffer (struct virtrng_info *vi,u8 *buf,size_t size) +static void register_buffer (struct virtrng_info *vi) {struct scatterlist sg; -sg_init_one (&sg, buf, size); +sg_init_one (&sg, vi->data,sizeof (vi->data));/* There should always be room for one buffer. */ -virtqueue_add_inbuf (vi->vq, &sg,1 , buf,GFP_KERNEL ); +virtqueue_add_inbuf (vi->vq, &sg,1 , vi->data,GFP_KERNEL );virtqueue_kick (vi->vq); }
@@ -54,6 +61,8 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait) {int ret;struct virtrng_info *vi = (struct virtrng_info *)rng->priv; +unsigned int chunk; +size_t read;if (vi->hwrng_removed)return -ENODEV ;
@@ -61,19 +70,33 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)if (!vi->busy) { vi->busy = true;reinit_completion (&vi->have_data); -register_buffer (vi, buf, size); +register_buffer (vi); }if (!wait)return 0 ; - ret =wait_for_completion_killable (&vi->have_data); -if (ret <0 ) -return ret; + read =0 ; +while (size !=0 ) { + ret =wait_for_completion_killable (&vi->have_data); +if (ret <0 ) +return ret; + + chunk = min_t(unsigned int, size, vi->data_avail); +memcpy (buf + read, vi->data, chunk); + read += chunk; + size -= chunk; + vi->data_avail =0 ; + +if (size !=0 ) { +reinit_completion (&vi->have_data); +register_buffer (vi); + } + } vi->busy = false; -return vi->data_avail; +return read; }static void virtio_cleanup (struct hwrng *rng)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 106/313 hwrng: virtio - dont wait on cleanup
In reply to Greg Kroah-HartmanFrom: Laurent Vivier <[email protected]>
[ Upstream commit 2bb31abdbe55742c89f4dc0cc26fcbc8467364f6 ]
When virtio-rng device was dropped by the hwrng core we were forced to wait the buffer to come back from the device to not have remaining ongoing operation that could spoil the buffer.
But now, as the buffer is internal to the virtio-rng we can release the waiting loop immediately, the buffer will be retrieve and use when the virtio-rng driver will be selected again.
This avoids to hang on an rng_current write command if the virtio-rng device is blocked by a lack of entropy. This allows to select another entropy source if the current one is empty.
Stable-dep-of: ac52578d6e8d ("hwrng: virtio - Fix race on data_avail and actual data")
--- drivers/char/hw_random/virtio-rng.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/char/hw_random/virtio-rng.c +6 -1
@@ -81,6 +81,11 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait) ret =wait_for_completion_killable (&vi->have_data);if (ret <0 )return ret; +/* if vi->data_avail is 0, we have been interrupted +* by a cleanup, but buffer stays in the queue +*/ +if (vi->data_avail ==0 ) +return read; chunk = min_t(unsigned int, size, vi->data_avail);memcpy (buf + read, vi->data, chunk);
@@ -104,7 +109,7 @@ static void virtio_cleanup(struct hwrng *rng)struct virtrng_info *vi = (struct virtrng_info *)rng->priv;if (vi->busy) -wait_for_completion (&vi->have_data); +complete (&vi->have_data); }static int probe_common (struct virtio_device *vdev)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 107/313 hwrng: virtio - dont waste entropy
In reply to Greg Kroah-HartmanFrom: Laurent Vivier <[email protected]>
[ Upstream commit 5c8e933050044d6dd2a000f9a5756ae73cbe7c44 ]
if we don't use all the entropy available in the buffer, keep it and use it later.
Stable-dep-of: ac52578d6e8d ("hwrng: virtio - Fix race on data_avail and actual data")
--- drivers/char/hw_random/virtio-rng.c | 52 +++++++++++++++++++---------- 1 file changed, 35 insertions(+), 17 deletions(-)
drivers/char/hw_random/virtio-rng.c +35 -17
@@ -25,6 +25,7 @@ struct virtrng_info {/* data transfer */ struct completion have_data;unsigned int data_avail; +unsigned int data_idx;/* minimal size returned by rng_buffer_size() */ #if SMP_CACHE_BYTES <32 u8 data[32 ];
@@ -41,6 +42,9 @@ static void random_recv_done(struct virtqueue *vq)if (!virtqueue_get_buf (vi->vq, &vi->data_avail))return ; + vi->data_idx =0 ; + vi->busy = false; +complete (&vi->have_data); }
@@ -57,6 +61,16 @@ static void register_buffer(struct virtrng_info *vi)virtqueue_kick (vi->vq); } +static unsigned int copy_data (struct virtrng_info *vi,void *buf, +unsigned int size) +{ + size = min_t(unsigned int, size, vi->data_avail); +memcpy (buf, vi->data + vi->data_idx, size); + vi->data_idx += size; + vi->data_avail -= size; +return size; +} +static int virtio_read (struct hwrng *rng,void *buf,size_t size,bool wait) {int ret;
@@ -67,17 +81,29 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)if (vi->hwrng_removed)return -ENODEV ; -if (!vi->busy) { - vi->busy = true; -reinit_completion (&vi->have_data); -register_buffer (vi); + read =0 ; + +/* copy available data */ +if (vi->data_avail) { + chunk =copy_data (vi, buf, size); + size -= chunk; + read += chunk; }if (!wait) -return 0 ; +return read; - read =0 ; +/* We have already copied available entropy, +* so either size is 0 or data_avail is 0 +*/ while (size !=0 ) { +/* data_avail is 0 */ +if (!vi->busy) { +/* no pending request, ask for more */ + vi->busy = true; +reinit_completion (&vi->have_data); +register_buffer (vi); + } ret =wait_for_completion_killable (&vi->have_data);if (ret <0 )return ret;
@@ -87,20 +113,11 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)if (vi->data_avail ==0 )return read; - chunk = min_t(unsigned int, size, vi->data_avail); -memcpy (buf + read, vi->data, chunk); - read += chunk; + chunk =copy_data (vi, buf + read, size); size -= chunk; - vi->data_avail =0 ; - -if (size !=0 ) { -reinit_completion (&vi->have_data); -register_buffer (vi); - } + read += chunk; } - vi->busy = false; -return read; }
@@ -160,6 +177,7 @@ static void remove_common(struct virtio_device *vdev) vi->hwrng_removed = true; vi->data_avail =0 ; + vi->data_idx =0 ;complete (&vi->have_data); vdev->config->reset (vdev); vi->busy = false;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 108/313 hwrng: virtio - always add a pending request
In reply to Greg Kroah-HartmanFrom: Laurent Vivier <[email protected]>
[ Upstream commit 9a4b612d675b03f7fc9fa1957ca399c8223f3954 ]
If we ensure we have already some data available by enqueuing again the buffer once data are exhausted, we can return what we have without waiting for the device answer.
Stable-dep-of: ac52578d6e8d ("hwrng: virtio - Fix race on data_avail and actual data")
--- drivers/char/hw_random/virtio-rng.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-)
drivers/char/hw_random/virtio-rng.c +12 -14
@@ -19,7 +19,6 @@ struct virtrng_info {struct virtqueue *vq;char name[25 ];int index; -bool busy;bool hwrng_register_done;bool hwrng_removed;/* data transfer */
@@ -43,16 +42,18 @@ static void random_recv_done(struct virtqueue *vq)return ; vi->data_idx =0 ; - vi->busy = false;complete (&vi->have_data); } -/* The host will fill any buffer we give it with sweet, sweet randomness. */ -static void register_buffer (struct virtrng_info *vi) +static void request_entropy (struct virtrng_info *vi) {struct scatterlist sg; +reinit_completion (&vi->have_data); + vi->data_avail =0 ; + vi->data_idx =0 ; +sg_init_one (&sg, vi->data,sizeof (vi->data));/* There should always be room for one buffer. */
@@ -68,6 +69,8 @@ static unsigned int copy_data(struct virtrng_info *vi, void *buf,memcpy (buf, vi->data + vi->data_idx, size); vi->data_idx += size; vi->data_avail -= size; +if (vi->data_avail ==0 ) +request_entropy (vi);return size; }
@@ -97,13 +100,7 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)* so either size is 0 or data_avail is 0 */ while (size !=0 ) { -/* data_avail is 0 */ -if (!vi->busy) { -/* no pending request, ask for more */ - vi->busy = true; -reinit_completion (&vi->have_data); -register_buffer (vi); - } +/* data_avail is 0 but a request is pending */ ret =wait_for_completion_killable (&vi->have_data);if (ret <0 )return ret;
@@ -125,8 +122,7 @@ static void virtio_cleanup(struct hwrng *rng) {struct virtrng_info *vi = (struct virtrng_info *)rng->priv; -if (vi->busy) -complete (&vi->have_data); +complete (&vi->have_data); }static int probe_common (struct virtio_device *vdev)
@@ -162,6 +158,9 @@ static int probe_common(struct virtio_device *vdev) goto err_find; } +/* we always have a pending entropy request */ +request_entropy (vi); +return 0 ; err_find:
@@ -180,7 +179,6 @@ static void remove_common(struct virtio_device *vdev) vi->data_idx =0 ;complete (&vi->have_data); vdev->config->reset (vdev); - vi->busy = false;if (vi->hwrng_register_done)hwrng_unregister (&vi->hwrng); vdev->config->del_vqs (vdev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 109/313 hwrng: virtio - Fix race on data_avail and actual data
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
[ Upstream commit ac52578d6e8d300dd50f790f29a24169b1edd26c ]
The virtio rng device kicks off a new entropy request whenever the data available reaches zero. When a new request occurs at the end of a read operation, that is, when the result of that request is only needed by the next reader, then there is a race between the writing of the new data and the next reader.
This is because there is no synchronisation whatsoever between the writer and the reader.
Fix this by writing data_avail with smp_store_release and reading it with smp_load_acquire when we first enter read. The subsequent reads are safe because they're either protected by the first load acquire, or by the completion mechanism.
Also remove the redundant zeroing of data_idx in random_recv_done (data_idx must already be zero at this point) and data_avail in request_entropy (ditto).
--- drivers/char/hw_random/virtio-rng.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/char/hw_random/virtio-rng.c +5 -5
@@ -4,6 +4,7 @@* Copyright (C) 2007, 2008 Rusty Russell IBM Corporation */ +#include <asm/barrier.h> #include <linux/err.h> #include <linux/hw_random.h> #include <linux/scatterlist.h>
@@ -36,13 +37,13 @@ struct virtrng_info {static void random_recv_done (struct virtqueue *vq) {struct virtrng_info *vi = vq->vdev->priv; +unsigned int len;/* We can get spurious callbacks, e.g. shared IRQs + virtio_pci. */ -if (!virtqueue_get_buf (vi->vq, &vi->data_avail)) +if (!virtqueue_get_buf (vi->vq, &len))return ; - vi->data_idx =0 ; - +smp_store_release (&vi->data_avail, len);complete (&vi->have_data); }
@@ -51,7 +52,6 @@ static void request_entropy(struct virtrng_info *vi)struct scatterlist sg;reinit_completion (&vi->have_data); - vi->data_avail =0 ; vi->data_idx =0 ;sg_init_one (&sg, vi->data,sizeof (vi->data));
@@ -87,7 +87,7 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait) read =0 ;/* copy available data */ -if (vi->data_avail) { +if (smp_load_acquire (&vi->data_avail)) { chunk =copy_data (vi, buf, size); size -= chunk; read += chunk;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 110/313 crypto: nx - fix build warnings when DEBUG_FS is not enabled
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit b04b076fb56560b39d695ac3744db457e12278fd ]
Fix build warnings when DEBUG_FS is not enabled by using an empty do-while loop instead of a value:
In file included from ../drivers/crypto/nx/nx.c:27:../drivers/crypto/nx/nx.c: In function 'nx_register_algs':../drivers/crypto/nx/nx.h:173:33: warning: statement with no effect [-Wunused-value]
173 | #define NX_DEBUGFS_INIT(drv) (0)../drivers/crypto/nx/nx.c:573:9: note: in expansion of macro 'NX_DEBUGFS_INIT'
573 | NX_DEBUGFS_INIT(&nx_driver);../drivers/crypto/nx/nx.c: In function 'nx_remove':../drivers/crypto/nx/nx.h:174:33: warning: statement with no effect [-Wunused-value]
174 | #define NX_DEBUGFS_FINI(drv) (0)../drivers/crypto/nx/nx.c:793:17: note: in expansion of macro 'NX_DEBUGFS_FINI'
793 | NX_DEBUGFS_FINI(&nx_driver);
Also, there is no need to build nx_debugfs.o when DEBUG_FS is not enabled, so change the Makefile to accommodate that.
--- drivers/crypto/nx/Makefile | 2 +- drivers/crypto/nx/nx.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/crypto/nx/Makefile +1 -1
@@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_CRYPTO_DEV_NX_ENCRYPT) += nx-crypto.o nx-crypto-objs := nx.o \ - nx_debugfs.o \ nx-aes-cbc.o \ nx-aes-ecb.o \ nx-aes-gcm.o \
@@ -11,6 +10,7 @@ nx-crypto-objs := nx.o \ nx-sha256.o \ nx-sha512.o +nx-crypto-$(CONFIG_DEBUG_FS) += nx_debugfs.o obj-$(CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES) += nx-compress-pseries.o nx-compress.o obj-$(CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV) += nx-compress-powernv.o nx-compress.o nx-compress-objs := nx-842.o
drivers/crypto/nx/nx.h +2 -2
@@ -169,8 +169,8 @@ struct nx_sg *nx_walk_and_build(struct nx_sg *, unsigned int,void nx_debugfs_init (struct nx_crypto_driver *);void nx_debugfs_fini (struct nx_crypto_driver *);#else -#define NX_DEBUGFS_INIT (drv) (0) -#define NX_DEBUGFS_FINI (drv) (0) +#define NX_DEBUGFS_INIT (drv) do {} while (0) +#define NX_DEBUGFS_FINI (drv) do {} while (0)#endif #define NX_PAGE_NUM (x) ((u64)(x) & 0xfffffffffffff000ULL)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 111/313 modpost: fix section mismatch message for R_ARM_ABS32
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit b7c63520f6703a25eebb4f8138fed764fcae1c6f ]
addend_arm_rel() processes R_ARM_ABS32 in a wrong way.
Here, test code.
[test code 1]
#include <linux/init.h>
int __initdata foo;
int get_foo(void) { return foo; }If you compile it with ARM versatile_defconfig, modpost will show the symbol name, (unknown).
WARNING: modpost: vmlinux.o: section mismatch in reference: get_foo (section: .text) -> (unknown) (section: .init.data)
(You need to use GNU linker instead of LLD to reproduce it.)
If you compile it for other architectures, modpost will show the correct symbol name.
WARNING: modpost: vmlinux.o: section mismatch in reference: get_foo (section: .text) -> foo (section: .init.data)
For R_ARM_ABS32, addend_arm_rel() sets r->r_addend to a wrong value.
I just mimicked the code in arch/arm/kernel/module.c.
However, there is more difficulty for ARM.
Here, test code.
[test code 2]
#include <linux/init.h>
int __initdata foo;
int get_foo(void) { return foo; }
int __initdata bar;
int get_bar(void) { return bar; }With this commit applied, modpost will show the following messages for ARM versatile_defconfig:
WARNING: modpost: vmlinux.o: section mismatch in reference: get_foo (section: .text) -> foo (section: .init.data)
WARNING: modpost: vmlinux.o: section mismatch in reference: get_bar (section: .text) -> foo (section: .init.data)
The reference from 'get_bar' to 'foo' seems wrong.
I have no solution for this because it is true in assembly level.
In the following output, relocation at 0x1c is no longer associated with 'bar'. The two relocation entries point to the same symbol, and the offset to 'bar' is encoded in the instruction 'r0, [r3, #4]'.
Disassembly of section .text:
00000000 <get_foo>:
0: e59f3004 ldr r3, [pc, #4] @ c <get_foo+0xc>
4: e5930000 ldr r0, [r3]
8: e12fff1e bx lr
c: 00000000 .word 0x00000000 00000010 <get_bar>:
10: e59f3004 ldr r3, [pc, #4] @ 1c <get_bar+0xc>
14: e5930004 ldr r0, [r3, #4]
18: e12fff1e bx lr
1c: 00000000 .word 0x00000000 Relocation section '.rel.text' at offset 0x244 contains 2 entries:
Offset Info Type Sym.Value Sym. Name
0000000c 00000c02 R_ARM_ABS32 00000000 .init.data 0000001c 00000c02 R_ARM_ABS32 00000000 .init.data
When find_elf_symbol() gets into a situation where relsym->st_name is zero, there is no guarantee to get the symbol name as written in C.
I am keeping the current logic because it is useful in many architectures, but the symbol name is not always correct depending on the optimization. I left some comments in find_tosym().
--- scripts/mod/modpost.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
scripts/mod/modpost.c +9 -3
@@ -1325,6 +1325,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,if (relsym->st_name !=0 )return relsym; +/* +* Strive to find a better symbol name, but the resulting name may not +* match the symbol referenced in the original code. +*/ relsym_secindex =get_secindex (elf, relsym);for (sym = elf->symtab_start; sym < elf->symtab_stop; sym++) {if (get_secindex (elf, sym) != relsym_secindex)
@@ -1811,12 +1815,14 @@ static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)static int addend_arm_rel (struct elf_info *elf,Elf_Shdr *sechdr,Elf_Rela *r) {unsigned int r_typ =ELF_R_TYPE (r->r_info); +Elf_Sym *sym = elf->symtab_start +ELF_R_SYM (r->r_info); +void *loc =reloc_location (elf, sechdr, r); +uint32_t inst;switch (r_typ) {case R_ARM_ABS32 : -/* From ARM ABI: (S + A) | T */ - r->r_addend = (int )(long ) - (elf->symtab_start +ELF_R_SYM (r->r_info)); + inst =TO_NATIVE (*(uint32_t *)loc); + r->r_addend = inst + sym->st_value;break ;case R_ARM_PC24 :case R_ARM_CALL :
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 112/313 modpost: fix section mismatch message for R_ARM_{PC24,CALL,JUMP24}
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit 56a24b8ce6a7f9c4a21b2276a8644f6f3d8fc14d ]
addend_arm_rel() processes R_ARM_PC24, R_ARM_CALL, R_ARM_JUMP24 in a wrong way.
Here, test code.
[test code for R_ARM_JUMP24]
.section .init.text,"ax"
bar:
bx lr
.section .text,"ax"
.globl foo
foo:
b bar
[test code for R_ARM_CALL]
.section .init.text,"ax"
bar:
bx lr
.section .text,"ax"
.globl foo
foo:
push {lr}
bl bar
pop {pc}If you compile it with ARM multi_v7_defconfig, modpost will show the symbol name, (unknown).
WARNING: modpost: vmlinux.o: section mismatch in reference: foo (section: .text) -> (unknown) (section: .init.text)
(You need to use GNU linker instead of LLD to reproduce it.)
Fix the code to make modpost show the correct symbol name.
I imported (with adjustment) sign_extend32() from include/linux/bitops.h.
The '+8' is the compensation for pc-relative instruction. It is documented in "ELF for the Arm Architecture" [1].
"If the relocation is pc-relative then compensation for the PC bias (the PC value is 8 bytes ahead of the executing instruction in Arm state and 4 bytes in Thumb state) must be encoded in the relocation by the object producer."
[1]: https://github.com/ARM-software/abi-aa/blob/main/aaelf32/aaelf32.rst
--- scripts/mod/modpost.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
scripts/mod/modpost.c +12 -0
@@ -1812,12 +1812,20 @@ static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)#define R_ARM_THM_JUMP19 51#endif +static int32_t sign_extend32 (int32_t value,int index) +{ +uint8_t shift =31 - index; + +return (int32_t )(value << shift) >> shift; +} +static int addend_arm_rel (struct elf_info *elf,Elf_Shdr *sechdr,Elf_Rela *r) {unsigned int r_typ =ELF_R_TYPE (r->r_info);Elf_Sym *sym = elf->symtab_start +ELF_R_SYM (r->r_info);void *loc =reloc_location (elf, sechdr, r);uint32_t inst; +int32_t offset;switch (r_typ) {case R_ARM_ABS32 :
@@ -1827,6 +1835,10 @@ static int addend_arm_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)case R_ARM_PC24 :case R_ARM_CALL :case R_ARM_JUMP24 : + inst =TO_NATIVE (*(uint32_t *)loc); + offset =sign_extend32 ((inst &0x00ffffff ) <<2 ,25 ); + r->r_addend = offset + sym->st_value +8 ; +break ;case R_ARM_THM_CALL :case R_ARM_THM_JUMP24 :case R_ARM_THM_JUMP19 :
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 113/313 crypto: skcipher - unify the crypto_has_skcipher*() functions
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
[ Upstream commit d3ca75a8b3d77f2788e6c119ea7c3e3a1ab1e1ca ]
crypto_has_skcipher() and crypto_has_skcipher2() do the same thing: they check for the availability of an algorithm of type skcipher, blkcipher, or ablkcipher, which also meets any non-type constraints the caller specified. And they have exactly the same prototype.
Therefore, eliminate the redundancy by removing crypto_has_skcipher() and renaming crypto_has_skcipher2() to crypto_has_skcipher().
Stable-dep-of: efbc7764c444 ("crypto: marvell/cesa - Fix type mismatch warning")
--- crypto/skcipher.c | 4 ++-- include/crypto/skcipher.h | 19 +------------------ 2 files changed, 3 insertions(+), 20 deletions(-)
crypto/skcipher.c +2 -2
@@ -1017,12 +1017,12 @@ struct crypto_sync_skcipher *crypto_alloc_sync_skcipher( }EXPORT_SYMBOL_GPL (crypto_alloc_sync_skcipher); -int crypto_has_skcipher2 (const char *alg_name,u32 type,u32 mask) +int crypto_has_skcipher (const char *alg_name,u32 type,u32 mask) {return crypto_type_has_alg (alg_name, &crypto_skcipher_type2, type, mask); } -EXPORT_SYMBOL_GPL (crypto_has_skcipher2); +EXPORT_SYMBOL_GPL (crypto_has_skcipher);static int skcipher_prepare_alg (struct skcipher_alg *alg) {
include/crypto/skcipher.h +1 -18
@@ -220,30 +220,13 @@ static inline void crypto_free_sync_skcipher(struct crypto_sync_skcipher *tfm)* crypto_has_skcipher() - Search for the availability of an skcipher. * @alg_name: is the cra_name / name or cra_driver_name / driver name of the * skcipher -* @type: specifies the type of the cipher -* @mask: specifies the mask for the cipher -* -* Return: true when the skcipher is known to the kernel crypto API; false -* otherwise -*/ -static inline int crypto_has_skcipher (const char *alg_name,u32 type, -u32 mask) -{ -return crypto_has_alg (alg_name,crypto_skcipher_type (type), -crypto_skcipher_mask (mask)); -} - -/** -* crypto_has_skcipher2() - Search for the availability of an skcipher. -* @alg_name: is the cra_name / name or cra_driver_name / driver name of the -* skcipher * @type: specifies the type of the skcipher * @mask: specifies the mask for the skcipher * * Return: true when the skcipher is known to the kernel crypto API; false * otherwise */ -int crypto_has_skcipher2 (const char *alg_name,u32 type,u32 mask); +int crypto_has_skcipher (const char *alg_name,u32 type,u32 mask);static inline const char *crypto_skcipher_driver_name (struct crypto_skcipher *tfm)
Signature · 1 line
2.39.2
Re: [PATCH 5.4 113/313] crypto: skcipher - unify the crypto_has_skcipher*() functions
Quoted 12 lines · Greg Kroah-Hartman
From: Eric Biggers <[email protected]>
[ Upstream commit
d3ca75a8b3d77f2788e6c119ea7c3e3a1ab1e1ca]
crypto_has_skcipher()andcrypto_has_skcipher2()do the same thing: they check for the availability of an algorithm of type skcipher, blkcipher, or ablkcipher, which also meets any non-type constraints the caller specified. And they have exactly the same prototype.Therefore, eliminate the redundancy by removing
crypto_has_skcipher()and renamingcrypto_has_skcipher2()tocrypto_has_skcipher().
Quoted 8 lines
Signed-off-by Eric Biggers <[email protected]>Signed-off-by Herbert Xu <[email protected]>Stable-dep-of:
efbc7764c444("crypto: marvell/cesa - Fix type mismatch warning")Signed-off-by Sasha Levin <[email protected]>--- crypto/skcipher.c | 4 ++-- include/crypto/skcipher.h | 19 +------------------ 2 files changed, 3 insertions(+), 20 deletions(-)
How is this a Stable-dep-of "crypto: marvell/cesa - Fix type mismatch warning"?
I don't understand why this is being backported.
- Eric
Sasha Levin
maintainerRe: [PATCH 5.4 113/313] crypto: skcipher - unify the crypto_has_skcipher*() functions
Quoted 22 lines · Eric Biggers
Quoted 12 lines · Greg Kroah-Hartman
From: Eric Biggers <[email protected]>
[ Upstream commit
d3ca75a8b3d77f2788e6c119ea7c3e3a1ab1e1ca]
crypto_has_skcipher()andcrypto_has_skcipher2()do the same thing: they check for the availability of an algorithm of type skcipher, blkcipher, or ablkcipher, which also meets any non-type constraints the caller specified. And they have exactly the same prototype.Therefore, eliminate the redundancy by removing
crypto_has_skcipher()and renamingcrypto_has_skcipher2()tocrypto_has_skcipher().Quoted 8 lines
Signed-off-by Eric Biggers <[email protected]>Signed-off-by Herbert Xu <[email protected]>Stable-dep-of:
efbc7764c444("crypto: marvell/cesa - Fix type mismatch warning")Signed-off-by Sasha Levin <[email protected]>--- crypto/skcipher.c | 4 ++-- include/crypto/skcipher.h | 19 +------------------ 2 files changed, 3 insertions(+), 20 deletions(-)
Quoted 3 lines
How is this a Stable-dep-of "crypto: marvell/cesa - Fix type mismatch warning"?
I don't understand why this is being backported.
You're right - it's not a dep on 5.15 but rather on 5.4, and my failed optimization attempt did the wrong thing here. Sorry.
Signature · 2 lines
Thanks, Sasha
Re: [PATCH 5.4 113/313] crypto: skcipher - unify the crypto_has_skcipher*() functions
Quoted 23 lines · Sasha Levin
Quoted 22 lines · Eric Biggers
Quoted 20 lines · Greg Kroah-Hartman
From: Eric Biggers <[email protected]>
[ Upstream commit
d3ca75a8b3d77f2788e6c119ea7c3e3a1ab1e1ca]
crypto_has_skcipher()andcrypto_has_skcipher2()do the same thing: they check for the availability of an algorithm of type skcipher, blkcipher, or ablkcipher, which also meets any non-type constraints the caller specified. And they have exactly the same prototype.Therefore, eliminate the redundancy by removing
crypto_has_skcipher()and renamingcrypto_has_skcipher2()tocrypto_has_skcipher().Signed-off-by Eric Biggers <[email protected]>Signed-off-by Herbert Xu <[email protected]>Stable-dep-of:
efbc7764c444("crypto: marvell/cesa - Fix type mismatch warning")Signed-off-by Sasha Levin <[email protected]>--- crypto/skcipher.c | 4 ++-- include/crypto/skcipher.h | 19 +------------------ 2 files changed, 3 insertions(+), 20 deletions(-)
Quoted 7 lines
Quoted 3 lines
How is this a Stable-dep-of "crypto: marvell/cesa - Fix type mismatch warning"?
I don't understand why this is being backported.
You're right - it's not a dep on 5.15 but rather on 5.4, and my failed optimization attempt did the wrong thing here. Sorry.
I don't see why it would be a dependency on any version.
- Eric
Greg Kroah-Hartman
maintainerRe: [PATCH 5.4 113/313] crypto: skcipher - unify the crypto_has_skcipher*() functions
Quoted 26 lines · Eric Biggers
Quoted 25 lines · Sasha Levin
Quoted 24 lines · Eric Biggers
Quoted 12 lines · Greg Kroah-Hartman
From: Eric Biggers <[email protected]>
[ Upstream commit
d3ca75a8b3d77f2788e6c119ea7c3e3a1ab1e1ca]
crypto_has_skcipher()andcrypto_has_skcipher2()do the same thing: they check for the availability of an algorithm of type skcipher, blkcipher, or ablkcipher, which also meets any non-type constraints the caller specified. And they have exactly the same prototype.Therefore, eliminate the redundancy by removing
crypto_has_skcipher()and renamingcrypto_has_skcipher2()tocrypto_has_skcipher().Quoted 8 lines
Signed-off-by Eric Biggers <[email protected]>Signed-off-by Herbert Xu <[email protected]>Stable-dep-of:
efbc7764c444("crypto: marvell/cesa - Fix type mismatch warning")Signed-off-by Sasha Levin <[email protected]>--- crypto/skcipher.c | 4 ++-- include/crypto/skcipher.h | 19 +------------------ 2 files changed, 3 insertions(+), 20 deletions(-)How is this a Stable-dep-of "crypto: marvell/cesa - Fix type mismatch warning"?
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
I don't understand why this is being backported.
You're right - it's not a dep on 5.15 but rather on 5.4, and my failed optimization attempt did the wrong thing here. Sorry.
I don't see why it would be a dependency on any version.
Yeah, something went wrong here, I've dropped both of these crypto patches now, thanks for pointing it out.
greg k-h
Greg Kroah-Hartman
maintainerPATCH 114/313 crypto: skcipher - remove crypto_has_ablkcipher()
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
[ Upstream commit cec0cb8a28f9060367099beeafd0dbdb76fdfae2 ]
crypto_has_ablkcipher() has no users, and it does the same thing as crypto_has_skcipher() anyway. So remove it. This also removes the last user of crypto_skcipher_type() and crypto_skcipher_mask(), so remove those too.
Stable-dep-of: efbc7764c444 ("crypto: marvell/cesa - Fix type mismatch warning")
--- Documentation/crypto/api-skcipher.rst | 2 +- include/linux/crypto.h | 31 --------------------------- 2 files changed, 1 insertion(+), 32 deletions(-)
Documentation/crypto/api-skcipher.rst +1 -1
@@ -41,7 +41,7 @@ Asynchronous Block Cipher API - Deprecated :doc: Asynchronous Block Cipher API .. kernel-doc:: include/linux/crypto.h - :functions: crypto_free_ablkcipher crypto_has_ablkcipher crypto_ablkcipher_ivsize crypto_ablkcipher_blocksize crypto_ablkcipher_setkey crypto_ablkcipher_reqtfm crypto_ablkcipher_encrypt crypto_ablkcipher_decrypt + :functions: crypto_free_ablkcipher crypto_ablkcipher_ivsize crypto_ablkcipher_blocksize crypto_ablkcipher_setkey crypto_ablkcipher_reqtfm crypto_ablkcipher_encrypt crypto_ablkcipher_decrypt Asynchronous Cipher Request Handle - Deprecated -----------------------------------------------
include/linux/crypto.h +0 -31
@@ -903,20 +903,6 @@ static inline struct crypto_ablkcipher *__crypto_ablkcipher_cast(return (struct crypto_ablkcipher *)tfm; } -static inline u32 crypto_skcipher_type (u32 type) -{ - type &= ~CRYPTO_ALG_TYPE_MASK ; - type |=CRYPTO_ALG_TYPE_BLKCIPHER ; -return type; -} - -static inline u32 crypto_skcipher_mask (u32 mask) -{ - mask &= ~CRYPTO_ALG_TYPE_MASK ; - mask |=CRYPTO_ALG_TYPE_BLKCIPHER_MASK ; -return mask; -} -/** * DOC: Asynchronous Block Cipher API *
@@ -962,23 +948,6 @@ static inline void crypto_free_ablkcipher(struct crypto_ablkcipher *tfm)crypto_free_tfm (crypto_ablkcipher_tfm (tfm)); } -/** -* crypto_has_ablkcipher() - Search for the availability of an ablkcipher. -* @alg_name: is the cra_name / name or cra_driver_name / driver name of the -* ablkcipher -* @type: specifies the type of the cipher -* @mask: specifies the mask for the cipher -* -* Return: true when the ablkcipher is known to the kernel crypto API; false -* otherwise -*/ -static inline int crypto_has_ablkcipher (const char *alg_name,u32 type, -u32 mask) -{ -return crypto_has_alg (alg_name,crypto_skcipher_type (type), -crypto_skcipher_mask (mask)); -} -static inline struct ablkcipher_tfm *crypto_ablkcipher_crt (struct crypto_ablkcipher *tfm) {
Signature · 1 line
2.39.2
Re: [PATCH 5.4 114/313] crypto: skcipher - remove crypto_has_ablkcipher()
Quoted 9 lines · Greg Kroah-Hartman
From: Eric Biggers <[email protected]>
[ Upstream commit
cec0cb8a28f9060367099beeafd0dbdb76fdfae2]
crypto_has_ablkcipher()has no users, and it does the same thing ascrypto_has_skcipher()anyway. So remove it. This also removes the last user ofcrypto_skcipher_type()andcrypto_skcipher_mask(), so remove those too.
Quoted 8 lines
Signed-off-by Eric Biggers <[email protected]>Signed-off-by Herbert Xu <[email protected]>Stable-dep-of:
efbc7764c444("crypto: marvell/cesa - Fix type mismatch warning")Signed-off-by Sasha Levin <[email protected]>--- Documentation/crypto/api-skcipher.rst | 2 +- include/linux/crypto.h | 31 --------------------------- 2 files changed, 1 insertion(+), 32 deletions(-)
How is this a Stable-dep-of "crypto: marvell/cesa - Fix type mismatch warning"?
I don't understand why this is being backported.
- Eric
Greg Kroah-Hartman
maintainerPATCH 115/313 crypto: marvell/cesa - Fix type mismatch warning
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit efbc7764c4446566edb76ca05e903b5905673d2e ]
Commit df8fc4e934c1 ("kbuild: Enable -fstrict-flex-arrays=3") uncovered a type mismatch in cesa 3des support that leads to a memcpy beyond the end of a structure:
In function 'fortify_memcpy_chk',
inlined from 'mv_cesa_des3_ede_setkey' at drivers/crypto/marvell/cesa/cipher.c:307:2:include/linux/fortify-string.h:583:25: error: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror=attribute-warning]
583 | __write_overflow_field(p_size_field, size);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~This is probably harmless as the actual data that is copied has the correct type, but clearly worth fixing nonetheless.
--- drivers/crypto/marvell/cipher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/marvell/cipher.c +1 -1
@@ -287,7 +287,7 @@ static int mv_cesa_des_setkey(struct crypto_skcipher *cipher, const u8 *key,static int mv_cesa_des3_ede_setkey (struct crypto_skcipher *cipher,const u8 *key,unsigned int len) { -struct mv_cesa_des_ctx *ctx =crypto_skcipher_ctx (cipher); +struct mv_cesa_des3_ctx *ctx =crypto_skcipher_ctx (cipher);int err; err =verify_skcipher_des3_key (cipher, key);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 116/313 modpost: fix off by one in is_executable_section()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 3a3f1e573a105328a2cca45a7cfbebabbf5e3192 ]
The > comparison should be >= to prevent an out of bounds array access.
--- scripts/mod/modpost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/mod/modpost.c +1 -1
@@ -1633,7 +1633,7 @@ static void default_mismatch_handler(const char *modname, struct elf_info *elf,static int is_executable_section (struct elf_info * elf,unsigned int section_index) { -if (section_index > elf->num_sections) +if (section_index >= elf->num_sections)fatal ("section_index is outside elf->num_sections!\n" );return ((elf->sechdrs[section_index].sh_flags &SHF_EXECINSTR ) ==SHF_EXECINSTR );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 117/313 ARC: define ASM_NL and __ALIGN(_STR) outside #ifdef __ASSEMBLY__ guard
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit 92e2921eeafdfca9acd9b83f07d2b7ca099bac24 ]
ASM_NL is useful not only in *.S files but also in .c files for using inline assembler in C code.
On ARC, however, ASM_NL is evaluated inconsistently. It is expanded to a backquote (`) in *.S files, but a semicolon (;) in *.c files because arch/arc/include/asm/linkage.h defines it inside #ifdef __ASSEMBLY__, so the definition for C code falls back to the default value defined in include/linux/linkage.h.
If ASM_NL is used in inline assembler in .c files, it will result in wrong assembly code because a semicolon is not an instruction separator, but the start of a comment for ARC.
Move ASM_NL (also __ALIGN and __ALIGN_STR) out of the #ifdef.
--- arch/arc/include/asm/linkage.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arc/include/asm/linkage.h +4 -4
@@ -8,6 +8,10 @@#include <asm/dwarf.h> +#define ASM_NL `/* use '`' to mark new line in macro */ +#define __ALIGN .align 4 +#define __ALIGN_STR __stringify(__ALIGN) +#ifdef __ASSEMBLY__ .macro ST2 e, o, off
@@ -28,10 +32,6 @@#endif .endm -#define ASM_NL `/* use '`' to mark new line in macro */ -#define __ALIGN .align 4 -#define __ALIGN_STR __stringify(__ALIGN) - /* annotation for data we want in DCCM - if enabled in .config */ .macro ARCFP_DATA nm #ifdef CONFIG_ARC_HAS_DCCM
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 118/313 NFSv4.1: freeze the session table upon receiving NFS4ERR_BADSESSION
In reply to Greg Kroah-HartmanFrom: Olga Kornievskaia <[email protected]>
[ Upstream commit c907e72f58ed979a24a9fdcadfbc447c51d5e509 ]
When the client received NFS4ERR_BADSESSION, it schedules recovery and start the state manager thread which in turn freezes the session table and does not allow for any new requests to use the no-longer valid session. However, it is possible that before the state manager thread runs, a new operation would use the released slot that received BADSESSION and was therefore not updated its sequence number. Such re-use of the slot can lead the application errors.
--- fs/nfs/nfs4proc.c | 1 + 1 file changed, 1 insertion(+)
fs/nfs/nfs4proc.c +1 -0
@@ -915,6 +915,7 @@ static int nfs41_sequence_process(struct rpc_task *task, out_noaction:return ret; session_recover: +set_bit (NFS4_SLOT_TBL_DRAINING , &session->fc_slot_table.slot_tbl_state);nfs4_schedule_session_recovery (session, status);dprintk ("%s ERROR: %d Reset session\n" , __func__, status);nfs41_sequence_free_slot (res);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 119/313 hwrng: st - Fix W=1 unused variable warning
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
[ Upstream commit ad23756271d5744a0a0ba556f8aaa70e358d5aa6 ]
This patch fixes an unused variable warning when this driver is built-in with CONFIG_OF=n.
Stable-dep-of: 501e197a02d4 ("hwrng: st - keep clock enabled while hwrng is registered")
--- drivers/char/hw_random/st-rng.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/char/hw_random/st-rng.c +2 -1
@@ -12,6 +12,7 @@#include <linux/delay.h> #include <linux/hw_random.h> #include <linux/io.h> +#include <linux/kernel.h> #include <linux/module.h> #include <linux/of.h> #include <linux/platform_device.h>
@@ -123,7 +124,7 @@ static int st_rng_remove(struct platform_device *pdev)return 0 ; } -static const struct of_device_id st_rng_match[] = { +static const struct of_device_id st_rng_match[]__maybe_unused = { { .compatible ="st,rng" }, {}, };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 120/313 hwrng: st - keep clock enabled while hwrng is registered
In reply to Greg Kroah-HartmanFrom: Martin Kaiser <[email protected]>
[ Upstream commit 501e197a02d4aef157f53ba3a0b9049c3e52fedc ]
The st-rng driver uses devres to register itself with the hwrng core, the driver will be unregistered from hwrng when its device goes out of scope. This happens after the driver's remove function is called.
However, st-rng's clock is disabled in the remove function. There's a short timeframe where st-rng is still registered with the hwrng core although its clock is disabled. I suppose the clock must be active to access the hardware and serve requests from the hwrng core.
Switch to devm_clk_get_enabled and let devres disable the clock and unregister the hwrng. This avoids the race condition.
--- drivers/char/hw_random/st-rng.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-)
drivers/char/hw_random/st-rng.c +1 -20
@@ -42,7 +42,6 @@struct st_rng_data {void __iomem *base; -struct clk *clk;struct hwrng ops; };
@@ -87,26 +86,18 @@ static int st_rng_probe(struct platform_device *pdev)if (IS_ERR (base))return PTR_ERR (base); - clk =devm_clk_get (&pdev->dev,NULL ); + clk =devm_clk_get_enabled (&pdev->dev,NULL );if (IS_ERR (clk))return PTR_ERR (clk); - ret =clk_prepare_enable (clk); -if (ret) -return ret; - ddata->ops.priv = (unsigned long )ddata; ddata->ops.read = st_rng_read; ddata->ops.name = pdev->name; ddata->base = base; - ddata->clk = clk; - -dev_set_drvdata (&pdev->dev, ddata); ret =devm_hwrng_register (&pdev->dev, &ddata->ops);if (ret) {dev_err (&pdev->dev,"Failed to register HW RNG\n" ); -clk_disable_unprepare (clk);return ret; }
@@ -115,15 +106,6 @@ static int st_rng_probe(struct platform_device *pdev)return 0 ; } -static int st_rng_remove (struct platform_device *pdev) -{ -struct st_rng_data *ddata =dev_get_drvdata (&pdev->dev); - -clk_disable_unprepare (ddata->clk); - -return 0 ; -} -static const struct of_device_id st_rng_match[]__maybe_unused = { { .compatible ="st,rng" }, {},
@@ -136,7 +118,6 @@ static struct platform_driver st_rng_driver = { .of_match_table = of_match_ptr(st_rng_match), }, .probe = st_rng_probe, - .remove = st_rng_remove };module_platform_driver (st_rng_driver);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 121/313 USB: serial: option: add LARA-R6 01B PIDs
In reply to Greg Kroah-HartmanFrom: Davide Tronchin <[email protected]>
commit ffa5f7a3bf28c1306eef85d4056539c2d4b8eb09 upstream.
The new LARA-R6 product variant identified by the "01B" string can be configured (by AT interface) in three different USB modes:
* Default mode (Vendor ID: 0x1546 Product ID: 0x1311) with 4 serial interfaces
* RmNet mode (Vendor ID: 0x1546 Product ID: 0x1312) with 4 serial interfaces and 1 RmNet virtual network interface
* CDC-ECM mode (Vendor ID: 0x1546 Product ID: 0x1313) with 4 serial interface and 1 CDC-ECM virtual network interface
The first 4 interfaces of all the 3 USB configurations (default, RmNet, CDC-ECM) are the same.
In default mode LARA-R6 01B exposes the following interfaces:
If 0: Diagnostic
If 1: AT parser
If 2: AT parser
If 3: AT parser/alternative functions
In RmNet mode LARA-R6 01B exposes the following interfaces:
If 0: Diagnostic
If 1: AT parser
If 2: AT parser
If 3: AT parser/alternative functions
If 4: RMNET interface
In CDC-ECM mode LARA-R6 01B exposes the following interfaces:
If 0: Diagnostic
If 1: AT parser
If 2: AT parser
If 3: AT parser/alternative functions
If 4: CDC-ECM interface
--- drivers/usb/serial/option.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/serial/option.c +4 -0
@@ -1151,6 +1151,10 @@ static const struct usb_device_id option { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x90fa), .driver_info = RSVD(3) },/* u-blox products */ + { USB_DEVICE(UBLOX_VENDOR_ID, 0x1311) }, /* u-blox LARA-R6 01B */ + { USB_DEVICE(UBLOX_VENDOR_ID, 0x1312), /* u-blox LARA-R6 01B (RMNET) */ + .driver_info = RSVD(4) }, + { USB_DEVICE_INTERFACE_CLASS(UBLOX_VENDOR_ID, 0x1313, 0xff) }, /* u-blox LARA-R6 01B (ECM) */ { USB_DEVICE(UBLOX_VENDOR_ID, 0x1341) }, /* u-blox LARA-L6 */ { USB_DEVICE(UBLOX_VENDOR_ID, 0x1342), /* u-blox LARA-L6 (RMNET) */ .driver_info = RSVD(4) },
Greg Kroah-Hartman
maintainerPATCH 122/313 usb: dwc3: gadget: Propagate core init errors to UDC during pullup
In reply to Greg Kroah-HartmanFrom: Krishna Kurapati <[email protected]>
commit c0aabed9cabe057309779a9e26fe86a113d24dad upstream.
In scenarios where pullup relies on resume (get sync) to initialize the controller and set the run stop bit, then core_init is followed by gadget_resume which will eventually set run stop bit.
But in cases where the core_init fails, the return value is not sent back to udc appropriately. So according to UDC the controller has started but in reality we never set the run stop bit.
On systems like Android, there are uevents sent to HAL depending on whether the configfs_bind / configfs_disconnect were invoked. In the above mentioned scnenario, if the core init fails, the run stop won't be set and the cable plug-out won't result in generation of any disconnect event and userspace would never get any uevent regarding cable plug out and we never call pullup(0) again. Furthermore none of the next Plug-In/Plug-Out's would be known to configfs.
Return back the appropriate result to UDC to let the userspace/ configfs know that the pullup failed so they can take appropriate action.
Message-ID: <[email protected]>
--- drivers/usb/dwc3/gadget.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/dwc3/gadget.c +3 -1
@@ -2077,7 +2077,9 @@ static int dwc3_gadget_pullup(struct usb ret =pm_runtime_get_sync (dwc->dev);if (!ret || ret <0 ) {pm_runtime_put (dwc->dev); -return 0 ; +if (ret <0 ) +pm_runtime_set_suspended (dwc->dev); +return ret; }if (dwc->pullups_connected == is_on) {
Greg Kroah-Hartman
maintainerPATCH 123/313 block: fix signed int overflow in Amiga partition support
In reply to Greg Kroah-HartmanFrom: Michael Schmitz <[email protected]>
commit fc3d092c6bb48d5865fec15ed5b333c12f36288c upstream.
The Amiga partition parser module uses signed int for partition sector address and count, which will overflow for disks larger than 1 TB.
Use sector_t as type for sector address and size to allow using disks up to 2 TB without LBD support, and disks larger than 2 TB with LBD.
This bug was reported originally in 2012, and the fix was created by the RDB author, Joanne Dow <[email protected]>. A patch had been discussed and reviewed on linux-m68k at that time but never officially submitted. This patch differs from Joanne's patch only in its use of sector_t instead of unsigned int. No checking for overflows is done (see patch 3 of this series for that).
Message-ID: <[email protected]>
--- block/partitions/amiga.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
block/partitions/amiga.c +5 -4
@@ -32,7 +32,8 @@ int amiga_partition(struct parsed_partitunsigned char *data;struct RigidDiskBlock *rdb;struct PartitionBlock *pb; -int start_sect, nr_sects, blk, part, res =0 ; +sector_t start_sect, nr_sects; +int blk, part, res =0 ;int blksize =1 ;/* Multiplier for disk block size */ int slot =1 ;char b[BDEVNAME_SIZE ];
@@ -100,14 +101,14 @@ int amiga_partition(struct parsed_partit/* Tell Kernel about it */ - nr_sects = (be32_to_cpu (pb->pb_Environment[10 ]) +1 - -be32_to_cpu (pb->pb_Environment[9 ])) * + nr_sects = ((sector_t )be32_to_cpu (pb->pb_Environment[10 ]) +1 - +be32_to_cpu (pb->pb_Environment[9 ])) *be32_to_cpu (pb->pb_Environment[3 ]) *be32_to_cpu (pb->pb_Environment[5 ]) * blksize;if (!nr_sects)continue ; - start_sect =be32_to_cpu (pb->pb_Environment[9 ]) * + start_sect = (sector_t )be32_to_cpu (pb->pb_Environment[9 ]) *be32_to_cpu (pb->pb_Environment[3 ]) *be32_to_cpu (pb->pb_Environment[5 ]) * blksize;
Greg Kroah-Hartman
maintainerPATCH 124/313 block: change all __u32 annotations to __be32 in affs_hardblocks.h
In reply to Greg Kroah-HartmanFrom: Michael Schmitz <[email protected]>
commit 95a55437dc49fb3342c82e61f5472a71c63d9ed0 upstream.
The Amiga partition parser module uses signed int for partition sector address and count, which will overflow for disks larger than 1 TB.
Use u64 as type for sector address and size to allow using disks up to 2 TB without LBD support, and disks larger than 2 TB with LBD. The RBD format allows to specify disk sizes up to 2^128 bytes (though native OS limitations reduce this somewhat, to max 2^68 bytes), so check for u64 overflow carefully to protect against overflowing sector_t.
This bug was reported originally in 2012, and the fix was created by the RDB author, Joanne Dow <[email protected]>. A patch had been discussed and reviewed on linux-m68k at that time but never officially submitted (now resubmitted as patch 1 of this series).
Patch 3 (this series) adds additional error checking and warning messages. One of the error checks now makes use of the previously unused rdb_CylBlocks field, which causes a 'sparse' warning (cast to restricted __be32).
Annotate all 32 bit fields in affs_hardblocks.h as __be32, as the on-disk format of RDB and partition blocks is always big endian.
Message-ID: <[email protected]>
--- include/uapi/linux/affs_hardblocks.h | 68 +++++++++++++++++------------------ 1 file changed, 34 insertions(+), 34 deletions(-)
include/uapi/linux/affs_hardblocks.h +34 -34
@@ -7,42 +7,42 @@/* Just the needed definitions for the RDB of an Amiga HD. */ struct RigidDiskBlock { -__u32 rdb_ID; +__be32 rdb_ID;__be32 rdb_SummedLongs; -__s32 rdb_ChkSum; -__u32 rdb_HostID; +__be32 rdb_ChkSum; +__be32 rdb_HostID;__be32 rdb_BlockBytes; -__u32 rdb_Flags; -__u32 rdb_BadBlockList; +__be32 rdb_Flags; +__be32 rdb_BadBlockList;__be32 rdb_PartitionList; -__u32 rdb_FileSysHeaderList; -__u32 rdb_DriveInit; -__u32 rdb_Reserved1[6 ]; -__u32 rdb_Cylinders; -__u32 rdb_Sectors; -__u32 rdb_Heads; -__u32 rdb_Interleave; -__u32 rdb_Park; -__u32 rdb_Reserved2[3 ]; -__u32 rdb_WritePreComp; -__u32 rdb_ReducedWrite; -__u32 rdb_StepRate; -__u32 rdb_Reserved3[5 ]; -__u32 rdb_RDBBlocksLo; -__u32 rdb_RDBBlocksHi; -__u32 rdb_LoCylinder; -__u32 rdb_HiCylinder; -__u32 rdb_CylBlocks; -__u32 rdb_AutoParkSeconds; -__u32 rdb_HighRDSKBlock; -__u32 rdb_Reserved4; +__be32 rdb_FileSysHeaderList; +__be32 rdb_DriveInit; +__be32 rdb_Reserved1[6 ]; +__be32 rdb_Cylinders; +__be32 rdb_Sectors; +__be32 rdb_Heads; +__be32 rdb_Interleave; +__be32 rdb_Park; +__be32 rdb_Reserved2[3 ]; +__be32 rdb_WritePreComp; +__be32 rdb_ReducedWrite; +__be32 rdb_StepRate; +__be32 rdb_Reserved3[5 ]; +__be32 rdb_RDBBlocksLo; +__be32 rdb_RDBBlocksHi; +__be32 rdb_LoCylinder; +__be32 rdb_HiCylinder; +__be32 rdb_CylBlocks; +__be32 rdb_AutoParkSeconds; +__be32 rdb_HighRDSKBlock; +__be32 rdb_Reserved4;char rdb_DiskVendor[8 ];char rdb_DiskProduct[16 ];char rdb_DiskRevision[4 ];char rdb_ControllerVendor[8 ];char rdb_ControllerProduct[16 ];char rdb_ControllerRevision[4 ]; -__u32 rdb_Reserved5[10 ]; +__be32 rdb_Reserved5[10 ]; };#define IDNAME_RIGIDDISK 0x5244534B/* "RDSK" */
@@ -50,16 +50,16 @@ struct RigidDiskBlock {struct PartitionBlock {__be32 pb_ID;__be32 pb_SummedLongs; -__s32 pb_ChkSum; -__u32 pb_HostID; +__be32 pb_ChkSum; +__be32 pb_HostID;__be32 pb_Next; -__u32 pb_Flags; -__u32 pb_Reserved1[2 ]; -__u32 pb_DevFlags; +__be32 pb_Flags; +__be32 pb_Reserved1[2 ]; +__be32 pb_DevFlags;__u8 pb_DriveName[32 ]; -__u32 pb_Reserved2[15 ]; +__be32 pb_Reserved2[15 ];__be32 pb_Environment[17 ]; -__u32 pb_EReserved[15 ]; +__be32 pb_EReserved[15 ]; };#define IDNAME_PARTITION 0x50415254/* "PART" */
Greg Kroah-Hartman
maintainerPATCH 125/313 w1: fix loop in w1_fini()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 83f3fcf96fcc7e5405b37d9424c7ef26bfa203f8 ]
The __w1_remove_master_device() function calls:
list_del(&dev->w1_master_entry);
So presumably this can cause an endless loop.
--- drivers/w1/w1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/w1/w1.c +2 -2
@@ -1228,10 +1228,10 @@ static int __init w1_init(void) static void __exit w1_fini(void) { -struct w1_master *dev; +struct w1_master *dev, *n;/* Set netlink removal messages and some cleanup */ -list_for_each_entry (dev, &w1_masters, w1_master_entry) +list_for_each_entry_safe (dev, n, &w1_masters, w1_master_entry)__w1_remove_master_device (dev);w1_fini_netlink ();
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 126/313 sh: j2: Use ioremap() to translate device tree address into kernel memory
In reply to Greg Kroah-HartmanFrom: John Paul Adrian Glaubitz <[email protected]>
[ Upstream commit bc9d1f0cecd2407cfb2364a7d4be2f52d1d46a9d ]
Addresses the following warning when building j2_defconfig:
arch/sh/kernel/cpu/sh2/probe.c: In function 'scan_cache':arch/sh/kernel/cpu/sh2/probe.c:24:16: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
24 | j2_ccr_base = (u32 __iomem *)of_flat_dt_translate_address(node);
|--- arch/sh/kernel/cpu/sh2/probe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/sh/kernel/cpu/sh2/probe.c +1 -1
@@ -21,7 +21,7 @@ static int __init scan_cache(unsigned long node, const char *uname,if (!of_flat_dt_is_compatible (node,"jcore,cache" ))return 0 ; - j2_ccr_base = (u32 __iomem *)of_flat_dt_translate_address (node); + j2_ccr_base =ioremap (of_flat_dt_translate_address (node),4 );return 1 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 127/313 media: usb: Check az6007_read() return value
In reply to Greg Kroah-HartmanFrom: Daniil Dulov <[email protected]>
[ Upstream commit fdaca63186f59fc664b346c45b76576624b48e57 ]
If az6007_read() returns error, there is no sence to continue.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/media/usb/dvb-usb-v2/az6007.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/usb/dvb-usb-v2/az6007.c +2 -1
@@ -202,7 +202,8 @@ static int az6007_rc_query(struct dvb_usb_device *d)unsigned code;enum rc_proto proto; -az6007_read (d,AZ6007_READ_IR ,0 ,0 , st->data,10 ); +if (az6007_read (d,AZ6007_READ_IR ,0 ,0 , st->data,10 ) <0 ) +return -EIO ;if (st->data[1 ] ==0x44 )return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 128/313 media: videodev2.h: Fix struct v4l2_input tuner index comment
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit 26ae58f65e64fa7ba61d64bae752e59e08380c6a ]
VIDIOC_ENUMINPUT documentation describes the tuner field of struct v4l2_input as index:
Documentation/userspace-api/media/v4l/vidioc-enuminput.rst "
* - __u32
- ``tuner``
- Capture devices can have zero or more tuners (RF demodulators). When the ``type`` is set to ``V4L2_INPUT_TYPE_TUNER`` this is an RF connector and this field identifies the tuner. It corresponds to struct :c:type:v4l2_tuner field ``index``. For details on tuners see :ref:tuner.
"
Drivers I could find also use the 'tuner' field as an index, e.g.:drivers/media/pci/bt8xx/bttv-driver.c bttv_enum_input() drivers/media/usb/go7007/go7007-v4l2.c vidioc_enum_input()
However, the UAPI comment claims this field is 'enum v4l2_tuner_type':include/uapi/linux/videodev2.h
This field being 'enum v4l2_tuner_type' is unlikely as it seems to be never used that way in drivers, and documentation confirms it. It seem this comment got in accidentally in the commit which this patch fixes. Fix the UAPI comment to stop confusion.
This was pointed out by Dmitry while reviewing VIDIOC_ENUMINPUT support for strace.
--- include/uapi/linux/videodev2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/videodev2.h +1 -1
@@ -1588,7 +1588,7 @@ struct v4l2_input {__u8 name[32 ];/* Label */ __u32 type;/* Type of input */ __u32 audioset;/* Associated audios (bitfield) */ -__u32 tuner;/* enum v4l2_tuner_type */ +__u32 tuner;/* Tuner index */ v4l2_std_id std;__u32 status;__u32 capabilities;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 129/313 media: usb: siano: Fix warning due to null work_func_t function pointer
In reply to Greg Kroah-HartmanFrom: Duoming Zhou <[email protected]>
[ Upstream commit 6f489a966fbeb0da63d45c2c66a8957eab604bf6 ]
The previous commit ebad8e731c1c ("media: usb: siano: Fix use after free bugs caused by do_submit_urb") adds cancel_work_sync() in smsusb_stop_streaming(). But smsusb_stop_streaming() may be called, even if the work_struct surb->wq has not been initialized. As a result, the warning will occur. One of the processes that could lead to warning is shown below:
smsusb_probe()
smsusb_init_device()
if (!dev->in_ep || !dev->out_ep || align < 0) {
smsusb_term_device(intf);
smsusb_stop_streaming()
cancel_work_sync(&dev->surbs[i].wq);
__cancel_work_timer()
__flush_work()
if (WARN_ON(!work->func)) // work->func is nullThe log reported by syzbot is shown below:
WARNING: CPU: 0 PID: 897 at kernel/workqueue.c:3066 __flush_work+0x798/0xa80 kernel/workqueue.c:3063 Modules linked in: CPU: 0 PID: 897 Comm: kworker/0:2 Not tainted 6.2.0-rc1-syzkaller #0 RIP: 0010:__flush_work+0x798/0xa80 kernel/workqueue.c:3066 ... RSP: 0018:ffffc9000464ebf8 EFLAGS: 00010246 RAX: 1ffff11002dbb420 RBX: 0000000000000021 RCX: 1ffffffff204fa4e RDX: dffffc0000000000 RSI: 0000000000000001 RDI: ffff888016dda0e8 RBP: ffffc9000464ed98 R08: 0000000000000001 R09: ffffffff90253b2f R10: 0000000000000001 R11: 0000000000000000 R12: ffff888016dda0e8 R13: ffff888016dda0e8 R14: ffff888016dda100 R15: 0000000000000001 FS: 0000000000000000(0000) GS:ffff8880b9a00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007ffd4331efe8 CR3: 000000000b48e000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> __cancel_work_timer+0x315/0x460 kernel/workqueue.c:3160 smsusb_stop_streaming drivers/media/usb/siano/smsusb.c:182 [inline] smsusb_term_device+0xda/0x2d0 drivers/media/usb/siano/smsusb.c:344 smsusb_init_device+0x400/0x9ce drivers/media/usb/siano/smsusb.c:419 smsusb_probe+0xbbd/0xc55 drivers/media/usb/siano/smsusb.c:567
...
This patch adds check before cancel_work_sync(). If surb->wq has not been initialized, the cancel_work_sync() will not be executed.
--- drivers/media/usb/siano/smsusb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/usb/siano/smsusb.c +2 -1
@@ -179,7 +179,8 @@ static void smsusb_stop_streaming(struct smsusb_device_t *dev)for (i =0 ; i <MAX_URBS ; i++) {usb_kill_urb (&dev->surbs[i].urb); -cancel_work_sync (&dev->surbs[i].wq); +if (dev->surbs[i].wq.func) +cancel_work_sync (&dev->surbs[i].wq);if (dev->surbs[i].cb) {smscore_putbuffer (dev->coredev, dev->surbs[i].cb);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 130/313 usb: dwc3: qcom: Fix potential memory leak
In reply to Greg Kroah-HartmanFrom: Vladislav Efanov <[email protected]>
[ Upstream commit 097fb3ee710d4de83b8d4f5589e8ee13e0f0541e ]
Function dwc3_qcom_probe() allocates memory for resource structure which is pointed by parent_res pointer. This memory is not freed. This leads to memory leak. Use stack memory to prevent memory leak.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/usb/dwc3/dwc3-qcom.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/usb/dwc3/dwc3-qcom.c +3 -3
@@ -574,6 +574,7 @@ static int dwc3_qcom_probe(struct platform_device *pdev)struct device *dev = &pdev->dev;struct dwc3_qcom *qcom;struct resource *res, *parent_res =NULL ; +struct resource local_res;int ret, i;bool ignore_pipe_clk;
@@ -624,9 +625,8 @@ static int dwc3_qcom_probe(struct platform_device *pdev)if (np) { parent_res = res; }else { - parent_res =kmemdup (res,sizeof (struct resource ),GFP_KERNEL ); -if (!parent_res) -return -ENOMEM ; +memcpy (&local_res, res,sizeof (struct resource )); + parent_res = &local_res; parent_res->start = res->start + qcom->acpi_pdata->qscratch_base_offset;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 131/313 extcon: Fix kernel doc of property fields to avoid warnings
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 7e77e0b7a9f4cdf91cb0950749b40c840ea63efc ]
Kernel documentation has to be synchronized with a code, otherwise the validator is not happy:
Function parameter or member 'usb_propval' not described in 'extcon_cable' Function parameter or member 'chg_propval' not described in 'extcon_cable' Function parameter or member 'jack_propval' not described in 'extcon_cable' Function parameter or member 'disp_propval' not described in 'extcon_cable'
Describe the fields added in the past.
--- drivers/extcon/extcon.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/extcon/extcon.c +4 -0
@@ -196,6 +196,10 @@ static const struct __extcon_info {* @attr_name: "name" sysfs entry * @attr_state: "state" sysfs entry * @attrs: the array pointing to attr_name and attr_state for attr_g +* @usb_propval: the array of USB connector properties +* @chg_propval: the array of charger connector properties +* @jack_propval: the array of jack connector properties +* @disp_propval: the array of display connector properties */ struct extcon_cable {struct extcon_dev *edev;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 132/313 extcon: Fix kernel doc of property capability fields to avoid warnings
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 73346b9965ebda2feb7fef8629e9b28baee820e3 ]
Kernel documentation has to be synchronized with a code, otherwise the validator is not happy:
Function parameter or member 'usb_bits' not described in 'extcon_cable' Function parameter or member 'chg_bits' not described in 'extcon_cable' Function parameter or member 'jack_bits' not described in 'extcon_cable' Function parameter or member 'disp_bits' not described in 'extcon_cable'
Describe the fields added in the past.
--- drivers/extcon/extcon.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/extcon/extcon.c +4 -0
@@ -200,6 +200,10 @@ static const struct __extcon_info {* @chg_propval: the array of charger connector properties * @jack_propval: the array of jack connector properties * @disp_propval: the array of display connector properties +* @usb_bits: the bit array of the USB connector property capabilities +* @chg_bits: the bit array of the charger connector property capabilities +* @jack_bits: the bit array of the jack connector property capabilities +* @disp_bits: the bit array of the display connector property capabilities */ struct extcon_cable {struct extcon_dev *edev;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 133/313 usb: phy: phy-tahvo: fix memory leak in tahvo_usb_probe()
In reply to Greg Kroah-HartmanFrom: Li Yang <[email protected]>
[ Upstream commit 342161c11403ea00e9febc16baab1d883d589d04 ]
Smatch reports:drivers/usb/phy/phy-tahvo.c: tahvo_usb_probe()
warn: missing unwind goto?
After geting irq, if ret < 0, it will return without error handling to free memory.
Just add error handling to fix this problem.
--- drivers/usb/phy/phy-tahvo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/phy/phy-tahvo.c +1 -1
@@ -395,7 +395,7 @@ static int tahvo_usb_probe(struct platform_device *pdev) tu->irq = ret =platform_get_irq (pdev,0 );if (ret <0 ) -return ret; + goto err_remove_phy; ret =request_threaded_irq (tu->irq,NULL , tahvo_usb_vbus_interrupt,IRQF_ONESHOT ,"tahvo-vbus" , tu);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 134/313 usb: hide unused usbfs_notify_suspend/resume functions
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 8e6bd945e6dde64fbc60ec3fe252164493a8d3a2 ]
The declaration is in an #ifdef, which causes warnings when building with 'make W=1' and without CONFIG_PM:
drivers/usb/core/devio.c:742:6: error: no previous prototype for 'usbfs_notify_suspend' drivers/usb/core/devio.c:747:6: error: no previous prototype for 'usbfs_notify_resume'
Use the same #ifdef check around the function definitions to avoid the warnings and slightly shrink the USB core.
--- drivers/usb/core/devio.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/core/devio.c +2 -0
@@ -734,6 +734,7 @@ static int driver_resume(struct usb_interface *intf)return 0 ; } +#ifdef CONFIG_PM /* The following routines apply to the entire device, not interfaces */ void usbfs_notify_suspend (struct usb_device *udev) {
@@ -752,6 +753,7 @@ void usbfs_notify_resume(struct usb_device *udev) }mutex_unlock (&usbfs_mutex); } +#endif struct usb_driver usbfs_driver = { .name ="usbfs" ,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 135/313 mfd: rt5033: Drop rt5033-battery sub-device
In reply to Greg Kroah-HartmanFrom: Stephan Gerhold <[email protected]>
[ Upstream commit 43db1344e0f8c1eb687a1d6cd5b0de3009ab66cb ]
The fuel gauge in the RT5033 PMIC (rt5033-battery) has its own I2C bus and interrupt lines. Therefore, it is not part of the MFD device and needs to be specified separately in the device tree.
--- drivers/mfd/rt5033.c | 3 --- 1 file changed, 3 deletions(-)
drivers/mfd/rt5033.c +0 -3
@@ -41,9 +41,6 @@ static const struct mfd_cell rt5033_devs[] = { { .name = "rt5033-charger", .of_compatible = "richtek,rt5033-charger", - }, { - .name = "rt5033-battery", - .of_compatible = "richtek,rt5033-battery", }, { .name = "rt5033-led", .of_compatible = "richtek,rt5033-led",
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 136/313 KVM: s390: fix KVM_S390_GET_CMMA_BITS for GFNs in memslot holes
In reply to Greg Kroah-HartmanFrom: Nico Boehr <[email protected]>
[ Upstream commit 285cff4c0454340a4dc53f46e67f2cb1c293bd74 ]
The KVM_S390_GET_CMMA_BITS ioctl may return incorrect values when userspace specifies a start_gfn outside of memslots.
This can occur when a VM has multiple memslots with a hole in between:
+-----+----------+--------+--------+
| ... | Slot N-1 | <hole> | Slot N |
+-----+----------+--------+--------+
^ ^ ^ ^
| | | |
GFN A A+B | |
A+B+C |
A+B+C+DWhen userspace specifies a GFN in [A+B, A+B+C), it would expect to get the CMMA values of the first dirty page in Slot N. However, userspace may get a start_gfn of A+B+C+D with a count of 0, hence completely skipping over any dirty pages in slot N.
The error is in kvm_s390_next_dirty_cmma(), which assumes gfn_to_memslot_approx() will return the memslot _below_ the specified GFN when the specified GFN lies outside a memslot. In reality it may return either the memslot below or above the specified GFN.
When a memslot above the specified GFN is returned this happens:
- ofs is calculated, but since the memslot's base_gfn is larger than the specified cur_gfn, ofs will underflow to a huge number.
- ofs is passed to find_next_bit(). Since ofs will exceed the memslot's number of pages, the number of pages in the memslot is returned, completely skipping over all bits in the memslot userspace would be interested in.
Fix this by resetting ofs to zero when a memslot _above_ cur_gfn is returned (cur_gfn < ms->base_gfn).
Message-Id: <[email protected]>
--- arch/s390/kvm/kvm-s390.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/s390/kvm/kvm-s390.c +4 -0
@@ -1982,6 +1982,10 @@ static unsigned long kvm_s390_next_dirty_cmma(struct kvm_memslots *slots, ms = slots->memslots + slotidx; ofs =0 ; } + +if (cur_gfn < ms->base_gfn) + ofs =0 ; + ofs =find_next_bit (kvm_second_dirty_bitmap (ms), ms->npages, ofs);while ((slotidx >0 ) && (ofs >= ms->npages)) { slotidx--;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 137/313 usb: dwc3: qcom: Release the correct resources in dwc3_qcom_remove()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 8fd95da2cfb5046c4bb5a3cdc9eb7963ba8b10dd ]
In the probe, some resources are allocated with dwc3_qcom_of_register_core() or dwc3_qcom_acpi_register_core(). The corresponding resources are already coorectly freed in the error handling path of the probe, but not in the remove function.
Fix it.
Message-ID: <c0215a84cdf18fb3514c81842783ec53cf149deb.1685891059.git.christophe.jaillet@wanadoo.fr>
--- drivers/usb/dwc3/dwc3-qcom.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/usb/dwc3/dwc3-qcom.c +5 -1
@@ -704,10 +704,14 @@ reset_assert:static int dwc3_qcom_remove (struct platform_device *pdev) {struct dwc3_qcom *qcom =platform_get_drvdata (pdev); +struct device_node *np = pdev->dev.of_node;struct device *dev = &pdev->dev;int i; -of_platform_depopulate (dev); +if (np) +of_platform_depopulate (&pdev->dev); +else +platform_device_put (pdev);for (i = qcom->num_clocks -1 ; i >=0 ; i--) {clk_disable_unprepare (qcom->clks[i]);
Greg Kroah-Hartman
maintainerPATCH 138/313 mfd: intel-lpss: Add missing check for platform_get_resource
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit d918e0d5824495a75d00b879118b098fcab36fdb ]
Add the missing check for platform_get_resource and return error if it fails.
--- drivers/mfd/intel-lpss-acpi.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/mfd/intel-lpss-acpi.c +3 -0
@@ -114,6 +114,9 @@ static int intel_lpss_acpi_probe(struct platform_device *pdev)return -ENOMEM ; info->mem =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!info->mem) +return -ENODEV ; + info->irq =platform_get_irq (pdev,0 ); ret =intel_lpss_probe (&pdev->dev, info);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 139/313 serial: 8250_omap: Use force_suspend and resume for system suspend
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit 20a41a62618df85f3a2981008edec5cadd785e0a ]
We should not rely on autosuspend timeout for system suspend. Instead, let's use force_suspend and force_resume functions. Otherwise the serial port controller device may not be idled on suspend.
As we are doing a register write on suspend to configure the serial port, we still need to runtime PM resume the port on suspend.
While at it, let's switch to pm_runtime_resume_and_get() and check for errors returned. And let's add the missing line break before return to the suspend function while at it.
Message-ID: <[email protected]>
--- drivers/tty/serial/8250/8250_omap.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
drivers/tty/serial/8250/8250_omap.c +15 -5
@@ -1314,25 +1314,35 @@ static int omap8250_suspend(struct device *dev) {struct omap8250_priv *priv =dev_get_drvdata (dev);struct uart_8250_port *up =serial8250_get_port (priv->line); +int err;serial8250_suspend_port (priv->line); -pm_runtime_get_sync (dev); + err =pm_runtime_resume_and_get (dev); +if (err) +return err;if (!device_may_wakeup (dev)) priv->wer =0 ;serial_out (up,UART_OMAP_WER , priv->wer); -pm_runtime_mark_last_busy (dev); -pm_runtime_put_autosuspend (dev); - + err =pm_runtime_force_suspend (dev);flush_work (&priv->qos_work); -return 0 ; + +return err; }static int omap8250_resume (struct device *dev) {struct omap8250_priv *priv =dev_get_drvdata (dev); +int err; + err =pm_runtime_force_resume (dev); +if (err) +return err;serial8250_resume_port (priv->line); +/* Paired with pm_runtime_resume_and_get() in omap8250_suspend() */ +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev); +return 0 ; }#else
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 140/313 mfd: stmfx: Fix error path in stmfx_chip_init
In reply to Greg Kroah-HartmanFrom: Amelie Delaunay <[email protected]>
[ Upstream commit f592cf624531286f8b52e40dcfc157a5a7fb115c ]
In error path, disable vdd regulator if it exists, but don't overload ret. Because if regulator_disable() is successful, stmfx_chip_init will exit successfully while chip init failed.
--- drivers/mfd/stmfx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/stmfx.c +1 -1
@@ -389,7 +389,7 @@ static int stmfx_chip_init(struct i2c_client *client) err:if (stmfx->vdd) -return regulator_disable (stmfx->vdd); +regulator_disable (stmfx->vdd);return ret; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 141/313 KVM: s390: vsie: fix the length of APCB bitmap
In reply to Greg Kroah-HartmanFrom: Pierre Morel <[email protected]>
[ Upstream commit 246be7d2720ea9a795b576067ecc5e5c7a1e7848 ]
bit_and() uses the count of bits as the woking length. Fix the previous implementation and effectively use the right bitmap size.
--- arch/s390/kvm/vsie.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/s390/kvm/vsie.c +4 -2
@@ -168,7 +168,8 @@ static int setup_apcb00(struct kvm_vcpu *vcpu, unsigned long *apcb_s, sizeof(struct kvm_s390_apcb0)))return -EFAULT ; -bitmap_and (apcb_s, apcb_s, apcb_h,sizeof (struct kvm_s390_apcb0 )); +bitmap_and (apcb_s, apcb_s, apcb_h, +BITS_PER_BYTE *sizeof (struct kvm_s390_apcb0 ));return 0 ; }
@@ -190,7 +191,8 @@ static int setup_apcb11(struct kvm_vcpu *vcpu, unsigned long *apcb_s, sizeof(struct kvm_s390_apcb1)))return -EFAULT ; -bitmap_and (apcb_s, apcb_s, apcb_h,sizeof (struct kvm_s390_apcb1 )); +bitmap_and (apcb_s, apcb_s, apcb_h, +BITS_PER_BYTE *sizeof (struct kvm_s390_apcb1 ));return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 142/313 mfd: stmpe: Only disable the regulators if they are enabled
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 104d32bd81f620bb9f67fbf7d1159c414e89f05f ]
In stmpe_probe(), if some regulator_enable() calls fail, probing continues and there is only a dev_warn().
So, if stmpe_probe() is called the regulator may not be enabled. It is cleaner to test it before calling regulator_disable() in the remove function.
--- drivers/mfd/stmpe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mfd/stmpe.c +2 -2
@@ -1494,9 +1494,9 @@ int stmpe_probe(struct stmpe_client_info *ci, enum stmpe_partnum partnum)int stmpe_remove (struct stmpe *stmpe) { -if (!IS_ERR (stmpe->vio)) +if (!IS_ERR (stmpe->vio) &®ulator_is_enabled (stmpe->vio))regulator_disable (stmpe->vio); -if (!IS_ERR (stmpe->vcc)) +if (!IS_ERR (stmpe->vcc) &®ulator_is_enabled (stmpe->vcc))regulator_disable (stmpe->vcc);__stmpe_disable (stmpe,STMPE_BLOCK_ADC );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 143/313 pwm: imx-tpm: force real_period to be zero in suspend
In reply to Greg Kroah-HartmanFrom: Fancy Fang <[email protected]>
[ Upstream commit 661dfb7f46298e53f6c3deaa772fa527aae86193 ]
During suspend, all the tpm registers will lose values. So the 'real_period' value of struct 'imx_tpm_pwm_chip' should be forced to be zero to force the period update code can be executed after system resume back.
--- drivers/pwm/pwm-imx-tpm.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/pwm/pwm-imx-tpm.c +7 -0
@@ -405,6 +405,13 @@ static int __maybe_unused pwm_imx_tpm_suspend(struct device *dev)if (tpm->enable_count >0 )return -EBUSY ; +/* +* Force 'real_period' to be zero to force period update code +* can be executed after system resume back, since suspend causes +* the period related registers to become their reset values. +*/ + tpm->real_period =0 ; +clk_disable_unprepare (tpm->clk);return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 144/313 pwm: sysfs: Do not apply state to already disabled PWMs
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit 38ba83598633373f47951384cfc389181c8d1bed ]
If the PWM is exported but not enabled, do not call pwm_class_apply_state(). First of all, in this case, period may still be unconfigured and this would make pwm_class_apply_state() return -EINVAL, and then suspend would fail. Second, it makes little sense to apply state onto PWM that is not enabled before suspend.
Failing case:
"
$ echo 1 > /sys/class/pwm/pwmchip4/export $ echo mem > /sys/power/state ... pwm pwmchip4: PM: dpm_run_callback(): pwm_class_suspend+0x1/0xa8 returns -22 pwm pwmchip4: PM: failed to suspend: error -22 PM: Some devices failed to suspend, or early wake event detected "
Working case:
"
$ echo 1 > /sys/class/pwm/pwmchip4/export $ echo 100 > /sys/class/pwm/pwmchip4/pwm1/period $ echo 10 > /sys/class/pwm/pwmchip4/pwm1/duty_cycle $ echo mem > /sys/power/state ... "
Do not call pwm_class_apply_state() in case the PWM is disabled to fix this issue.
--- drivers/pwm/sysfs.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/pwm/sysfs.c +17 -0
@@ -424,6 +424,13 @@ static int pwm_class_resume_npwm(struct device *parent, unsigned int npwm)if (!export)continue ; +/* If pwmchip was not enabled before suspend, do nothing. */ +if (!export->suspend.enabled) { +/* release lock taken in pwm_class_get_state */ +mutex_unlock (&export->lock); +continue ; + } + state.enabled = export->suspend.enabled; ret =pwm_class_apply_state (export, pwm, &state);if (ret <0 )
@@ -448,7 +455,17 @@ static int __maybe_unused pwm_class_suspend(struct device *parent)if (!export)continue ; +/* +* If pwmchip was not enabled before suspend, save +* state for resume time and do nothing else. +*/ export->suspend = state; +if (!state.enabled) { +/* release lock taken in pwm_class_get_state */ +mutex_unlock (&export->lock); +continue ; + } + state.enabled = false; ret =pwm_class_apply_state (export, pwm, &state);if (ret <0 ) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 145/313 rtc: st-lpc: Release some resources in st_rtc_probe() in case of error
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 06c6e1b01d9261f03629cefd1f3553503291e6cf ]
If an error occurs after clk_get(), the corresponding resources should be released.
Use devm_clk_get() to fix it.
--- drivers/rtc/rtc-st-lpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/rtc-st-lpc.c +1 -1
@@ -231,7 +231,7 @@ static int st_rtc_probe(struct platform_device *pdev)enable_irq_wake (rtc->irq);disable_irq (rtc->irq); - rtc->clk =clk_get (&pdev->dev,NULL ); + rtc->clk =devm_clk_get (&pdev->dev,NULL );if (IS_ERR (rtc->clk)) {dev_err (&pdev->dev,"Unable to request clock\n" );return PTR_ERR (rtc->clk);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 146/313 sctp: fix potential deadlock on &net->sctp.addr_wq_lock
In reply to Greg Kroah-HartmanFrom: Chengfeng Ye <[email protected]>
[ Upstream commit 6feb37b3b06e9049e20dcf7e23998f92c9c5be9a ]
As &net->sctp.addr_wq_lock is also acquired by the timer sctp_addr_wq_timeout_handler() in protocal.c, the same lock acquisition at sctp_auto_asconf_init() seems should disable irq since it is called from sctp_accept() under process context.
Possible deadlock scenario:sctp_accept()
-> sctp_sock_migrate()
-> sctp_auto_asconf_init()
-> spin_lock(&net->sctp.addr_wq_lock)
<timer interrupt>
-> sctp_addr_wq_timeout_handler()
-> spin_lock_bh(&net->sctp.addr_wq_lock); (deadlock here)This flaw was found using an experimental static analysis tool we are developing for irq-related deadlock.
The tentative patch fix the potential deadlock by spin_lock_bh().
--- net/sctp/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/sctp/socket.c +2 -2
@@ -362,9 +362,9 @@ static void sctp_auto_asconf_init(struct sctp_sock *sp)struct net *net =sock_net (&sp->inet.sk);if (net->sctp.default_auto_asconf) { -spin_lock (&net->sctp.addr_wq_lock); +spin_lock_bh (&net->sctp.addr_wq_lock);list_add_tail (&sp->auto_asconf_list, &net->sctp.auto_asconf_splist); -spin_unlock (&net->sctp.addr_wq_lock); +spin_unlock_bh (&net->sctp.addr_wq_lock); sp->do_auto_asconf =1 ; } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 147/313 Add MODULE_FIRMWARE() for FIRMWARE_TG357766.
In reply to Greg Kroah-HartmanFrom: Tobias Heider <[email protected]>
[ Upstream commit 046f753da6143ee16452966915087ec8b0de3c70 ]
Fixes a bug where on the M1 mac mini initramfs-tools fails to include the necessary firmware into the initrd.
--- drivers/net/ethernet/broadcom/tg3.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/broadcom/tg3.c +1 -0
@@ -230,6 +230,7 @@ MODULE_DESCRIPTION("Broadcom Tigon3 ethernet driver");MODULE_LICENSE ("GPL" );MODULE_VERSION (DRV_MODULE_VERSION );MODULE_FIRMWARE (FIRMWARE_TG3 ); +MODULE_FIRMWARE (FIRMWARE_TG357766 );MODULE_FIRMWARE (FIRMWARE_TG3TSO );MODULE_FIRMWARE (FIRMWARE_TG3TSO5 );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 148/313 spi: bcm-qspi: return error if neither hif_mspi nor mspi is available
In reply to Greg Kroah-HartmanFrom: Jonas Gorski <[email protected]>
[ Upstream commit 7c1f23ad34fcdace50275a6aa1e1969b41c6233f ]
If neither a "hif_mspi" nor "mspi" resource is present, the driver will just early exit in probe but still return success. Apart from not doing anything meaningful, this would then also lead to a null pointer access on removal, as platform_get_drvdata() would return NULL, which it would then try to dereference when trying to unregister the spi master.
Fix this by unconditionally calling devm_ioremap_resource(), as it can handle a NULL res and will then return a viable ERR_PTR() if we get one.
The "return 0;" was previously a "goto qspi_resource_err;" where then ret was returned, but since ret was still initialized to 0 at this place this was a valid conversion in 63c5395bb7a9 ("spi: bcm-qspi: Fix use-after-free on unbind"). The issue was not introduced by this commit, only made more obvious.
--- drivers/spi/spi-bcm-qspi.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/spi/spi-bcm-qspi.c +3 -7
@@ -1250,13 +1250,9 @@ int bcm_qspi_probe(struct platform_device *pdev, res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"mspi" ); -if (res) { - qspi->base[MSPI ] =devm_ioremap_resource (dev, res); -if (IS_ERR (qspi->base[MSPI ])) -return PTR_ERR (qspi->base[MSPI ]); - }else { -return 0 ; - } + qspi->base[MSPI ] =devm_ioremap_resource (dev, res); +if (IS_ERR (qspi->base[MSPI ])) +return PTR_ERR (qspi->base[MSPI ]); res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"bspi" );if (res) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 149/313 mailbox: ti-msgmgr: Fill non-message tx data fields with 0x0
In reply to Greg Kroah-HartmanFrom: Nishanth Menon <[email protected]>
[ Upstream commit 1b712f18c461bd75f018033a15cf381e712806b5 ]
Sec proxy/message manager data buffer is 60 bytes with the last of the registers indicating transmission completion. This however poses a bit of a challenge.
The backing memory for sec_proxy / message manager is regular memory, and all sec proxy does is to trigger a burst of all 60 bytes of data over to the target thread backing ring accelerator. It doesn't do a memory scrub when it moves data out in the burst. When we transmit multiple messages, remnants of previous message is also transmitted which results in some random data being set in TISCI fields of messages that have been expanded forward.
The entire concept of backward compatibility hinges on the fact that the unused message fields remain 0x0 allowing for 0x0 value to be specially considered when backward compatibility of message extension is done.
So, instead of just writing the completion register, we continue to fill the message buffer up with 0x0 (note: for partial message involving completion, we already do this).
This allows us to scale and introduce ABI changes back also work with other boot stages that may have left data in the internal memory.
While at this, be consistent and explicit with the data_reg pointer increment.
--- drivers/mailbox/ti-msgmgr.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/mailbox/ti-msgmgr.c +9 -3
@@ -385,14 +385,20 @@ static int ti_msgmgr_send_data(struct mbox_chan *chan, void *data)/* Ensure all unused data is 0 */ data_trail &=0xFFFFFFFF >> (8 * (sizeof (u32) - trail_bytes));writel (data_trail, data_reg); - data_reg++; + data_reg +=sizeof (u32); } +/* * 'data_reg' indicates next register to write. If we did not already * write on tx complete reg(last reg), we must do so for transmit +* In addition, we also need to make sure all intermediate data +* registers(if any required), are reset to 0 for TISCI backward +* compatibility to be maintained. */ -if (data_reg <= qinst->queue_buff_end) -writel (0 , qinst->queue_buff_end); +while (data_reg <= qinst->queue_buff_end) { +writel (0 , data_reg); + data_reg +=sizeof (u32); + }return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 150/313 f2fs: fix error path handling in truncate_dnode()
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit 0135c482fa97e2fd8245cb462784112a00ed1211 ]
If truncate_node() fails in truncate_dnode(), it missed to call f2fs_put_page(), fix it.
--- fs/f2fs/node.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/f2fs/node.c +3 -1
@@ -889,8 +889,10 @@ static int truncate_dnode(struct dnode_of_data *dn) dn->ofs_in_node =0 ;f2fs_truncate_data_blocks (dn); err =truncate_node (dn); -if (err) +if (err) { +f2fs_put_page (page,1 );return err; + }return 1 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 151/313 powerpc: allow PPC_EARLY_DEBUG_CPM only when SERIAL_CPM=y
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 39f49684036d24af800ff194c33c7b2653c591d7 ]
In a randconfig with CONFIG_SERIAL_CPM=m and CONFIG_PPC_EARLY_DEBUG_CPM=y, there is a build error:
ERROR: modpost: "udbg_putc" [drivers/tty/serial/cpm_uart/cpm_uart.ko] undefined!
Prevent the build error by allowing PPC_EARLY_DEBUG_CPM only when SERIAL_CPM=y.
--- arch/powerpc/Kconfig.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/Kconfig.debug +1 -1
@@ -234,7 +234,7 @@ config PPC_EARLY_DEBUG_40x config PPC_EARLY_DEBUG_CPM bool "Early serial debugging for Freescale CPM-based serial ports" - depends on SERIAL_CPM + depends on SERIAL_CPM=y help Select this to enable early debugging for Freescale chips using a CPM-based serial port. This assumes that the bootwrapper
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 152/313 net: bridge: keep ports without IFF_UNICAST_FLT in BR_PROMISC mode
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit 6ca3c005d0604e8d2b439366e3923ea58db99641 ]
According to the synchronization rules for .ndo_get_stats() as seen in Documentation/networking/netdevices.rst, acquiring a plain spin_lock() should not be illegal, but the bridge driver implementation makes it so.
After running these commands, I am being faced with the following lockdep splat:
$ ip link add link swp0 name macsec0 type macsec encrypt on && ip link set swp0 up $ ip link add dev br0 type bridge vlan_filtering 1 && ip link set br0 up $ ip link set macsec0 master br0 && ip link set macsec0 up
========================================================
WARNING: possible irq lock inversion dependency detected 6.4.0-04295-g31b577b4bd4a #603 Not tainted
--------------------------------------------------------
swapper/1/0 just changed the state of lock:
ffff6bd348724cd8 (&br->lock){+.-.}-{3:3}, at: br_forward_delay_timer_expired+0x34/0x198 but this lock took another, SOFTIRQ-unsafe lock in the past:
(&ocelot->stats_lock){+.+.}-{3:3}
and interrupts could create inverse lock ordering between them.
other info that might help us debug this:
Chain exists of:
&br->lock --> &br->hash_lock --> &ocelot->stats_lockPossible interrupt unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&ocelot->stats_lock);
local_irq_disable();
lock(&br->lock);
lock(&br->hash_lock);
<Interrupt>
lock(&br->lock);*** DEADLOCK ***
(details about the 3 locks skipped)
swp0 is instantiated by drivers/net/dsa/ocelot/felix.c, and this only matters to the extent that its .ndo_get_stats64() method calls spin_lock(&ocelot->stats_lock).
Documentation/locking/lockdep-design.rst says:
| A lock is irq-safe means it was ever used in an irq context, while a lock | is irq-unsafe means it was ever acquired with irq enabled.
(...)
| Furthermore, the following usage based lock dependencies are not allowed | between any two lock-classes:: | | <hardirq-safe> -> <hardirq-unsafe> | <softirq-safe> -> <softirq-unsafe>
Lockdep marks br->hash_lock as softirq-safe, because it is sometimes taken in softirq context (for example br_fdb_update() which runs in NET_RX softirq), and when it's not in softirq context it blocks softirqs by using spin_lock_bh().
Lockdep marks ocelot->stats_lock as softirq-unsafe, because it never blocks softirqs from running, and it is never taken from softirq context. So it can always be interrupted by softirqs.
There is a call path through which a function that holds br->hash_lock:fdb_add_hw_addr() will call a function that acquires ocelot->stats_lock:ocelot_port_get_stats64(). This can be seen below:
ocelot_port_get_stats64+0x3c/0x1e0 felix_get_stats64+0x20/0x38 dsa_slave_get_stats64+0x3c/0x60 dev_get_stats+0x74/0x2c8 rtnl_fill_stats+0x4c/0x150 rtnl_fill_ifinfo+0x5cc/0x7b8 rtmsg_ifinfo_build_skb+0xe4/0x150 rtmsg_ifinfo+0x5c/0xb0 __dev_notify_flags+0x58/0x200 __dev_set_promiscuity+0xa0/0x1f8 dev_set_promiscuity+0x30/0x70 macsec_dev_change_rx_flags+0x68/0x88 __dev_set_promiscuity+0x1a8/0x1f8 __dev_set_rx_mode+0x74/0xa8 dev_uc_add+0x74/0xa0 fdb_add_hw_addr+0x68/0xd8 fdb_add_local+0xc4/0x110 br_fdb_add_local+0x54/0x88 br_add_if+0x338/0x4a0 br_add_slave+0x20/0x38 do_setlink+0x3a4/0xcb8 rtnl_newlink+0x758/0x9d0 rtnetlink_rcv_msg+0x2f0/0x550 netlink_rcv_skb+0x128/0x148 rtnetlink_rcv+0x24/0x38
the plain English explanation for it is:
The macsec0 bridge port is created without p->flags & BR_PROMISC, because it is what br_manage_promisc() decides for a VLAN filtering bridge with a single auto port.
As part of the br_add_if() procedure, br_fdb_add_local() is called for the MAC address of the device, and this results in a call to dev_uc_add() for macsec0 while the softirq-safe br->hash_lock is taken.
Because macsec0 does not have IFF_UNICAST_FLT, dev_uc_add() ends up calling __dev_set_promiscuity() for macsec0, which is propagated by its implementation, macsec_dev_change_rx_flags(), to the lower device: swp0. This triggers the call path:
dev_set_promiscuity(swp0)
-> rtmsg_ifinfo()
-> dev_get_stats()
-> ocelot_port_get_stats64()
with a calling context that lockdep doesn't like (br->hash_lock held).
Normally we don't see this, because even though many drivers that can be bridge ports don't support IFF_UNICAST_FLT, we need a driver that
(a) doesn't support IFF_UNICAST_FLT, *and*
(b) it forwards the IFF_PROMISC flag to another driver, and
(c) *that* driver implements ndo_get_stats64() using a softirq-unsafe spinlock.
Condition (b) is necessary because the first __dev_set_rx_mode() calls __dev_set_promiscuity() with "bool notify=false", and thus, the rtmsg_ifinfo() code path won't be entered.
The same criteria also hold true for DSA switches which don't report IFF_UNICAST_FLT. When the DSA master uses a spin_lock() in its ndo_get_stats64() method, the same lockdep splat can be seen.
I think the deadlock possibility is real, even though I didn't reproduce it, and I'm thinking of the following situation to support that claim:
fdb_add_hw_addr() runs on a CPU A, in a context with softirqs locally disabled and br->hash_lock held, and may end up attempting to acquire ocelot->stats_lock.
In parallel, ocelot->stats_lock is currently held by a thread B (say, ocelot_check_stats_work()), which is interrupted while holding it by a softirq which attempts to lock br->hash_lock.
Thread B cannot make progress because br->hash_lock is held by A. Whereas thread A cannot make progress because ocelot->stats_lock is held by B.
When taking the issue at face value, the bridge can avoid that problem by simply making the ports promiscuous from a code path with a saner calling context (br->hash_lock not held). A bridge port without IFF_UNICAST_FLT is going to become promiscuous as soon as we call dev_uc_add() on it (which we do unconditionally), so why not be preemptive and make it promiscuous right from the beginning, so as to not be taken by surprise.
With this, we've broken the links between code that holds br->hash_lock or br->lock and code that calls into the ndo_change_rx_flags() or ndo_get_stats64() ops of the bridge port.
--- net/bridge/br_if.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/bridge/br_if.c +3 -2
@@ -157,8 +157,9 @@ void br_manage_promisc(struct net_bridge *br)* This lets us disable promiscuous mode and write * this config to hw. */ -if (br->auto_cnt ==0 || - (br->auto_cnt ==1 &&br_auto_port (p))) +if ((p->dev->priv_flags &IFF_UNICAST_FLT ) && + (br->auto_cnt ==0 || + (br->auto_cnt ==1 &&br_auto_port (p))))br_port_clear_promisc (p);else br_port_set_promisc (p);
Signature · 1 line
2.39.2