4.14.322-rc1 review
Subsystems (5)
Greg Kroah-Hartman
maintainercover 4.14.322-rc1 review
This is the start of the stable review cycle for the 4.14.322 release. There are 204 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Fri, 11 Aug 2023 10:36:10 +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/v4.x/stable-review/patch-4.14.322-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-4.14.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.14.322-rc1
Roger Quadros <[email protected]>
mtd: rawnand: omap_elm: Fix incorrect type in assignment
Mirsad Goran Todorovac <[email protected]>
test_firmware: fix a memory leak with reqs buffer
Jan Kara <[email protected]>
ext2: Drop fragment support
Alan Stern <[email protected]>
net: usbnet: Fix WARNING in usbnet_start_xmit/usb_submit_urb
Sungwoo Kim <[email protected]>
Bluetooth: L2CAP: Fix use-after-free in l2cap_sock_ready_cb
Prince Kumar Maurya <[email protected]>
fs/sysv: Null check to prevent null-ptr-deref bug
Ross Maynard <[email protected]>
USB: zaurus: Add ID for A-300/B-500/C-700
Ilya Dryomov <[email protected]>
libceph: fix potential hang in ceph_osdc_notify()
Bart Van Assche <[email protected]>
loop: Select I/O scheduler 'none' from inside add_disk()
Eric Dumazet <[email protected]>
tcp_metrics: fix data-race in tcpm_suck_dst() vs fastopen
Eric Dumazet <[email protected]>
tcp_metrics: annotate data-races around tm->tcpm_net
Eric Dumazet <[email protected]>
tcp_metrics: annotate data-races around tm->tcpm_vals[]
Eric Dumazet <[email protected]>
tcp_metrics: annotate data-races around tm->tcpm_lock
Eric Dumazet <[email protected]>
tcp_metrics: annotate data-races around tm->tcpm_stamp
Eric Dumazet <[email protected]>
tcp_metrics: fix addr_same() helper
Yue Haibing <[email protected]>
ip6mr: Fix skb_under_panic in ip6mr_cache_report()
valis <[email protected]>
net/sched: cls_route: No longer copy tcf_result on update to avoid use-after-free
valis <[email protected]>
net/sched: cls_u32: No longer copy tcf_result on update to avoid use-after-free
Eric Dumazet <[email protected]>
net: add missing data-race annotation for sk_ll_usec
Eric Dumazet <[email protected]>
net: add missing data-race annotations around sk->sk_peek_off
Georg Müller <[email protected]>
perf test uprobe_from_different_cu: Skip if there is no gcc
Yuanjun Gong <[email protected]>
net/mlx5e: fix return value check in mlx5e_ipsec_remove_trailer()
[email protected] <[email protected]>
word-at-a-time: use the same return type for has_zero regardless of endianness
Peter Zijlstra <[email protected]>
perf: Fix function pointer case
Lee Jones <[email protected]>
net/sched: cls_u32: Fix reference counter leak leading to overflow
Pedro Tammela <[email protected]>
net/sched: sch_qfq: account for stab overhead in qfq_enqueue
M A Ramdhan <[email protected]>
net/sched: cls_fw: Fix improper refcount update leads to use-after-free
Jocelyn Falempe <[email protected]>
drm/client: Fix memory leak in drm_client_target_cloned
Joe Thornber <[email protected]>
dm cache policy smq: ensure IO doesn't prevent cleaner policy progress
Mark Brown <[email protected]>
ASoC: wm8904: Fill the cache for WM8904_ADC_TEST_0 register
Stefan Haberland <[email protected]>
s390/dasd: fix hanging device after quiesce/resume
Jonas Gorski <[email protected]>
irq-bcm6345-l1: Do not assume a fixed block to cpu mapping
Alexander Steffen <[email protected]>
tpm_tis: Explicitly check for error code
Gilles Buloz <[email protected]>
hwmon: (nct7802) Fix for temp6 (PECI1) processed even if PECI1 disabled
Zhang Shurong <[email protected]>
staging: ks7010: potential buffer overflow in ks_wlan_set_encode_ext()
Greg Kroah-Hartman <[email protected]>
Documentation: security-bugs.rst: update preferences when dealing with the linux-distros group
Ricardo Ribalda <[email protected]>
usb: xhci-mtk: set the dma max_seg_size
Guiting Shen <[email protected]>
usb: ohci-at91: Fix the unhandle interrupt when resume
Marc Kleine-Budde <[email protected]>
can: gs_usb: gs_can_close(): add missing set of CAN state to CAN_STATE_STOPPED
Johan Hovold <[email protected]>
USB: serial: simple: sort driver entries
Oliver Neukum <[email protected]>
USB: serial: simple: add Kaufmann RKS+CAN VCP
Mohsen Tahmasebi <[email protected]>
USB: serial: option: add Quectel EC200A module support
Jerry Meng <[email protected]>
USB: serial: option: support Quectel EM060K_128
Zheng Yejian <[email protected]>
tracing: Fix warning in trace_buffered_event_disable()
Zheng Yejian <[email protected]>
ring-buffer: Fix wrong stat of cpu_buffer->read
Arnd Bergmann <[email protected]>
ata: pata_ns87415: mark ns87560_tf_read static
Yu Kuai <[email protected]>
dm raid: fix missing reconfig_mutex unlock in raid_ctr() error paths
Bart Van Assche <[email protected]>
block: Fix a source code comment in include/uapi/linux/blkzoned.h
Matus Gajdos <[email protected]>
ASoC: fsl_spdif: Silence output on stop
Yuanjun Gong <[email protected]>
benet: fix return value check in be_lancer_xmit_workarounds()
Maxim Mikityanskiy <[email protected]>
platform/x86: msi-laptop: Fix rfkill out-of-sync on MSI Wind U100
Hangbin Liu <[email protected]>
team: reset team's flags when down link is P2P device
Hangbin Liu <[email protected]>
bonding: reset bond's flags when down link is P2P device
Stewart Smith <[email protected]>
tcp: Reduce chance of collisions in inet6_hashfn().
Maciej Żenczykowski <[email protected]>
ipv6 addrconf: fix bug where deleting a mngtmpaddr can create a new temporary address
Yuanjun Gong <[email protected]>
ethernet: atheros: fix return value check in atl1e_tso_csum()
Wang Ming <[email protected]>
i40e: Fix an NULL vs IS_ERR() bug for debugfs_create_dir()
Hans de Goede <[email protected]>
gpio: tps68470: Make tps68470_gpio_output() always set the initial value
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
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
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
Gustavo A. R. Silva <[email protected]>
wifi: wext-core: Fix -Wstringop-overflow warning in ioctl_standard_iw_point()
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
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
YueHaibing <[email protected]>
can: bcm: Fix UAF in bcm_proc_show()
Miklos Szeredi <[email protected]>
fuse: revalidate: don't invalidate if interrupted
Georg Müller <[email protected]>
perf probe: Add test for regression introduced by switch to die_get_decl_file()
Dan Carpenter <[email protected]>
serial: atmel: don't enable IRQs prematurely
Shreyas Deodhar <[email protected]>
scsi: qla2xxx: Pointer may be dereferenced
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
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
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
Martin Kaiser <[email protected]>
hwrng: imx-rngc - fix the timeout for init and self check
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
Robin Murphy <[email protected]>
PCI: Add function 1 DMA alias quirk for Marvell 88SE9235
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
Kemeng Shi <[email protected]>
ext4: fix wrong unit use in ext4_mb_clear_bb
Adrian Hunter <[email protected]>
perf intel-pt: Fix CYC timestamps after standalone CBR
Ding Hui <[email protected]>
SUNRPC: Fix UAF in svc_tcp_listen_data_ready()
Jarkko Sakkinen <[email protected]>
tpm: tpm_vtpm_proxy: fix a race condition in /dev/vtpmx creation
Pedro Tammela <[email protected]>
net/sched: make psched_mtu() RTNL-less safe
Randy Dunlap <[email protected]>
wifi: airo: avoid uninitialized warning in airo_get_rate()
Ziyang Xuan <[email protected]>
ipv6/addrconf: fix a potential refcount underflow for idev
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
Klaus Kudielka <[email protected]>
net: mvneta: fix txq_map in case of txq_number==1
Linus Torvalds <[email protected]>
workqueue: clean up WORK_* constant types, clarify masking
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
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: unbind non-anonymous set if rule construction fails
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
Rasmus Villemoes <[email protected]>
spi: spi-fsl-spi: allow changing bits_per_word while CS is still active
Rasmus Villemoes <[email protected]>
spi: spi-fsl-spi: relax message sanity checking a little
Rasmus Villemoes <[email protected]>
spi: spi-fsl-spi: remove always-true conditional in fsl_spi_do_one_msg
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
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()
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
Artur Rojek <[email protected]>
sh: dma: Fix DMA channel offset calculation
Lin Ma <[email protected]>
net/sched: act_pedit: Add size check for TCA_PEDIT_PARMS_EX
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
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
Christophe JAILLET <[email protected]>
mfd: stmpe: Only disable the regulators if they are enabled
Jiasheng Jiang <[email protected]>
mfd: intel-lpss: Add missing check for platform_get_resource
Stephan Gerhold <[email protected]>
mfd: rt5033: Drop rt5033-battery sub-device
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
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
Davide Tronchin <[email protected]>
USB: serial: option: add LARA-R6 01B PIDs
Dan Carpenter <[email protected]>
modpost: fix off by one in is_executable_section()
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
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
Yuchen Yang <[email protected]>
scsi: 3w-xxxx: Add error handling for initialization failure in tw_probe()
Su Hui <[email protected]>
ALSA: ac97: Fix possible NULL dereference in snd_ac97_mixer
Nikita Zhandarovich <[email protected]>
drm/radeon: fix possible division-by-zero errors
Christophe JAILLET <[email protected]>
fbdev: omapfb: lcd_mipid: Fix an error handling path in mipid_spi_probe()
Randy Dunlap <[email protected]>
soc/fsl/qe: fix usb.c build errors
Cristian Ciocaltea <[email protected]>
ASoC: es8316: Increment max value for ALC Capture Target Volume control
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
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().
Ilia.Gavrilov <[email protected]>
netfilter: nf_conntrack_sip: fix the ct_sip_parse_numerical_param() return value.
Jeremy Sowden <[email protected]>
lib/ts_bm: reset initial match offset for every block of text
Kuniyuki Iwashima <[email protected]>
gtp: Fix use-after-free in __gtp_encap_destroy().
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
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
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()
Christophe JAILLET <[email protected]>
wifi: wl3501_cs: Fix an error handling path in wl3501_probe()
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()
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]>
evm: Complete description of evm_inode_setattr()
Nikita Zhandarovich <[email protected]>
PM: domains: fix integer overflow issues in genpd_parse_state()
Li Nan <[email protected]>
md/raid10: fix io loss while replacement replace rdev
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
Kees Cook <[email protected]>
treewide: Remove uninitialized_var() usage
Bas Nieuwenhuizen <[email protected]>
drm/amdgpu: Validate VM ioctl flags.
Ahmed S. Darwish <[email protected]>
scripts/tags.sh: Resolve gtags empty index generation
Lyude Paul <[email protected]>
drm/edid: Fix uninitialized variable in drm_cvt_modes()
Zheng Wang <[email protected]>
fbdev: imsttfb: Fix use after free bug in imsttfb_probe
Thomas Gleixner <[email protected]>
x86/smp: Use dedicated cache-line for mwait_play_dead()
Borislav Petkov (AMD) <[email protected]>
x86/microcode/AMD: Load late on both threads too
Bob Peterson <[email protected]>
gfs2: Don't deref jdesc in evict
-------------
Diffstat:
Documentation/admin-guide/security-bugs.rst | 24 +++---- Makefile | 4 +- arch/arm/boot/dts/bcm5301x.dtsi | 1 - 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/mach-sa1100/assabet.c | 2 +- arch/ia64/kernel/process.c | 2 +- arch/ia64/mm/discontig.c | 2 +- arch/ia64/mm/tlb.c | 2 +- arch/powerpc/Kconfig.debug | 2 +- arch/powerpc/include/asm/word-at-a-time.h | 2 +- arch/powerpc/platforms/52xx/mpc52xx_pic.c | 2 +- arch/s390/kernel/smp.c | 2 +- arch/sh/drivers/dma/dma-sh.c | 37 ++++++---- arch/sh/kernel/cpu/sh2/probe.c | 2 +- arch/x86/kernel/cpu/microcode/amd.c | 2 +- arch/x86/kernel/quirks.c | 10 +-- arch/x86/kernel/smpboot.c | 24 ++++--- arch/xtensa/platforms/iss/network.c | 2 +- drivers/acpi/acpi_pad.c | 2 +- drivers/ata/libata-scsi.c | 2 +- drivers/ata/pata_ns87415.c | 2 +- drivers/atm/zatm.c | 2 +- drivers/base/power/domain.c | 6 +- drivers/block/drbd/drbd_nl.c | 6 +- drivers/block/loop.c | 3 +- drivers/block/nbd.c | 3 +- drivers/char/hw_random/imx-rngc.c | 6 +- drivers/char/tpm/tpm_tis_core.c | 10 ++- drivers/char/tpm/tpm_vtpm_proxy.c | 30 ++------ drivers/clk/clk-gate.c | 2 +- drivers/crypto/nx/Makefile | 2 +- drivers/crypto/nx/nx.h | 4 +- drivers/extcon/extcon.c | 8 +++ drivers/firewire/ohci.c | 14 ++-- drivers/gpio/gpio-tps68470.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 ++ drivers/gpu/drm/bridge/sil-sii8620.c | 2 +- drivers/gpu/drm/drm_edid.c | 4 +- drivers/gpu/drm/drm_fb_helper.c | 5 ++ drivers/gpu/drm/exynos/exynos_drm_dsi.c | 6 +- drivers/gpu/drm/panel/panel-simple.c | 4 +- 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/hwmon/nct7802.c | 2 +- drivers/i2c/busses/i2c-rk3x.c | 2 +- drivers/ide/ide-acpi.c | 2 +- drivers/ide/ide-atapi.c | 2 +- drivers/ide/ide-io-std.c | 4 +- drivers/ide/ide-io.c | 4 +- drivers/ide/ide-sysfs.c | 2 +- drivers/ide/umc8672.c | 2 +- drivers/iio/adc/meson_saradc.c | 2 +- drivers/infiniband/core/uverbs_cmd.c | 4 +- drivers/infiniband/hw/cxgb4/cm.c | 2 +- drivers/infiniband/hw/mlx5/cq.c | 2 +- drivers/infiniband/hw/mthca/mthca_qp.c | 10 +-- drivers/input/misc/adxl34x.c | 3 +- drivers/input/misc/drv260x.c | 1 + drivers/input/serio/serio_raw.c | 2 +- drivers/irqchip/irq-bcm6345-l1.c | 14 ++-- drivers/mailbox/ti-msgmgr.c | 12 +++- drivers/md/dm-cache-policy-smq.c | 28 +++++--- drivers/md/dm-io.c | 2 +- drivers/md/dm-ioctl.c | 2 +- drivers/md/dm-raid.c | 9 ++- drivers/md/dm-snap-persistent.c | 2 +- drivers/md/dm-table.c | 2 +- drivers/md/md.c | 23 ++++-- drivers/md/raid0.c | 62 +++++++++++++--- drivers/md/raid0.h | 1 + drivers/md/raid10.c | 24 +++++-- drivers/md/raid5.c | 2 +- drivers/media/dvb-frontends/rtl2832.c | 2 +- drivers/media/usb/dvb-usb-v2/az6007.c | 3 +- drivers/media/usb/gspca/vicam.c | 2 +- drivers/media/usb/siano/smsusb.c | 3 +- drivers/media/usb/uvc/uvc_video.c | 8 +-- drivers/memstick/host/jmb38x_ms.c | 2 +- drivers/memstick/host/r592.c | 4 +- drivers/memstick/host/tifm_ms.c | 2 +- drivers/mfd/intel-lpss-acpi.c | 3 + drivers/mfd/rt5033.c | 3 - drivers/mfd/stmpe.c | 4 +- drivers/misc/pci_endpoint_test.c | 4 ++ drivers/mmc/core/quirks.h | 14 ++++ drivers/mmc/host/sdhci.c | 2 +- drivers/mtd/nand/omap_elm.c | 24 +++---- drivers/mtd/ubi/eba.c | 2 +- drivers/net/bonding/bond_main.c | 5 ++ drivers/net/can/janz-ican3.c | 2 +- drivers/net/can/usb/gs_usb.c | 2 + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 7 +- drivers/net/ethernet/broadcom/bnx2.c | 4 +- drivers/net/ethernet/broadcom/tg3.c | 1 + drivers/net/ethernet/emulex/benet/be_main.c | 3 +- drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 2 +- drivers/net/ethernet/intel/igb/igb_main.c | 5 ++ drivers/net/ethernet/marvell/mvneta.c | 4 +- .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 4 +- .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 4 +- drivers/net/ethernet/neterion/s2io.c | 2 +- drivers/net/ethernet/qlogic/qla3xxx.c | 2 +- drivers/net/ethernet/sun/cassini.c | 2 +- drivers/net/ethernet/sun/niu.c | 6 +- drivers/net/ethernet/ti/cpsw_ale.c | 24 +++++-- drivers/net/gtp.c | 2 + drivers/net/team/team.c | 9 +++ drivers/net/usb/cdc_ether.c | 21 ++++++ drivers/net/usb/usbnet.c | 6 ++ drivers/net/usb/zaurus.c | 21 ++++++ drivers/net/wan/z85230.c | 2 +- drivers/net/wireless/ath/ath10k/core.c | 2 +- drivers/net/wireless/ath/ath6kl/init.c | 2 +- drivers/net/wireless/ath/ath9k/ar9003_hw.c | 27 ++++--- drivers/net/wireless/ath/ath9k/htc_hst.c | 8 ++- drivers/net/wireless/ath/ath9k/init.c | 2 +- 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/broadcom/b43/debugfs.c | 2 +- drivers/net/wireless/broadcom/b43/dma.c | 2 +- drivers/net/wireless/broadcom/b43/lo.c | 2 +- drivers/net/wireless/broadcom/b43/phy_n.c | 2 +- drivers/net/wireless/broadcom/b43/xmit.c | 12 ++-- drivers/net/wireless/broadcom/b43legacy/debugfs.c | 2 +- drivers/net/wireless/broadcom/b43legacy/main.c | 2 +- drivers/net/wireless/cisco/airo.c | 5 +- drivers/net/wireless/intel/iwlegacy/3945.c | 2 +- drivers/net/wireless/intel/iwlegacy/4965-mac.c | 2 +- drivers/net/wireless/intersil/orinoco/orinoco_cs.c | 13 +++- .../net/wireless/intersil/orinoco/spectrum_cs.c | 13 +++- drivers/net/wireless/ray_cs.c | 16 +++-- drivers/net/wireless/wl3501_cs.c | 16 +++-- drivers/ntb/hw/amd/ntb_hw_amd.c | 7 +- drivers/ntb/hw/idt/ntb_hw_idt.c | 7 +- drivers/ntb/hw/intel/ntb_hw_intel.c | 7 +- drivers/ntb/ntb_transport.c | 2 +- drivers/pci/quirks.c | 2 + drivers/pinctrl/intel/pinctrl-cherryview.c | 15 ++-- drivers/pinctrl/pinctrl-amd.c | 28 ++++---- drivers/pinctrl/pinctrl-at91-pio4.c | 2 + drivers/platform/x86/hdaps.c | 4 +- drivers/platform/x86/msi-laptop.c | 8 +-- drivers/rtc/rtc-st-lpc.c | 2 +- drivers/s390/block/dasd_ioctl.c | 1 + drivers/scsi/3w-xxxx.c | 4 +- drivers/scsi/dc395x.c | 2 +- drivers/scsi/pm8001/pm8001_hwi.c | 2 +- drivers/scsi/pm8001/pm80xx_hwi.c | 2 +- drivers/scsi/qla2xxx/qla_attr.c | 13 ++++ drivers/scsi/qla2xxx/qla_bsg.c | 6 ++ drivers/scsi/qla2xxx/qla_iocb.c | 3 +- drivers/soc/fsl/qe/Kconfig | 1 + drivers/spi/spi-bcm-qspi.c | 10 +-- drivers/spi/spi-bcm63xx.c | 2 +- drivers/spi/spi-fsl-spi.c | 25 +++---- drivers/ssb/driver_chipcommon.c | 4 +- drivers/staging/ks7010/ks_wlan_net.c | 6 +- drivers/tty/cyclades.c | 2 +- drivers/tty/isicom.c | 2 +- drivers/tty/serial/8250/8250.h | 1 - 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/samsung.c | 14 +++- drivers/usb/host/ohci-at91.c | 8 ++- drivers/usb/host/xhci-mtk.c | 1 + drivers/usb/musb/cppi_dma.c | 2 +- drivers/usb/phy/phy-tahvo.c | 2 +- drivers/usb/serial/option.c | 10 +++ drivers/usb/serial/usb-serial-simple.c | 73 ++++++++++--------- drivers/usb/storage/sddr55.c | 4 +- drivers/vhost/net.c | 4 +- drivers/video/fbdev/au1200fb.c | 3 + drivers/video/fbdev/imsttfb.c | 18 ++--- drivers/video/fbdev/imxfb.c | 4 +- drivers/video/fbdev/matrox/matroxfb_maven.c | 6 +- drivers/video/fbdev/omap/lcd_mipid.c | 6 +- drivers/video/fbdev/pm3fb.c | 6 +- drivers/video/fbdev/riva/riva_hw.c | 3 +- drivers/virtio/virtio_ring.c | 2 +- drivers/w1/w1.c | 4 +- fs/afs/dir.c | 2 +- fs/afs/security.c | 2 +- fs/btrfs/qgroup.c | 2 + fs/dlm/netlink.c | 2 +- fs/dlm/plock.c | 4 +- fs/ext2/ext2.h | 12 ---- fs/ext2/super.c | 23 ++---- fs/ext4/indirect.c | 8 +++ fs/ext4/inode.c | 10 --- fs/ext4/mballoc.c | 4 +- fs/ext4/xattr.c | 14 ++++ fs/fat/dir.c | 2 +- fs/fuse/control.c | 2 +- fs/fuse/cuse.c | 2 +- fs/fuse/dir.c | 2 +- fs/fuse/file.c | 2 +- fs/gfs2/aops.c | 2 +- fs/gfs2/super.c | 8 +++ fs/hfsplus/unicode.c | 2 +- fs/isofs/namei.c | 4 +- fs/jffs2/build.c | 5 +- fs/jffs2/erase.c | 2 +- fs/jffs2/xattr.c | 13 ++-- fs/jffs2/xattr.h | 4 +- fs/jfs/jfs_dmap.c | 6 ++ fs/jfs/jfs_filsys.h | 2 + fs/nfsd/nfs4xdr.c | 2 +- fs/nfsd/nfsctl.c | 2 +- fs/ocfs2/alloc.c | 4 +- fs/ocfs2/dir.c | 14 ++-- fs/ocfs2/extent_map.c | 4 +- fs/ocfs2/namei.c | 2 +- fs/ocfs2/refcounttree.c | 2 +- fs/ocfs2/xattr.c | 2 +- fs/omfs/file.c | 2 +- fs/sysv/itree.c | 4 ++ fs/ubifs/commit.c | 6 +- fs/ubifs/file.c | 4 +- fs/ubifs/journal.c | 2 +- fs/ubifs/lpt.c | 2 +- fs/ubifs/tnc.c | 6 +- fs/ubifs/tnc_misc.c | 4 +- fs/udf/balloc.c | 2 +- fs/xfs/xfs_bmap_util.c | 2 +- include/asm-generic/word-at-a-time.h | 2 +- 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/ipv6.h | 8 +-- include/net/netfilter/nf_tables.h | 1 + include/net/pkt_sched.h | 2 +- include/net/sock.h | 1 + include/net/tcp.h | 6 +- include/uapi/linux/affs_hardblocks.h | 68 +++++++++--------- include/uapi/linux/blkzoned.h | 10 +-- include/uapi/linux/videodev2.h | 2 +- kernel/async.c | 4 +- kernel/audit.c | 2 +- kernel/bpf/bpf_lru_list.c | 21 +++--- kernel/bpf/bpf_lru_list.h | 7 +- kernel/events/core.c | 10 ++- kernel/events/uprobes.c | 2 +- kernel/exit.c | 2 +- kernel/futex.c | 12 ++-- kernel/kexec_core.c | 5 +- kernel/locking/lockdep.c | 6 +- kernel/sched/fair.c | 2 +- kernel/time/posix-timers.c | 31 ++++---- kernel/trace/ring_buffer.c | 48 +++++++------ kernel/trace/trace_events.c | 14 ++-- kernel/watchdog_hld.c | 6 +- kernel/workqueue.c | 13 ++-- lib/debugobjects.c | 9 +++ lib/radix-tree.c | 2 +- lib/test_firmware.c | 10 +++ lib/ts_bm.c | 4 +- mm/frontswap.c | 2 +- mm/ksm.c | 2 +- mm/memcontrol.c | 2 +- mm/mempolicy.c | 4 +- mm/percpu.c | 2 +- mm/slub.c | 4 +- mm/swap.c | 4 +- net/bluetooth/l2cap_sock.c | 2 + net/bridge/br_if.c | 5 +- net/can/bcm.c | 12 ++-- net/ceph/osd_client.c | 20 ++++-- net/core/rtnetlink.c | 8 +-- net/core/sock.c | 23 ++++-- net/dccp/options.c | 2 +- net/ipv4/netfilter/nf_socket_ipv4.c | 6 +- net/ipv4/tcp.c | 17 ++--- net/ipv4/tcp_fastopen.c | 6 +- net/ipv4/tcp_input.c | 12 +++- net/ipv4/tcp_metrics.c | 70 +++++++++++------- net/ipv6/addrconf.c | 17 +++-- net/ipv6/ip6_flowlabel.c | 2 +- net/ipv6/ip6mr.c | 2 +- net/ipv6/netfilter/nf_socket_ipv6.c | 2 +- net/ipv6/udp.c | 2 +- net/llc/llc_input.c | 3 - net/netfilter/nf_conntrack_ftp.c | 2 +- net/netfilter/nf_conntrack_helper.c | 4 ++ net/netfilter/nf_conntrack_sip.c | 2 +- net/netfilter/nf_tables_api.c | 32 +++++++-- net/netfilter/nfnetlink_log.c | 2 +- net/netfilter/nfnetlink_queue.c | 4 +- net/netfilter/nft_byteorder.c | 14 ++-- net/netlink/af_netlink.c | 5 +- net/netlink/diag.c | 7 +- net/sched/act_pedit.c | 1 + net/sched/cls_flow.c | 2 +- net/sched/cls_fw.c | 10 +-- net/sched/cls_route.c | 1 - net/sched/cls_u32.c | 22 +++--- net/sched/sch_cbq.c | 2 +- net/sched/sch_fq_codel.c | 2 +- net/sched/sch_qfq.c | 7 +- net/sched/sch_sfq.c | 2 +- net/sctp/socket.c | 4 +- net/sunrpc/svcsock.c | 27 ++++--- net/unix/af_unix.c | 2 +- net/wireless/wext-core.c | 6 ++ scripts/mod/modpost.c | 26 +++++-- scripts/tags.sh | 9 ++- security/integrity/evm/evm_main.c | 2 + security/integrity/iint.c | 15 ++-- sound/core/control_compat.c | 2 +- sound/isa/sb/sb16_csp.c | 2 +- sound/pci/ac97/ac97_codec.c | 4 +- sound/soc/codecs/es8316.c | 9 ++- sound/soc/codecs/wm8904.c | 3 + sound/soc/fsl/fsl_spdif.c | 2 + sound/usb/endpoint.c | 2 +- .../tests/shell/test_uprobe_from_different_cu.sh | 83 ++++++++++++++++++++++ tools/perf/util/dwarf-aux.c | 2 +- .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 2 + 326 files changed, 1531 insertions(+), 867 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/204 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
@@ -1575,6 +1575,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/204 x86/microcode/AMD: Load late on both threads too
In reply to Greg Kroah-HartmanFrom: Borislav Petkov (AMD) <[email protected]>
commit a32b0f0db3f396f1c9be2fe621e77c09ec3d8e7d upstream.
Do the same as early loading - load on both threads.
--- arch/x86/kernel/cpu/microcode/amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/microcode/amd.c +1 -1
@@ -532,7 +532,7 @@ static enum ucode_state apply_microcode_rdmsr (MSR_AMD64_PATCH_LEVEL , rev, dummy);/* need to apply patch? */ -if (rev >= mc_amd->hdr.patch_id) { +if (rev > mc_amd->hdr.patch_id) { ret =UCODE_OK ; goto out; }
Greg Kroah-Hartman
maintainerPATCH 3/204 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
@@ -94,6 +94,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 */ static int *physical_to_logical_pkg__read_mostly ;static unsigned long *physical_package_map__read_mostly ;;
@@ -1638,10 +1649,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 )
@@ -1675,13 +1686,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 ) {
@@ -1693,9 +1697,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 4/204 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 | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
drivers/video/fbdev/imsttfb.c +10 -8
@@ -1348,7 +1348,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;
@@ -1420,7 +1420,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" );
@@ -1460,12 +1460,13 @@ static void init_imstt(struct fb_info *iif (register_framebuffer (info) <0 ) {fb_dealloc_cmap (&info->cmap);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)
@@ -1474,7 +1475,8 @@ static int imsttfb_probe(struct pci_devstruct imstt_par *par;struct fb_info *info;struct device_node *dp; - +int ret; + dp =pci_device_to_OF_node (pdev);if (dp)printk (KERN_INFO "%s: OF name %s\n" ,__func__, dp->name);
@@ -1525,10 +1527,10 @@ static int imsttfb_probe(struct pci_dev par->cmap_regs_phys = addr +0x840000 ; par->cmap_regs = (__u8 *)ioremap (addr +0x840000 ,0x1000 ); 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; }static void imsttfb_remove (struct pci_dev *pdev)
Greg Kroah-Hartman
maintainerPATCH 5/204 drm/edid: Fix uninitialized variable in drm_cvt_modes()
In reply to Greg Kroah-HartmanFrom: Lyude Paul <[email protected]>
commit 991fcb77f490390bcad89fa67d95763c58cdc04c upstream.
Noticed this when trying to compile with -Wall on a kernel fork. We potentially don't set width here, which causes the compiler to complain about width potentially being uninitialized in drm_cvt_modes(). So, let's fix that.
Changes since v1:
* Don't emit an error as this code isn't reachable, just mark it as such Changes since v2:
* Remove now unused variable
--- drivers/gpu/drm/drm_edid.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/drm_edid.c +2 -0
@@ -2691,6 +2691,8 @@ static int drm_cvt_modes(struct drm_conncase 0x0c : width = height *15 /9 ;break ; +default : +unreachable (); }for (j =1 ; j <5 ; j++) {
Greg Kroah-Hartman
maintainerPATCH 6/204 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
@@ -37,6 +37,13 @@ find_all_archs() done } +# 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}
@@ -145,7 +152,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 7/204 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
@@ -2712,6 +2712,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 8/204 treewide: Remove uninitialized_var() usage
In reply to Greg Kroah-HartmanFrom: Kees Cook <[email protected]>
commit 3f649ab728cda8038259d8f14492fe400fbab911 upstream.
Using uninitialized_var() is dangerous as it papers over real bugs[1] (or can in the future), and suppresses unrelated compiler warnings (e.g. "unused variable"). If the compiler thinks it is uninitialized, either simply initialize the variable or make compiler changes.
In preparation for removing[2] the[3] macro[4], remove all remaining needless uses with the following script:
git grep '\buninitialized_var\b' | cut -d: -f1 | sort -u | \ xargs perl -pi -e \ 's/\buninitialized_var\(([^\)]+)\)/\1/g; s:\s*/\* (GCC be quiet|to make compiler happy) \*/$::g;'
drivers/video/fbdev/riva/riva_hw.c was manually tweaked to avoid pathological white-space.
No outstanding warnings were found building allmodconfig with GCC 9.3.0 for x86_64, i386, arm64, arm, powerpc, powerpc64le, s390x, mips, sparc64, alpha, and m68k.
[1] https://lore.kernel.org/lkml/[email protected]/
[2] https://lore.kernel.org/lkml/CA+55aFw+Vbj0i=1TGqCR5vQkCzWJ0QxK6CernOU6eedsudAixw@mail.gmail.com/
[3] https://lore.kernel.org/lkml/CA+55aFwgbgqhbp1fkxvRKEpzyR5J8n1vKT1VZdz9knmPuXhOeg@mail.gmail.com/
[4] https://lore.kernel.org/lkml/CA+55aFz2500WfbKXAx8s67wrm9=yVJu65TpLgN_ybYNv0VEOKA@mail.gmail.com/
--- arch/arm/mach-sa1100/assabet.c | 2 +- arch/ia64/kernel/process.c | 2 +- arch/ia64/mm/discontig.c | 2 +- arch/ia64/mm/tlb.c | 2 +- arch/powerpc/platforms/52xx/mpc52xx_pic.c | 2 +- arch/s390/kernel/smp.c | 2 +- arch/x86/kernel/quirks.c | 10 +++++----- drivers/acpi/acpi_pad.c | 2 +- drivers/ata/libata-scsi.c | 2 +- drivers/atm/zatm.c | 2 +- drivers/block/drbd/drbd_nl.c | 6 +++--- drivers/clk/clk-gate.c | 2 +- drivers/firewire/ohci.c | 14 +++++++------- drivers/gpu/drm/bridge/sil-sii8620.c | 2 +- drivers/gpu/drm/drm_edid.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 6 +++--- drivers/i2c/busses/i2c-rk3x.c | 2 +- drivers/ide/ide-acpi.c | 2 +- drivers/ide/ide-atapi.c | 2 +- drivers/ide/ide-io-std.c | 4 ++-- drivers/ide/ide-io.c | 4 ++-- drivers/ide/ide-sysfs.c | 2 +- drivers/ide/umc8672.c | 2 +- drivers/infiniband/core/uverbs_cmd.c | 4 ++-- drivers/infiniband/hw/cxgb4/cm.c | 2 +- drivers/infiniband/hw/mlx5/cq.c | 2 +- drivers/infiniband/hw/mthca/mthca_qp.c | 10 +++++----- drivers/input/serio/serio_raw.c | 2 +- drivers/md/dm-io.c | 2 +- drivers/md/dm-ioctl.c | 2 +- drivers/md/dm-snap-persistent.c | 2 +- drivers/md/dm-table.c | 2 +- drivers/md/raid5.c | 2 +- drivers/media/dvb-frontends/rtl2832.c | 2 +- drivers/media/usb/gspca/vicam.c | 2 +- drivers/media/usb/uvc/uvc_video.c | 8 ++++---- drivers/memstick/host/jmb38x_ms.c | 2 +- drivers/memstick/host/tifm_ms.c | 2 +- drivers/mmc/host/sdhci.c | 2 +- drivers/mtd/ubi/eba.c | 2 +- drivers/net/can/janz-ican3.c | 2 +- drivers/net/ethernet/broadcom/bnx2.c | 4 ++-- drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c | 4 ++-- drivers/net/ethernet/neterion/s2io.c | 2 +- drivers/net/ethernet/qlogic/qla3xxx.c | 2 +- drivers/net/ethernet/sun/cassini.c | 2 +- drivers/net/ethernet/sun/niu.c | 6 +++--- drivers/net/wan/z85230.c | 2 +- drivers/net/wireless/ath/ath10k/core.c | 2 +- drivers/net/wireless/ath/ath6kl/init.c | 2 +- drivers/net/wireless/ath/ath9k/init.c | 2 +- drivers/net/wireless/broadcom/b43/debugfs.c | 2 +- drivers/net/wireless/broadcom/b43/dma.c | 2 +- drivers/net/wireless/broadcom/b43/lo.c | 2 +- drivers/net/wireless/broadcom/b43/phy_n.c | 2 +- drivers/net/wireless/broadcom/b43/xmit.c | 12 ++++++------ drivers/net/wireless/broadcom/b43legacy/debugfs.c | 2 +- drivers/net/wireless/broadcom/b43legacy/main.c | 2 +- drivers/net/wireless/intel/iwlegacy/3945.c | 2 +- drivers/net/wireless/intel/iwlegacy/4965-mac.c | 2 +- drivers/platform/x86/hdaps.c | 4 ++-- drivers/scsi/dc395x.c | 2 +- drivers/scsi/pm8001/pm8001_hwi.c | 2 +- drivers/scsi/pm8001/pm80xx_hwi.c | 2 +- drivers/ssb/driver_chipcommon.c | 4 ++-- drivers/tty/cyclades.c | 2 +- drivers/tty/isicom.c | 2 +- drivers/usb/musb/cppi_dma.c | 2 +- drivers/usb/storage/sddr55.c | 4 ++-- drivers/vhost/net.c | 4 ++-- drivers/video/fbdev/matrox/matroxfb_maven.c | 6 +++--- drivers/video/fbdev/pm3fb.c | 6 +++--- drivers/video/fbdev/riva/riva_hw.c | 3 +-- drivers/virtio/virtio_ring.c | 2 +- fs/afs/dir.c | 2 +- fs/afs/security.c | 2 +- fs/dlm/netlink.c | 2 +- fs/fat/dir.c | 2 +- fs/fuse/control.c | 2 +- fs/fuse/cuse.c | 2 +- fs/fuse/file.c | 2 +- fs/gfs2/aops.c | 2 +- fs/hfsplus/unicode.c | 2 +- fs/isofs/namei.c | 4 ++-- fs/jffs2/erase.c | 2 +- fs/nfsd/nfsctl.c | 2 +- fs/ocfs2/alloc.c | 4 ++-- fs/ocfs2/dir.c | 14 +++++++------- fs/ocfs2/extent_map.c | 4 ++-- fs/ocfs2/namei.c | 2 +- fs/ocfs2/refcounttree.c | 2 +- fs/ocfs2/xattr.c | 2 +- fs/omfs/file.c | 2 +- fs/ubifs/commit.c | 6 +++--- fs/ubifs/file.c | 4 ++-- fs/ubifs/journal.c | 2 +- fs/ubifs/lpt.c | 2 +- fs/ubifs/tnc.c | 6 +++--- fs/ubifs/tnc_misc.c | 4 ++-- fs/udf/balloc.c | 2 +- fs/xfs/xfs_bmap_util.c | 2 +- kernel/async.c | 4 ++-- kernel/audit.c | 2 +- kernel/events/core.c | 2 +- kernel/events/uprobes.c | 2 +- kernel/exit.c | 2 +- kernel/futex.c | 12 ++++++------ kernel/locking/lockdep.c | 6 +++--- kernel/trace/ring_buffer.c | 2 +- lib/radix-tree.c | 2 +- mm/frontswap.c | 2 +- mm/ksm.c | 2 +- mm/memcontrol.c | 2 +- mm/mempolicy.c | 4 ++-- mm/percpu.c | 2 +- mm/slub.c | 4 ++-- mm/swap.c | 4 ++-- net/dccp/options.c | 2 +- net/ipv4/netfilter/nf_socket_ipv4.c | 6 +++--- net/ipv6/ip6_flowlabel.c | 2 +- net/ipv6/netfilter/nf_socket_ipv6.c | 2 +- net/netfilter/nf_conntrack_ftp.c | 2 +- net/netfilter/nfnetlink_log.c | 2 +- net/netfilter/nfnetlink_queue.c | 4 ++-- net/sched/cls_flow.c | 2 +- net/sched/sch_cbq.c | 2 +- net/sched/sch_fq_codel.c | 2 +- net/sched/sch_sfq.c | 2 +- sound/core/control_compat.c | 2 +- sound/isa/sb/sb16_csp.c | 2 +- sound/usb/endpoint.c | 2 +- 131 files changed, 201 insertions(+), 202 deletions(-)
arch/arm/mach-sa1100/assabet.c +1 -1
@@ -518,7 +518,7 @@ static void __init map_sa1100_gpio_regs(*/ static void __init get_assabet_scr (void ) { -unsigned long uninitialized_var (scr ), i; +unsigned long scr, i;GPDR |=0x3fc ;/* Configure GPIO 9:2 as outputs */ GPSR =0x3fc ;/* Write 0xFF to GPIO 9:2 */
arch/ia64/kernel/process.c +1 -1
@@ -448,7 +448,7 @@ static void do_copy_task_regs (struct task_struct *task, struct unw_frame_info *info, void *arg) { unsigned long mask, sp, nat_bits = 0, ar_rnat, urbs_end, cfm; -unsigned long uninitialized_var (ip );/* GCC be quiet */ +unsigned long ip;elf_greg_t *dst = arg;struct pt_regs *pt;char nat;
arch/ia64/mm/discontig.c +1 -1
@@ -185,7 +185,7 @@ static void *per_cpu_node_setup(void *cpvoid __init setup_per_cpu_areas (void ) {struct pcpu_alloc_info *ai; -struct pcpu_group_info *uninitialized_var (gi ); +struct pcpu_group_info *gi;unsigned int *cpu_map;void *base;unsigned long base_offset;
arch/ia64/mm/tlb.c +1 -1
@@ -339,7 +339,7 @@ EXPORT_SYMBOL(flush_tlb_range);void ia64_tlb_init (void ) { -ia64_ptce_info_t uninitialized_var (ptce_info );/* GCC be quiet */ +ia64_ptce_info_t ptce_info;u64 tr_pgbits;long status;pal_vm_info_1_u_t vm_info_1;
arch/powerpc/platforms/52xx/mpc52xx_pic.c +1 -1
@@ -340,7 +340,7 @@ static int mpc52xx_irqhost_map(struct ir {int l1irq;int l2irq; -struct irq_chip *uninitialized_var (irqchip ); +struct irq_chip *irqchip;void *hndlr;int type;u32 reg;
arch/s390/kernel/smp.c +1 -1
@@ -147,7 +147,7 @@ static int pcpu_sigp_retry(struct pcpu *static inline int pcpu_stopped (struct pcpu *pcpu) { -u32 uninitialized_var (status ); +u32 status;if (__pcpu_sigp (pcpu->address,SIGP_SENSE ,0 , &status) !=SIGP_CC_STATUS_STORED )
arch/x86/kernel/quirks.c +5 -5
@@ -96,7 +96,7 @@ static void ich_force_hpet_resume(void)static void ich_force_enable_hpet (struct pci_dev *dev) {u32 val; -u32 uninitialized_var (rcba ); +u32 rcba;int err =0 ;if (hpet_address || force_hpet_address)
@@ -186,7 +186,7 @@ static void hpet_print_force_info(void)static void old_ich_force_hpet_resume (void ) {u32 val; -u32 uninitialized_var (gen_cntl ); +u32 gen_cntl;if (!force_hpet_address || !cached_dev)return ;
@@ -208,7 +208,7 @@ static void old_ich_force_hpet_resume(vostatic void old_ich_force_enable_hpet (struct pci_dev *dev) {u32 val; -u32 uninitialized_var (gen_cntl ); +u32 gen_cntl;if (hpet_address || force_hpet_address)return ;
@@ -299,7 +299,7 @@ static void vt8237_force_hpet_resume(voistatic void vt8237_force_enable_hpet (struct pci_dev *dev) { -u32 uninitialized_var (val ); +u32 val;if (hpet_address || force_hpet_address)return ;
@@ -430,7 +430,7 @@ static void nvidia_force_hpet_resume(voistatic void nvidia_force_enable_hpet (struct pci_dev *dev) { -u32 uninitialized_var (val ); +u32 val;if (hpet_address || force_hpet_address)return ;
drivers/acpi/acpi_pad.c +1 -1
@@ -95,7 +95,7 @@ static void round_robin_cpu(unsigned intcpumask_var_t tmp;int cpu;unsigned long min_weight =-1 ; -unsigned long uninitialized_var (preferred_cpu ); +unsigned long preferred_cpu;if (!alloc_cpumask_var (&tmp,GFP_KERNEL ))return ;
drivers/ata/libata-scsi.c +1 -1
@@ -176,7 +176,7 @@ static ssize_t ata_scsi_park_show(structstruct ata_link *link;struct ata_device *dev;unsigned long now; -unsigned int uninitialized_var (msecs ); +unsigned int msecs;int rc =0 ; ap =ata_shost_to_port (sdev->host);
drivers/atm/zatm.c +1 -1
@@ -939,7 +939,7 @@ static int open_tx_first(struct atm_vcc vcc->qos.txtp.max_pcr >= ATM_OC3_PCR);if (unlimited && zatm_dev->ubr !=-1 ) zatm_vcc->shaper = zatm_dev->ubr; else { - int uninitialized_var(pcr); + int pcr; if (unlimited) vcc->qos.txtp.max_sdu = ATM_MAX_AAL5_PDU; if ((zatm_vcc->shaper = alloc_shaper(vcc->dev,&pcr,
drivers/block/drbd/drbd_nl.c +3 -3
@@ -3394,7 +3394,7 @@ int drbd_adm_dump_devices(struct sk_buff {struct nlattr *resource_filter;struct drbd_resource *resource; -struct drbd_device *uninitialized_var (device ); +struct drbd_device *device;int minor, err, retcode;struct drbd_genlmsghdr *dh;struct device_info device_info;
@@ -3483,7 +3483,7 @@ int drbd_adm_dump_connections(struct sk_ {struct nlattr *resource_filter;struct drbd_resource *resource =NULL , *next_resource; -struct drbd_connection *uninitialized_var (connection ); +struct drbd_connection *connection;int err =0 , retcode;struct drbd_genlmsghdr *dh;struct connection_info connection_info;
@@ -3645,7 +3645,7 @@ int drbd_adm_dump_peer_devices(struct sk {struct nlattr *resource_filter;struct drbd_resource *resource; -struct drbd_device *uninitialized_var (device ); +struct drbd_device *device;struct drbd_peer_device *peer_device =NULL ;int minor, err, retcode;struct drbd_genlmsghdr *dh;
drivers/clk/clk-gate.c +1 -1
@@ -43,7 +43,7 @@ static void clk_gate_endisable(struct cl {struct clk_gate *gate =to_clk_gate (hw);int set = gate->flags &CLK_GATE_SET_TO_DISABLE ?1 :0 ; -unsigned long uninitialized_var (flags ); +unsigned long flags;u32 reg; set ^= enable;
drivers/firewire/ohci.c +7 -7
@@ -1114,7 +1114,7 @@ static void context_tasklet(unsigned lonstatic int context_add_buffer (struct context *ctx) {struct descriptor_buffer *desc; -dma_addr_t uninitialized_var (bus_addr ); +dma_addr_t bus_addr;int offset;/*
@@ -1304,7 +1304,7 @@ static int at_context_queue_packet(struc struct fw_packet *packet) {struct fw_ohci *ohci = ctx->ohci; -dma_addr_t d_bus,uninitialized_var (payload_bus ); +dma_addr_t d_bus, payload_bus;struct driver_data *driver_data;struct descriptor *d, *last;__le32 *header;
@@ -2460,7 +2460,7 @@ static int ohci_set_config_rom(struct fw {struct fw_ohci *ohci;__be32 *next_config_rom; -dma_addr_t uninitialized_var (next_config_rom_bus ); +dma_addr_t next_config_rom_bus; ohci =fw_ohci (card);
@@ -2949,10 +2949,10 @@ static struct fw_iso_context *ohci_alloc int type, int channel, size_t header_size) { struct fw_ohci *ohci = fw_ohci(card); -struct iso_context *uninitialized_var (ctx ); -descriptor_callback_t uninitialized_var (callback ); -u64 *uninitialized_var (channels ); -u32 *uninitialized_var (mask ),uninitialized_var (regs ); +struct iso_context *ctx; +descriptor_callback_t callback; +u64 *channels; +u32 *mask, regs;int index, ret = -EBUSY ;spin_lock_irq (&ohci->lock);
drivers/gpu/drm/bridge/sil-sii8620.c +1 -1
@@ -1011,7 +1011,7 @@ static void sii8620_set_auto_zone(structstatic void sii8620_stop_video (struct sii8620 *ctx) { -u8 uninitialized_var (val ); +u8 val; sii8620_write_seq_static(ctx, REG_TPI_INTR_EN, 0,
drivers/gpu/drm/drm_edid.c +1 -1
@@ -2671,7 +2671,7 @@ static int drm_cvt_modes(struct drm_connconst u8 empty[3 ] = {0 ,0 ,0 };for (i =0 ; i <4 ; i++) { -int uninitialized_var (width ), height; +int width, height; cvt = &(timing->data.other_data.data.cvt[i]);if (!memcmp (cvt->code, empty,3 ))
drivers/gpu/drm/exynos/exynos_drm_dsi.c +3 -3
@@ -545,9 +545,9 @@ static unsigned long exynos_dsi_pll_findunsigned long best_freq =0 ;u32 min_delta =0xffffffff ;u8 p_min, p_max; -u8 _p,uninitialized_var (best_p ); -u16 _m,uninitialized_var (best_m ); -u8 _s,uninitialized_var (best_s ); +u8 _p, best_p; +u16 _m, best_m; +u8 _s, best_s; p_min =DIV_ROUND_UP (fin, (12 *MHZ )); p_max = fin / (6 *MHZ );
drivers/i2c/busses/i2c-rk3x.c +1 -1
@@ -417,7 +417,7 @@ static void rk3x_i2c_handle_read(struct {unsigned int i;unsigned int len = i2c->msg->len - i2c->processed; -u32 uninitialized_var (val ); +u32 val;u8 byte;/* we only care for MBRF here. */
drivers/ide/ide-acpi.c +1 -1
@@ -180,7 +180,7 @@ err:static acpi_handle ide_acpi_hwif_get_handle (ide_hwif_t *hwif) {struct device *dev = hwif->gendev.parent; -acpi_handle uninitialized_var (dev_handle ); +acpi_handle dev_handle;u64 pcidevfn;acpi_handle chan_handle;int err;
drivers/ide/ide-atapi.c +1 -1
@@ -591,7 +591,7 @@ static int ide_delayed_transfer_pc(ide_dstatic ide_startstop_t ide_transfer_pc (ide_drive_t *drive) { -struct ide_atapi_pc *uninitialized_var (pc ); +struct ide_atapi_pc *pc;ide_hwif_t *hwif = drive->hwif;struct request *rq = hwif->rq;ide_expiry_t *expiry;
drivers/ide/ide-io-std.c +2 -2
@@ -172,7 +172,7 @@ void ide_input_data(ide_drive_t *drive,u8 mmio = (hwif->host_flags &IDE_HFLAG_MMIO ) ?1 :0 ;if (io_32bit) { -unsigned long uninitialized_var (flags ); +unsigned long flags;if ((io_32bit &2 ) && !mmio) {local_irq_save (flags);
@@ -216,7 +216,7 @@ void ide_output_data(ide_drive_t *drive,u8 mmio = (hwif->host_flags &IDE_HFLAG_MMIO ) ?1 :0 ;if (io_32bit) { -unsigned long uninitialized_var (flags ); +unsigned long flags;if ((io_32bit &2 ) && !mmio) {local_irq_save (flags);
drivers/ide/ide-io.c +2 -2
@@ -767,13 +767,13 @@ irqreturn_t ide_intr (int irq, void *dev {ide_hwif_t *hwif = (ide_hwif_t *)dev_id;struct ide_host *host = hwif->host; -ide_drive_t *uninitialized_var (drive ); +ide_drive_t *drive;ide_handler_t *handler;unsigned long flags;ide_startstop_t startstop;irqreturn_t irq_ret =IRQ_NONE ;int plug_device =0 ; -struct request *uninitialized_var (rq_in_flight ); +struct request *rq_in_flight;if (host->host_flags &IDE_HFLAG_SERIALIZE ) {if (hwif != host->cur_port)
drivers/ide/ide-sysfs.c +1 -1
@@ -131,7 +131,7 @@ static struct device_attribute *ide_portint ide_sysfs_register_port (ide_hwif_t *hwif) { -int i,uninitialized_var (rc ); +int i, rc;for (i =0 ; ide_port_attrs[i]; i++) { rc =device_create_file (hwif->portdev, ide_port_attrs[i]);
drivers/ide/umc8672.c +1 -1
@@ -107,7 +107,7 @@ static void umc_set_speeds(u8 speeds[])static void umc_set_pio_mode (ide_hwif_t *hwif,ide_drive_t *drive) {ide_hwif_t *mate = hwif->mate; -unsigned long uninitialized_var (flags ); +unsigned long flags;const u8 pio = drive->pio_mode -XFER_PIO_0 ; printk("%s: setting umc8672 to PIO mode%d (speed %d)\n",
drivers/infiniband/core/uverbs_cmd.c +2 -2
@@ -1738,7 +1738,7 @@ ssize_t ib_uverbs_open_qp(struct ib_uverstruct ib_udata udata;struct ib_uqp_object *obj;struct ib_xrcd *xrcd; -struct ib_uobject *uninitialized_var (xrcd_uobj ); +struct ib_uobject *xrcd_uobj;struct ib_qp *qp;struct ib_qp_open_attr attr;int ret;
@@ -3538,7 +3538,7 @@ static int __uverbs_create_xsrq(struct istruct ib_usrq_object *obj;struct ib_pd *pd;struct ib_srq *srq; -struct ib_uobject *uninitialized_var (xrcd_uobj ); +struct ib_uobject *xrcd_uobj;struct ib_srq_init_attr attr;int ret;
drivers/infiniband/hw/cxgb4/cm.c +1 -1
@@ -3168,7 +3168,7 @@ static int get_lladdr(struct net_devicestatic int pick_local_ip6addrs (struct c4iw_dev *dev,struct iw_cm_id *cm_id) { -struct in6_addr uninitialized_var (addr ); +struct in6_addr addr;struct sockaddr_in6 *la6 = (struct sockaddr_in6 *)&cm_id->m_local_addr;struct sockaddr_in6 *ra6 = (struct sockaddr_in6 *)&cm_id->m_remote_addr;
drivers/infiniband/hw/mlx5/cq.c +1 -1
@@ -1285,7 +1285,7 @@ int mlx5_ib_resize_cq(struct ib_cq *ibcq__be64 *pas;int page_shift;int inlen; -int uninitialized_var (cqe_size ); +int cqe_size;unsigned long flags;if (!MLX5_CAP_GEN (dev->mdev, cq_resize)) {
drivers/infiniband/hw/mthca/mthca_qp.c +5 -5
@@ -1630,8 +1630,8 @@ int mthca_tavor_post_send(struct ib_qp ** without initializing f0 and size0, and they are in fact * never used uninitialized. */ -int uninitialized_var (size0 ); -u32 uninitialized_var (f0 ); +int size0; +u32 f0;int ind;u8 op0 =0 ;
@@ -1831,7 +1831,7 @@ int mthca_tavor_post_receive(struct ib_q* without initializing size0, and it is in fact never used * uninitialized. */ -int uninitialized_var (size0 ); +int size0;int ind;void *wqe;void *prev_wqe;
@@ -1945,8 +1945,8 @@ int mthca_arbel_post_send(struct ib_qp ** without initializing f0 and size0, and they are in fact * never used uninitialized. */ -int uninitialized_var (size0 ); -u32 uninitialized_var (f0 ); +int size0; +u32 f0;int ind;u8 op0 =0 ;
drivers/input/serio/serio_raw.c +1 -1
@@ -162,7 +162,7 @@ static ssize_t serio_raw_read(struct fil {struct serio_raw_client *client = file->private_data;struct serio_raw *serio_raw = client->serio_raw; -char uninitialized_var (c ); +char c;ssize_t read =0 ;int error;
drivers/md/dm-io.c +1 -1
@@ -306,7 +306,7 @@ static void do_region(int op, int op_flastruct request_queue *q =bdev_get_queue (where->bdev);unsigned short logical_block_size =queue_logical_block_size (q);sector_t num_sectors; -unsigned int uninitialized_var (special_cmd_max_sectors ); +unsigned int special_cmd_max_sectors;/* * Reject unsupported discard and write same requests.
drivers/md/dm-ioctl.c +1 -1
@@ -1821,7 +1821,7 @@ static int ctl_ioctl(struct file *file,int ioctl_flags;int param_flags;unsigned int cmd; -struct dm_ioctl *uninitialized_var (param ); +struct dm_ioctl *param;ioctl_fn fn =NULL ;size_t input_param_size;struct dm_ioctl param_kernel;
drivers/md/dm-snap-persistent.c +1 -1
@@ -613,7 +613,7 @@ static int persistent_read_metadata(stru chunk_t old, chunk_t new), void *callback_context) { - int r, uninitialized_var(new_snapshot); + int r, new_snapshot;struct pstore *ps =get_info (store);/*
drivers/md/dm-table.c +1 -1
@@ -670,7 +670,7 @@ static int validate_hardware_logical_blo*/ unsigned short remaining =0 ; -struct dm_target *uninitialized_var (ti ); +struct dm_target *ti;struct queue_limits ti_limits;unsigned i;
drivers/md/raid5.c +1 -1
@@ -2601,7 +2601,7 @@ static void raid5_end_write_request(strustruct stripe_head *sh = bi->bi_private;struct r5conf *conf = sh->raid_conf;int disks = sh->disks, i; -struct md_rdev *uninitialized_var (rdev ); +struct md_rdev *rdev;sector_t first_bad;int bad_sectors;int replacement =0 ;
drivers/media/dvb-frontends/rtl2832.c +1 -1
@@ -653,7 +653,7 @@ static int rtl2832_read_status(struct dvstruct i2c_client *client = dev->client;struct dtv_frontend_properties *c = &fe->dtv_property_cache;int ret; -u32 uninitialized_var (tmp ); +u32 tmp;u8 u8tmp, buf[2 ];u16 u16tmp;
drivers/media/usb/gspca/vicam.c +1 -1
@@ -234,7 +234,7 @@ static int sd_init(struct gspca_dev *gsp {int ret;const struct ihex_binrec *rec; -const struct firmware *uninitialized_var (fw ); +const struct firmware *fw;u8 *firmware_buf; ret = request_ihex_firmware(&fw, VICAM_FIRMWARE,
drivers/media/usb/uvc/uvc_video.c +4 -4
@@ -766,9 +766,9 @@ static void uvc_video_stats_decode(strucunsigned int header_size;bool has_pts = false;bool has_scr = false; -u16 uninitialized_var (scr_sof ); -u32 uninitialized_var (scr_stc ); -u32 uninitialized_var (pts ); +u16 scr_sof; +u32 scr_stc; +u32 pts;if (stream->stats.stream.nb_frames ==0 && stream->stats.frame.nb_packets ==0 )
@@ -1656,7 +1656,7 @@ static int uvc_init_video(struct uvc_strstruct usb_host_endpoint *best_ep =NULL ;unsigned int best_psize =UINT_MAX ;unsigned int bandwidth; -unsigned int uninitialized_var (altsetting ); +unsigned int altsetting;int intfnum = stream->intfnum;/* Isochronous endpoint, select the alternate setting. */
drivers/memstick/host/jmb38x_ms.c +1 -1
@@ -315,7 +315,7 @@ static int jmb38x_ms_transfer_data(struc }while (length) { -unsigned int uninitialized_var (p_off ); +unsigned int p_off;if (host->req->long_data) { pg = nth_page(sg_page(&host->req->sg),
drivers/memstick/host/tifm_ms.c +1 -1
@@ -200,7 +200,7 @@ static unsigned int tifm_ms_transfer_dat host->block_pos);while (length) { -unsigned int uninitialized_var (p_off ); +unsigned int p_off;if (host->req->long_data) { pg = nth_page(sg_page(&host->req->sg),
drivers/mmc/host/sdhci.c +1 -1
@@ -374,7 +374,7 @@ static void sdhci_read_block_pio(struct {unsigned long flags;size_t blksize, len, chunk; -u32 uninitialized_var (scratch ); +u32 scratch;u8 *buf;DBG ("PIO reading\n" );
drivers/mtd/ubi/eba.c +1 -1
@@ -595,7 +595,7 @@ int ubi_eba_read_leb(struct ubi_device *int err, pnum, scrub =0 , vol_id = vol->vol_id;struct ubi_vid_io_buf *vidb;struct ubi_vid_hdr *vid_hdr; -uint32_t uninitialized_var (crc ); +uint32_t crc; err =leb_read_lock (ubi, vol_id, lnum);if (err)
drivers/net/can/janz-ican3.c +1 -1
@@ -1455,7 +1455,7 @@ static int ican3_napi(struct napi_struct/* process all communication messages */ while (true) { -struct ican3_msg uninitialized_var (msg ); +struct ican3_msg msg; ret =ican3_recv_msg (mod, &msg);if (ret)break ;
drivers/net/ethernet/broadcom/bnx2.c +2 -2
@@ -1460,7 +1460,7 @@ bnx2_test_and_disable_2g5(struct bnx2 *bstatic void bnx2_enable_forced_2g5 (struct bnx2 *bp) { -u32 uninitialized_var (bmcr ); +u32 bmcr;int err;if (!(bp->phy_flags &BNX2_PHY_FLAG_2_5G_CAPABLE ))
@@ -1504,7 +1504,7 @@ bnx2_enable_forced_2g5(struct bnx2 *bp)static void bnx2_disable_forced_2g5 (struct bnx2 *bp) { -u32 uninitialized_var (bmcr ); +u32 bmcr;int err;if (!(bp->phy_flags &BNX2_PHY_FLAG_2_5G_CAPABLE ))
drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c +2 -2
@@ -471,8 +471,8 @@ void mlx5_core_req_pages_handler(structint mlx5_satisfy_startup_pages (struct mlx5_core_dev *dev,int boot) { -u16 uninitialized_var (func_id ); -s32 uninitialized_var (npages ); +u16 func_id; +s32 npages;int err; err =mlx5_cmd_query_pages (dev, &func_id, &npages, boot);
drivers/net/ethernet/neterion/s2io.c +1 -1
@@ -7296,7 +7296,7 @@ static int rx_osm_handler(struct ring_inint ring_no = ring_data->ring_no;u16 l3_csum, l4_csum;unsigned long long err = rxdp->Control_1 &RXD_T_CODE ; -struct lro *uninitialized_var (lro ); +struct lro *lro;u8 err_mask;struct swStat *swstats = &sp->mac_control.stats_info->sw_stat;
drivers/net/ethernet/qlogic/qla3xxx.c +1 -1
@@ -3770,7 +3770,7 @@ static int ql3xxx_probe(struct pci_dev *struct net_device *ndev =NULL ;struct ql3_adapter *qdev =NULL ;static int cards_found; -int uninitialized_var (pci_using_dac ), err; +int pci_using_dac, err; err =pci_enable_device (pdev);if (err) {
drivers/net/ethernet/sun/cassini.c +1 -1
@@ -2303,7 +2303,7 @@ static int cas_rx_ringN(struct cas *cp, drops =0 ;while (1 ) {struct cas_rx_comp *rxc = rxcs + entry; -struct sk_buff *uninitialized_var (skb ); +struct sk_buff *skb;int type, len;u64 words[4 ];int i, dring;
drivers/net/ethernet/sun/niu.c +3 -3
@@ -428,7 +428,7 @@ static int serdes_init_niu_1g_serdes(strstruct niu_link_config *lp = &np->link_config;u16 pll_cfg, pll_sts;int max_retry =100 ; -u64 uninitialized_var (sig ), mask, val; +u64 sig, mask, val;u32 tx_cfg, rx_cfg;unsigned long i;int err;
@@ -525,7 +525,7 @@ static int serdes_init_niu_10g_serdes(ststruct niu_link_config *lp = &np->link_config;u32 tx_cfg, rx_cfg, pll_cfg, pll_sts;int max_retry =100 ; -u64 uninitialized_var (sig ), mask, val; +u64 sig, mask, val;unsigned long i;int err;
@@ -713,7 +713,7 @@ static int esr_write_glue0(struct niu *nstatic int esr_reset (struct niu *np) { -u32 uninitialized_var (reset ); +u32 reset;int err; err = mdio_write(np, np->port, NIU_ESR_DEV_ADDR,
drivers/net/wan/z85230.c +1 -1
@@ -705,7 +705,7 @@ EXPORT_SYMBOL(z8530_nop);irqreturn_t z8530_interrupt (int irq,void *dev_id) {struct z8530_dev *dev=dev_id; -u8 uninitialized_var (intr ); +u8 intr;static volatile int locker=0 ;int work=0 ;struct z8530_irqhandler *irqs;
drivers/net/wireless/ath/ath10k/core.c +1 -1
@@ -1657,7 +1657,7 @@ static int ath10k_init_uart(struct ath10static int ath10k_init_hw_params (struct ath10k *ar) { -const struct ath10k_hw_params *uninitialized_var (hw_params ); +const struct ath10k_hw_params *hw_params;int i;for (i =0 ; i <ARRAY_SIZE (ath10k_hw_params_list); i++) {
drivers/net/wireless/ath/ath6kl/init.c +1 -1
@@ -1575,7 +1575,7 @@ static int ath6kl_init_upload(struct athint ath6kl_init_hw_params (struct ath6kl *ar) { -const struct ath6kl_hw *uninitialized_var (hw ); +const struct ath6kl_hw *hw;int i;for (i =0 ; i <ARRAY_SIZE (hw_list); i++) {
drivers/net/wireless/ath/ath9k/init.c +1 -1
@@ -175,7 +175,7 @@ static unsigned int ath9k_reg_rmw(void *struct ath_hw *ah = (struct ath_hw *) hw_priv;struct ath_common *common =ath9k_hw_common (ah);struct ath_softc *sc = (struct ath_softc *) common->priv; -unsigned long uninitialized_var (flags ); +unsigned long flags;u32 val;if (NR_CPUS >1 && ah->config.serialize_regmode ==SER_REG_MODE_ON ) {
drivers/net/wireless/broadcom/b43/debugfs.c +1 -1
@@ -506,7 +506,7 @@ static ssize_t b43_debugfs_read(struct fstruct b43_wldev *dev;struct b43_debugfs_fops *dfops;struct b43_dfs_file *dfile; -ssize_t uninitialized_var (ret ); +ssize_t ret;char *buf;const size_t bufsize =1024 *16 ;/* 16 kiB buffer */ const size_t buforder =get_order (bufsize);
drivers/net/wireless/broadcom/b43/dma.c +1 -1
@@ -50,7 +50,7 @@static u32 b43_dma_address (struct b43_dma *dma,dma_addr_t dmaaddr,enum b43_addrtype addrtype) { -u32 uninitialized_var (addr ); +u32 addr;switch (addrtype) {case B43_DMA_ADDR_LOW :
drivers/net/wireless/broadcom/b43/lo.c +1 -1
@@ -742,7 +742,7 @@ struct b43_lo_calib *b43_calibrate_lo_se };int max_rx_gain;struct b43_lo_calib *cal; -struct lo_g_saved_values uninitialized_var (saved_regs ); +struct lo_g_saved_values saved_regs;/* Values from the "TXCTL Register and Value Table" */ u16 txctl_reg;u16 txctl_value;
drivers/net/wireless/broadcom/b43/phy_n.c +1 -1
@@ -5655,7 +5655,7 @@ static int b43_nphy_rev2_cal_rx_iq(strucu8 rfctl[2 ];u8 afectl_core;u16 tmp[6 ]; -u16 uninitialized_var (cur_hpf1 ),uninitialized_var (cur_hpf2 ), cur_lna; +u16 cur_hpf1, cur_hpf2, cur_lna;u32 real, imag;enum nl80211_band band;
drivers/net/wireless/broadcom/b43/xmit.c +6 -6
@@ -435,10 +435,10 @@ int b43_generate_txhdr(struct b43_wldevif ((rates[0 ].flags &IEEE80211_TX_RC_USE_RTS_CTS ) || (rates[0 ].flags &IEEE80211_TX_RC_USE_CTS_PROTECT )) {unsigned int len; -struct ieee80211_hdr *uninitialized_var (hdr ); +struct ieee80211_hdr *hdr;int rts_rate, rts_rate_fb;int rts_rate_ofdm, rts_rate_fb_ofdm; -struct b43_plcp_hdr6 *uninitialized_var (plcp ); +struct b43_plcp_hdr6 *plcp;struct ieee80211_rate *rts_cts_rate; rts_cts_rate =ieee80211_get_rts_cts_rate (dev->wl->hw, info);
@@ -449,7 +449,7 @@ int b43_generate_txhdr(struct b43_wldev rts_rate_fb_ofdm =b43_is_ofdm_rate (rts_rate_fb);if (rates[0 ].flags &IEEE80211_TX_RC_USE_CTS_PROTECT ) { -struct ieee80211_cts *uninitialized_var (cts ); +struct ieee80211_cts *cts;switch (dev->fw.hdr_format) {case B43_FW_HDR_598 :
@@ -471,7 +471,7 @@ int b43_generate_txhdr(struct b43_wldev mac_ctl |=B43_TXH_MAC_SENDCTS ; len =sizeof (struct ieee80211_cts ); }else { -struct ieee80211_rts *uninitialized_var (rts ); +struct ieee80211_rts *rts;switch (dev->fw.hdr_format) {case B43_FW_HDR_598 :
@@ -663,8 +663,8 @@ void b43_rx(struct b43_wldev *dev, strucconst struct b43_rxhdr_fw4 *rxhdr = _rxhdr;__le16 fctl;u16 phystat0, phystat3; -u16 uninitialized_var (chanstat ),uninitialized_var (mactime ); -u32 uninitialized_var (macstat ); +u16 chanstat, mactime; +u32 macstat;u16 chanid;int padding, rate_idx;
drivers/net/wireless/broadcom/b43legacy/debugfs.c +1 -1
@@ -203,7 +203,7 @@ static ssize_t b43legacy_debugfs_read(ststruct b43legacy_wldev *dev;struct b43legacy_debugfs_fops *dfops;struct b43legacy_dfs_file *dfile; -ssize_t uninitialized_var (ret ); +ssize_t ret;char *buf;const size_t bufsize =1024 *16 ;/* 16 KiB buffer */ const size_t buforder =get_order (bufsize);
drivers/net/wireless/broadcom/b43legacy/main.c +1 -1
@@ -2612,7 +2612,7 @@ static void b43legacy_put_phy_into_resetstatic int b43legacy_switch_phymode (struct b43legacy_wl *wl,unsigned int new_mode) { -struct b43legacy_wldev *uninitialized_var (up_dev ); +struct b43legacy_wldev *up_dev;struct b43legacy_wldev *down_dev;int err;bool gmode = false;
drivers/net/wireless/intel/iwlegacy/3945.c +1 -1
@@ -2117,7 +2117,7 @@ il3945_txpower_set_from_eeprom(struct il/* set tx power value for all OFDM rates */ for (rate_idx =0 ; rate_idx <IL_OFDM_RATES ; rate_idx++) { -s32 uninitialized_var (power_idx ); +s32 power_idx;int rc;/* use channel group's clip-power table,
drivers/net/wireless/intel/iwlegacy/4965-mac.c +1 -1
@@ -2787,7 +2787,7 @@ il4965_hdl_tx(struct il_priv *il, structstruct ieee80211_tx_info *info;struct il4965_tx_resp *tx_resp = (void *)&pkt->u.raw[0 ];u32 status =le32_to_cpu (tx_resp->u.status); -int uninitialized_var (tid ); +int tid;int sta_id;int freed;u8 *qc =NULL ;
drivers/platform/x86/hdaps.c +2 -2
@@ -378,7 +378,7 @@ static ssize_t hdaps_variance_show(strucstatic ssize_t hdaps_temp1_show (struct device *dev,struct device_attribute *attr,char *buf) { -u8 uninitialized_var (temp ); +u8 temp;int ret; ret =hdaps_readb_one (HDAPS_PORT_TEMP1 , &temp);
@@ -391,7 +391,7 @@ static ssize_t hdaps_temp1_show(struct dstatic ssize_t hdaps_temp2_show (struct device *dev,struct device_attribute *attr,char *buf) { -u8 uninitialized_var (temp ); +u8 temp;int ret; ret =hdaps_readb_one (HDAPS_PORT_TEMP2 , &temp);
drivers/scsi/dc395x.c +1 -1
@@ -4279,7 +4279,7 @@ static int adapter_sg_tables_alloc(strucconst unsigned srbs_per_page =PAGE_SIZE /SEGMENTX_LEN ;int srb_idx =0 ;unsigned i =0 ; -struct SGentry *uninitialized_var (ptr ); +struct SGentry *ptr;for (i =0 ; i < DC395x_MAX_SRB_CNT; i++) acb->srb_array[i].segment_x =NULL ;
drivers/scsi/pm8001/pm8001_hwi.c +1 -1
@@ -4165,7 +4165,7 @@ static int process_oq(struct pm8001_hba_ {struct outbound_queue_table *circularQ;void *pMsg1 =NULL ; -u8 uninitialized_var (bc ); +u8 bc;u32 ret =MPI_IO_STATUS_FAIL ;unsigned long flags;
drivers/scsi/pm8001/pm80xx_hwi.c +1 -1
@@ -3776,7 +3776,7 @@ static int process_oq(struct pm8001_hba_ {struct outbound_queue_table *circularQ;void *pMsg1 =NULL ; -u8 uninitialized_var (bc ); +u8 bc;u32 ret =MPI_IO_STATUS_FAIL ;unsigned long flags;u32 regval;
drivers/ssb/driver_chipcommon.c +2 -2
@@ -119,7 +119,7 @@ void ssb_chipco_set_clockmode(struct ssbstatic enum ssb_clksrc chipco_pctl_get_slowclksrc (struct ssb_chipcommon *cc) {struct ssb_bus *bus = cc->dev->bus; -u32 uninitialized_var (tmp ); +u32 tmp;if (cc->dev->id.revision <6 ) { if (bus->bustype == SSB_BUSTYPE_SSB ||
@@ -149,7 +149,7 @@ static enum ssb_clksrc chipco_pctl_get_s/* Get maximum or minimum (depending on get_max flag) slowclock frequency. */ static int chipco_pctl_clockfreqlimit (struct ssb_chipcommon *cc,int get_max) { -int uninitialized_var (limit ); +int limit;enum ssb_clksrc clocksrc;int divisor =1 ;u32 tmp;
drivers/tty/cyclades.c +1 -1
@@ -3651,7 +3651,7 @@ static int cy_pci_probe(struct pci_dev *struct cyclades_card *card;void __iomem *addr0 =NULL , *addr2 =NULL ;char *card_name =NULL ; -u32 uninitialized_var (mailbox ); +u32 mailbox;unsigned int device_id, nchan =0 , card_no, i, j;unsigned char plx_ver;int retval, irq;
drivers/tty/isicom.c +1 -1
@@ -1545,7 +1545,7 @@ static unsigned int card_count;static int isicom_probe (struct pci_dev *pdev,const struct pci_device_id *ent) { -unsigned int uninitialized_var (signature ), index; +unsigned int signature, index;int retval = -EPERM ;struct isi_board *board =NULL ;
drivers/usb/musb/cppi_dma.c +1 -1
@@ -1145,7 +1145,7 @@ irqreturn_t cppi_interrupt(int irq, voidstruct musb_hw_ep *hw_ep =NULL ;u32 rx, tx;int i, index; -unsigned long uninitialized_var (flags ); +unsigned long flags; cppi = container_of(musb->dma_controller, struct cppi, controller);if (cppi->irq)
drivers/usb/storage/sddr55.c +2 -2
@@ -566,8 +566,8 @@ static int sddr55_reset(struct us_data *static unsigned long sddr55_get_capacity (struct us_data *us) { -unsigned char uninitialized_var (manufacturerID ); -unsigned char uninitialized_var (deviceID ); +unsigned char manufacturerID; +unsigned char deviceID;int result;struct sddr55_card_info *info = (struct sddr55_card_info *)us->extra;
drivers/vhost/net.c +2 -2
@@ -678,7 +678,7 @@ static int get_rx_bufs(struct vhost_virt/* len is always initialized before use since we are always called with * datalen > 0. */ -u32 uninitialized_var (len ); +u32 len;while (datalen >0 && headcount < quota) {if (unlikely (seg >=UIO_MAXIOV )) {
@@ -735,7 +735,7 @@ static void handle_rx(struct vhost_net * {struct vhost_net_virtqueue *nvq = &net->vqs[VHOST_NET_VQ_RX ];struct vhost_virtqueue *vq = &nvq->vq; -unsigned uninitialized_var (in ), log; +unsigned in, log;struct vhost_log *vq_log;struct msghdr msg = { .msg_name =NULL ,
drivers/video/fbdev/matrox/matroxfb_maven.c +3 -3
@@ -299,7 +299,7 @@ static int matroxfb_mavenclock(const str unsigned int* in, unsigned int* feed, unsigned int* post, unsigned int* htotal2) { unsigned int fvco; -unsigned int uninitialized_var (p ); +unsigned int p; fvco =matroxfb_PLL_mavenclock (&maven1000_pll, ctl, htotal, vtotal, in, feed, &p, htotal2);if (!fvco)
@@ -731,8 +731,8 @@ static int maven_find_exact_clocks(unsigfor (x =0 ; x <8 ; x++) {unsigned int c; -unsigned int uninitialized_var (a ),uninitialized_var (b ), -uninitialized_var (h2 ); +unsigned int a, b, + h2;unsigned int h = ht +2 + x;if (!matroxfb_mavenclock ((m->mode ==MATROXFB_OUTPUT_MODE_PAL ) ? &maven_PAL : &maven_NTSC, h, vt, &a, &b, &c, &h2)) {
drivers/video/fbdev/pm3fb.c +3 -3
@@ -821,9 +821,9 @@ static void pm3fb_write_mode(struct fb_iwmb (); { -unsigned char uninitialized_var (m );/* ClkPreScale */ -unsigned char uninitialized_var (n );/* ClkFeedBackScale */ -unsigned char uninitialized_var (p );/* ClkPostScale */ +unsigned char m;/* ClkPreScale */ +unsigned char n;/* ClkFeedBackScale */ +unsigned char p;/* ClkPostScale */ unsigned long pixclock =PICOS2KHZ (info->var.pixclock); (void )pm3fb_calculate_clock (pixclock, &m, &n, &p);
drivers/video/fbdev/riva/riva_hw.c +1 -2
@@ -1242,8 +1242,7 @@ int CalcStateExt ) {int pixelDepth; -int uninitialized_var (VClk ),uninitialized_var (m ), -uninitialized_var (n ),uninitialized_var (p ); +int VClk, m, n, p;/* * Save mode parameters.
drivers/virtio/virtio_ring.c +1 -1
@@ -269,7 +269,7 @@ static inline int virtqueue_add(struct vstruct vring_virtqueue *vq =to_vvq (_vq);struct scatterlist *sg;struct vring_desc *desc; -unsigned int i, n, avail, descs_used,uninitialized_var (prev ), err_idx; +unsigned int i, n, avail, descs_used, prev, err_idx;int head;bool indirect;
fs/afs/dir.c +1 -1
@@ -579,7 +579,7 @@ success:static int afs_d_revalidate (struct dentry *dentry,unsigned int flags) {struct afs_vnode *vnode, *dir; -struct afs_fid uninitialized_var (fid ); +struct afs_fid fid;struct dentry *parent;struct key *key;void *dir_version;
fs/afs/security.c +1 -1
@@ -288,7 +288,7 @@ static int afs_check_permit(struct afs_vint afs_permission (struct inode *inode,int mask) {struct afs_vnode *vnode =AFS_FS_I (inode); -afs_access_t uninitialized_var (access ); +afs_access_t access;struct key *key;int ret;
fs/dlm/netlink.c +1 -1
@@ -115,7 +115,7 @@ static void fill_data(struct dlm_lock_davoid dlm_timeout_warn (struct dlm_lkb *lkb) { -struct sk_buff *uninitialized_var (send_skb ); +struct sk_buff *send_skb;struct dlm_lock_data *data;size_t size;int rv;
fs/fat/dir.c +1 -1
@@ -1287,7 +1287,7 @@ int fat_add_entries(struct inode *dir, vstruct super_block *sb = dir->i_sb;struct msdos_sb_info *sbi =MSDOS_SB (sb);struct buffer_head *bh, *prev, *bhs[3 ];/* 32*slots (672bytes) */ -struct msdos_dir_entry *uninitialized_var (de ); +struct msdos_dir_entry *de;int err, free_slots, i, nr_bhs;loff_t pos, i_pos;
fs/fuse/control.c +1 -1
@@ -117,7 +117,7 @@ static ssize_t fuse_conn_max_background_const char __user *buf, size_t count, loff_t *ppos) { - unsigned uninitialized_var(val); + unsigned val;ssize_t ret; ret = fuse_conn_limit_write(file, buf, count, ppos, &val,
fs/fuse/cuse.c +1 -1
@@ -268,7 +268,7 @@ static int cuse_parse_one(char **pp, chastatic int cuse_parse_devinfo (char *p,size_t len,struct cuse_devinfo *devinfo) {char *end = p + len; -char *uninitialized_var (key ), *uninitialized_var (val ); +char *key, *val;int rc;while (true) {
fs/fuse/file.c +1 -1
@@ -2770,7 +2770,7 @@ static void fuse_register_polled_file(st {spin_lock (&fc->lock);if (RB_EMPTY_NODE (&ff->polled_node)) { -struct rb_node **link, *uninitialized_var (parent ); +struct rb_node **link, *parent; link =fuse_find_polled_node (fc, ff->kh, &parent);BUG_ON (*link);
fs/gfs2/aops.c +1 -1
@@ -379,7 +379,7 @@ static int gfs2_write_cache_jdata(structint done =0 ;struct pagevec pvec;int nr_pages; -pgoff_t uninitialized_var (writeback_index ); +pgoff_t writeback_index;pgoff_t index;pgoff_t end;pgoff_t done_index;
fs/hfsplus/unicode.c +1 -1
@@ -351,7 +351,7 @@ int hfsplus_hash_dentry(const struct den astr = str->name; len = str->len;while (len >0 ) { -int uninitialized_var (dsize ); +int dsize; size =asc2unichar (sb, astr, len, &c); astr += size; len -= size;
fs/isofs/namei.c +2 -2
@@ -153,8 +153,8 @@ isofs_find_entry(struct inode *dir, strustruct dentry *isofs_lookup (struct inode *dir,struct dentry *dentry,unsigned int flags) {int found; -unsigned long uninitialized_var (block ); -unsigned long uninitialized_var (offset ); +unsigned long block; +unsigned long offset;struct inode *inode;struct page *page;
fs/jffs2/erase.c +1 -1
@@ -428,7 +428,7 @@ static void jffs2_mark_erased_block(stru {size_t retlen;int ret; -uint32_t uninitialized_var (bad_offset ); +uint32_t bad_offset;switch (jffs2_block_check_erase (c, jeb, &bad_offset)) {case -EAGAIN : goto refile;
fs/nfsd/nfsctl.c +1 -1
@@ -347,7 +347,7 @@ static ssize_t write_unlock_fs(struct fistatic ssize_t write_filehandle (struct file *file,char *buf,size_t size) {char *dname, *path; -int uninitialized_var (maxsize ); +int maxsize;char *mesg = buf;int len;struct auth_domain *dom;
fs/ocfs2/alloc.c +2 -2
@@ -4699,7 +4699,7 @@ int ocfs2_insert_extent(handle_t *handle struct ocfs2_alloc_context *meta_ac) {int status; -int uninitialized_var (free_records ); +int free_records;struct buffer_head *last_eb_bh =NULL ;struct ocfs2_insert_type insert = {0 , };struct ocfs2_extent_rec rec;
@@ -6889,7 +6889,7 @@ int ocfs2_convert_inline_data_to_extentsint need_free =0 ;u32 bit_off, num;handle_t *handle; -u64 uninitialized_var (block ); +u64 block;struct ocfs2_inode_info *oi =OCFS2_I (inode);struct ocfs2_super *osb =OCFS2_SB (inode->i_sb);struct ocfs2_dinode *di = (struct ocfs2_dinode *)di_bh->b_data;
fs/ocfs2/dir.c +7 -7
@@ -865,9 +865,9 @@ static int ocfs2_dx_dir_lookup(struct in u64 *ret_phys_blkno) {int ret =0 ; -unsigned int cend,uninitialized_var (clen ); -u32 uninitialized_var (cpos ); -u64 uninitialized_var (blkno ); +unsigned int cend, clen; +u32 cpos; +u64 blkno;u32 name_hash = hinfo->major_hash; ret = ocfs2_dx_dir_lookup_rec(inode, el, name_hash, &cpos, &blkno,
@@ -911,7 +911,7 @@ static int ocfs2_dx_dir_search(const cha struct ocfs2_dir_lookup_result *res) {int ret, i, found; -u64 uninitialized_var (phys ); +u64 phys;struct buffer_head *dx_leaf_bh =NULL ;struct ocfs2_dx_leaf *dx_leaf;struct ocfs2_dx_entry *dx_entry =NULL ;
@@ -4419,9 +4419,9 @@ out:int ocfs2_dx_dir_truncate (struct inode *dir,struct buffer_head *di_bh) {int ret; -unsigned int uninitialized_var (clen ); -u32 major_hash =UINT_MAX , p_cpos,uninitialized_var (cpos ); -u64 uninitialized_var (blkno ); +unsigned int clen; +u32 major_hash =UINT_MAX , p_cpos, cpos; +u64 blkno;struct ocfs2_super *osb =OCFS2_SB (dir->i_sb);struct buffer_head *dx_root_bh =NULL ;struct ocfs2_dx_root_block *dx_root;
fs/ocfs2/extent_map.c +2 -2
@@ -415,7 +415,7 @@ static int ocfs2_get_clusters_nocache(st {int i, ret, tree_height, len;struct ocfs2_dinode *di; -struct ocfs2_extent_block *uninitialized_var (eb ); +struct ocfs2_extent_block *eb;struct ocfs2_extent_list *el;struct ocfs2_extent_rec *rec;struct buffer_head *eb_bh =NULL ;
@@ -612,7 +612,7 @@ int ocfs2_get_clusters(struct inode *ino unsigned int *extent_flags) {int ret; -unsigned int uninitialized_var (hole_len ), flags =0 ; +unsigned int hole_len, flags =0 ;struct buffer_head *di_bh =NULL ;struct ocfs2_extent_rec rec;
fs/ocfs2/namei.c +1 -1
@@ -2506,7 +2506,7 @@ int ocfs2_create_inode_in_orphan(structstruct buffer_head *new_di_bh =NULL ;struct ocfs2_alloc_context *inode_ac =NULL ;struct ocfs2_dir_lookup_result orphan_insert = {NULL , }; -u64 uninitialized_var (di_blkno ), suballoc_loc; +u64 di_blkno, suballoc_loc;u16 suballoc_bit; status =ocfs2_inode_lock (dir, &parent_di_bh,1 );
fs/ocfs2/refcounttree.c +1 -1
@@ -1069,7 +1069,7 @@ static int ocfs2_get_refcount_rec(struct struct buffer_head **ret_bh) {int ret =0 , i, found; -u32 low_cpos,uninitialized_var (cpos_end ); +u32 low_cpos, cpos_end;struct ocfs2_extent_list *el;struct ocfs2_extent_rec *rec =NULL ;struct ocfs2_extent_block *eb =NULL ;
fs/ocfs2/xattr.c +1 -1
@@ -1218,7 +1218,7 @@ static int ocfs2_xattr_block_get(structstruct ocfs2_xattr_value_root *xv;size_t size;int ret = -ENODATA , name_offset, name_len, i; -int uninitialized_var (block_off ); +int block_off; xs->bucket =ocfs2_xattr_bucket_new (inode);if (!xs->bucket) {
fs/omfs/file.c +1 -1
@@ -220,7 +220,7 @@ static int omfs_get_block(struct inode *struct buffer_head *bh;sector_t next, offset;int ret; -u64 uninitialized_var (new_block ); +u64 new_block;u32 max_extents;int extent_count;struct omfs_extent *oe;
fs/ubifs/commit.c +3 -3
@@ -564,11 +564,11 @@ out:*/ int dbg_check_old_index (struct ubifs_info *c,struct ubifs_zbranch *zroot) { -int lnum, offs, len, err =0 ,uninitialized_var (last_level ), child_cnt; +int lnum, offs, len, err =0 , last_level, child_cnt;int first =1 , iip;struct ubifs_debug_info *d = c->dbg; -union ubifs_key uninitialized_var (lower_key ), upper_key, l_key, u_key; -unsigned long long uninitialized_var (last_sqnum ); +union ubifs_key lower_key, upper_key, l_key, u_key; +unsigned long long last_sqnum;struct ubifs_idx_node *idx;struct list_head list;struct idx_node *i;
fs/ubifs/file.c +2 -2
@@ -233,7 +233,7 @@ static int write_begin_slow(struct addrestruct ubifs_info *c = inode->i_sb->s_fs_info;pgoff_t index = pos >>PAGE_SHIFT ;struct ubifs_budget_req req = { .new_page =1 }; -int uninitialized_var (err ), appending = !!(pos + len > inode->i_size); +int err, appending = !!(pos + len > inode->i_size);struct page *page; dbg_gen("ino %lu, pos %llu, len %u, i_size %lld",
@@ -437,7 +437,7 @@ static int ubifs_write_begin(struct filestruct ubifs_info *c = inode->i_sb->s_fs_info;struct ubifs_inode *ui =ubifs_inode (inode);pgoff_t index = pos >>PAGE_SHIFT ; -int uninitialized_var (err ), appending = !!(pos + len > inode->i_size); +int err, appending = !!(pos + len > inode->i_size);int skipped_read =0 ;struct page *page;
fs/ubifs/journal.c +1 -1
@@ -1355,7 +1355,7 @@ int ubifs_jnl_truncate(struct ubifs_infounion ubifs_key key, to_key;struct ubifs_ino_node *ino;struct ubifs_trun_node *trun; -struct ubifs_data_node *uninitialized_var (dn ); +struct ubifs_data_node *dn;int err, dlen, len, lnum, offs, bit, sz, sync =IS_SYNC (inode);struct ubifs_inode *ui =ubifs_inode (inode);ino_t inum = inode->i_ino;
fs/ubifs/lpt.c +1 -1
@@ -285,7 +285,7 @@ uint32_t ubifs_unpack_bits(uint8_t **addconst int k =32 - nrbits;uint8_t *p = *addr;int b = *pos; -uint32_t uninitialized_var (val ); +uint32_t val;const int bytes = (nrbits + b +7 ) >>3 ;ubifs_assert (nrbits >0 );
fs/ubifs/tnc.c +3 -3
@@ -899,7 +899,7 @@ static int fallible_resolve_collision(st int adding) {struct ubifs_znode *o_znode =NULL , *znode = *zn; -int uninitialized_var (o_n ), err, cmp, unsure =0 , nn = *n; +int o_n, err, cmp, unsure =0 , nn = *n; cmp =fallible_matches_name (c, &znode->zbranch[nn], nm);if (unlikely (cmp <0 ))
@@ -1520,8 +1520,8 @@ out:*/ int ubifs_tnc_get_bu_keys (struct ubifs_info *c,struct bu_info *bu) { -int n, err =0 , lnum =-1 ,uninitialized_var (offs ); -int uninitialized_var (len ); +int n, err =0 , lnum =-1 , offs; +int len;unsigned int block =key_block (c, &bu->key);struct ubifs_znode *znode;
fs/ubifs/tnc_misc.c +2 -2
@@ -136,8 +136,8 @@ int ubifs_search_zbranch(const struct ubconst struct ubifs_znode *znode, const union ubifs_key *key, int *n) { - int beg = 0, end = znode->child_cnt, uninitialized_var(mid); -int uninitialized_var (cmp ); + int beg = 0, end = znode->child_cnt, mid; +int cmp;const struct ubifs_zbranch *zbr = &znode->zbranch[0 ];ubifs_assert (end > beg);
fs/udf/balloc.c +1 -1
@@ -552,7 +552,7 @@ static int udf_table_new_block(struct suuint32_t spread =0xFFFFFFFF , nspread =0xFFFFFFFF ;uint32_t newblock =0 , adsize;uint32_t elen, goal_elen =0 ; -struct kernel_lb_addr eloc,uninitialized_var (goal_eloc ); +struct kernel_lb_addr eloc, goal_eloc;struct extent_position epos, goal_epos;int8_t etype;struct udf_inode_info *iinfo =UDF_I (table);
fs/xfs/xfs_bmap_util.c +1 -1
@@ -140,7 +140,7 @@ xfs_bmap_rtalloc(* pick an extent that will space things out in the rt area. */ if (ap->eof && ap->offset ==0 ) { -xfs_rtblock_t uninitialized_var (rtx );/* realtime extent no */ +xfs_rtblock_t rtx;/* realtime extent no */ error =xfs_rtpick_extent (mp, ap->tp, ralen, &rtx);if (error)
kernel/async.c +2 -2
@@ -115,7 +115,7 @@ static void async_run_entry_fn(struct wostruct async_entry *entry = container_of(work, struct async_entry, work);unsigned long flags; -ktime_t uninitialized_var (calltime ), delta, rettime; +ktime_t calltime, delta, rettime;/* 1) run (and print duration) */ if (initcall_debug && system_state <SYSTEM_RUNNING ) {
@@ -283,7 +283,7 @@ EXPORT_SYMBOL_GPL(async_synchronize_full*/ void async_synchronize_cookie_domain (async_cookie_t cookie,struct async_domain *domain) { -ktime_t uninitialized_var (starttime ), delta, endtime; +ktime_t starttime, delta, endtime;if (initcall_debug && system_state <SYSTEM_RUNNING ) {pr_debug ("async_waiting @ %i\n" ,task_pid_nr (current));
kernel/audit.c +1 -1
@@ -1728,7 +1728,7 @@ struct audit_buffer *audit_log_start(str {struct audit_buffer *ab;struct timespec64 t; -unsigned int uninitialized_var (serial ); +unsigned int serial;if (audit_initialized !=AUDIT_INITIALIZED )return NULL ;
kernel/events/core.c +1 -1
@@ -10043,7 +10043,7 @@ SYSCALL_DEFINE5(perf_event_open,struct perf_event *group_leader =NULL , *output_event =NULL ;struct perf_event *event, *sibling;struct perf_event_attr attr; -struct perf_event_context *ctx, *uninitialized_var (gctx ); +struct perf_event_context *ctx, *gctx;struct file *event_file =NULL ;struct fd group = {NULL ,0 };struct task_struct *task =NULL ;
kernel/events/uprobes.c +1 -1
@@ -1883,7 +1883,7 @@ static void handle_swbp(struct pt_regs * {struct uprobe *uprobe;unsigned long bp_vaddr; -int uninitialized_var (is_swbp ); +int is_swbp; bp_vaddr =uprobe_get_swbp_addr (regs);if (bp_vaddr ==get_trampoline_vaddr ())
kernel/exit.c +1 -1
@@ -139,7 +139,7 @@ static void __exit_signal(struct task_ststruct signal_struct *sig = tsk->signal;bool group_dead =thread_group_leader (tsk);struct sighand_struct *sighand; -struct tty_struct *uninitialized_var (tty ); +struct tty_struct *tty;u64 utime, stime; sighand = rcu_dereference_check(tsk->sighand,
kernel/futex.c +6 -6
@@ -1416,7 +1416,7 @@ static int lookup_pi_state(u32 __user *ustatic int lock_pi_update_atomic (u32 __user *uaddr,u32 uval,u32 newval) {int err; -u32 uninitialized_var (curval ); +u32 curval;if (unlikely (should_fail_futex (true)))return -EFAULT ;
@@ -1587,7 +1587,7 @@ static void mark_wake_futex(struct wake_*/ static int wake_futex_pi (u32 __user *uaddr,u32 uval,struct futex_pi_state *pi_state) { -u32 uninitialized_var (curval ), newval; +u32 curval, newval;struct task_struct *new_owner;bool postunlock = false;DEFINE_WAKE_Q (wake_q);
@@ -3101,7 +3101,7 @@ uaddr_faulted:*/ static int futex_unlock_pi (u32 __user *uaddr,unsigned int flags) { -u32 uninitialized_var (curval ), uval, vpid =task_pid_vnr (current); +u32 curval, uval, vpid =task_pid_vnr (current);union futex_key key =FUTEX_KEY_INIT ;struct futex_hash_bucket *hb;struct futex_q *top_waiter;
@@ -3576,7 +3576,7 @@ err_unlock:static int handle_futex_death (u32 __user *uaddr,struct task_struct *curr,bool pi,bool pending_op) { -u32 uval,uninitialized_var (nval ), mval; +u32 uval, nval, mval;int err;/* Futex address must be 32bit aligned */
@@ -3706,7 +3706,7 @@ static void exit_robust_list(struct taskstruct robust_list_head __user *head = curr->robust_list;struct robust_list __user *entry, *next_entry, *pending;unsigned int limit =ROBUST_LIST_LIMIT , pi, pip; -unsigned int uninitialized_var (next_pi ); +unsigned int next_pi;unsigned long futex_offset;int rc;
@@ -4003,7 +4003,7 @@ static void compat_exit_robust_list(strustruct compat_robust_list_head __user *head = curr->compat_robust_list;struct robust_list __user *entry, *next_entry, *pending;unsigned int limit =ROBUST_LIST_LIMIT , pi, pip; -unsigned int uninitialized_var (next_pi ); +unsigned int next_pi;compat_uptr_t uentry, next_uentry, upending;compat_long_t futex_offset;int rc;
kernel/locking/lockdep.c +3 -3
@@ -1282,7 +1282,7 @@ static int noop_count(struct lock_list *static unsigned long __lockdep_count_forward_deps (struct lock_list *this) {unsigned long count =0 ; -struct lock_list *uninitialized_var (target_entry ); +struct lock_list *target_entry;__bfs_forwards (this, (void *)&count, noop_count, &target_entry);
@@ -1310,7 +1310,7 @@ unsigned long lockdep_count_forward_depsstatic unsigned long __lockdep_count_backward_deps (struct lock_list *this) {unsigned long count =0 ; -struct lock_list *uninitialized_var (target_entry ); +struct lock_list *target_entry;__bfs_backwards (this, (void *)&count, noop_count, &target_entry);
@@ -2706,7 +2706,7 @@ check_usage_backwards(struct task_struct {int ret;struct lock_list root; -struct lock_list *uninitialized_var (target_entry ); +struct lock_list *target_entry; root.parent =NULL ; root.class =hlock_class (this);
kernel/trace/ring_buffer.c +1 -1
@@ -531,7 +531,7 @@ static void rb_wake_up_waiters(struct ir*/ int ring_buffer_wait (struct ring_buffer *buffer,int cpu,bool full) { -struct ring_buffer_per_cpu *uninitialized_var (cpu_buffer ); +struct ring_buffer_per_cpu *cpu_buffer;DEFINE_WAIT (wait);struct rb_irq_work *work;int ret =0 ;
lib/radix-tree.c +1 -1
@@ -1499,7 +1499,7 @@ void *radix_tree_tag_clear(struct radix_ {struct radix_tree_node *node, *parent;unsigned long maxindex; -int uninitialized_var (offset ); +int offset;radix_tree_load_root (root, &node, &maxindex);if (index > maxindex)
mm/frontswap.c +1 -1
@@ -447,7 +447,7 @@ static int __frontswap_shrink(unsigned lvoid frontswap_shrink (unsigned long target_pages) {unsigned long pages_to_unuse =0 ; -int uninitialized_var (type ), ret; +int type, ret;/* * we don't want to hold swap_lock while doing a very
mm/ksm.c +1 -1
@@ -2349,7 +2349,7 @@ next_mm:static void ksm_do_scan (unsigned int scan_npages) {struct rmap_item *rmap_item; -struct page *uninitialized_var (page ); +struct page *page;while (scan_npages-- &&likely (!freezing (current))) {cond_resched ();
mm/memcontrol.c +1 -1
@@ -722,7 +722,7 @@ struct mem_cgroup *mem_cgroup_iter(strucstruct mem_cgroup *prev, struct mem_cgroup_reclaim_cookie *reclaim) { - struct mem_cgroup_reclaim_iter *uninitialized_var(iter); + struct mem_cgroup_reclaim_iter *iter;struct cgroup_subsys_state *css =NULL ;struct mem_cgroup *memcg =NULL ;struct mem_cgroup *pos =NULL ;
mm/mempolicy.c +2 -2
@@ -1130,7 +1130,7 @@ int do_migrate_pages(struct mm_struct *mstatic struct page *new_page (struct page *page,unsigned long start,int **x) {struct vm_area_struct *vma; -unsigned long uninitialized_var (address ); +unsigned long address; vma =find_vma (current->mm, start);while (vma) {
@@ -1504,7 +1504,7 @@ SYSCALL_DEFINE5(get_mempolicy, int __use unsigned long, addr, unsigned long, flags) { int err; -int uninitialized_var (pval ); +int pval;nodemask_t nodes;if (nmask !=NULL && maxnode < nr_node_ids)
mm/percpu.c +1 -1
@@ -2261,7 +2261,7 @@ static struct pcpu_alloc_info * __init pconst size_t static_size = __per_cpu_end - __per_cpu_start;int nr_groups =1 , nr_units =0 ;size_t size_sum, min_unit_size, alloc_size; -int upa, max_upa,uninitialized_var (best_upa );/* units_per_alloc */ +int upa, max_upa, best_upa;/* units_per_alloc */ int last_allocs, group, unit;unsigned int cpu, tcpu;struct pcpu_alloc_info *ai;
mm/slub.c +2 -2
@@ -1190,7 +1190,7 @@ static noinline int free_debug_processinstruct kmem_cache_node *n =get_node (s,page_to_nid (page));void *object = head;int cnt =0 ; -unsigned long uninitialized_var (flags ); +unsigned long flags;int ret =0 ;spin_lock_irqsave (&n->list_lock, flags);
@@ -2835,7 +2835,7 @@ static void __slab_free(struct kmem_cachstruct page new;unsigned long counters;struct kmem_cache_node *n =NULL ; -unsigned long uninitialized_var (flags ); +unsigned long flags;stat (s,FREE_SLOWPATH );
mm/swap.c +2 -2
@@ -746,8 +746,8 @@ void release_pages(struct page **pages,LIST_HEAD (pages_to_free);struct pglist_data *locked_pgdat =NULL ;struct lruvec *lruvec; -unsigned long uninitialized_var (flags ); -unsigned int uninitialized_var (lock_batch ); +unsigned long flags; +unsigned int lock_batch;for (i =0 ; i < nr; i++) {struct page *page = pages[i];
net/dccp/options.c +1 -1
@@ -60,7 +60,7 @@ int dccp_parse_options(struct sock *sk, (dh->dccph_doff *4 );struct dccp_options_received *opt_recv = &dp->dccps_options_received;unsigned char opt, len; -unsigned char *uninitialized_var (value ); +unsigned char *value;u32 elapsed_time;__be32 opt_val;int rc;
net/ipv4/netfilter/nf_socket_ipv4.c +3 -3
@@ -96,11 +96,11 @@ nf_socket_get_sock_v4(struct net *net, sstruct sock *nf_sk_lookup_slow_v4 (struct net *net,const struct sk_buff *skb,const struct net_device *indev) { -__be32 uninitialized_var (daddr ),uninitialized_var (saddr ); -__be16 uninitialized_var (dport ),uninitialized_var (sport ); +__be32 daddr, saddr; +__be16 dport, sport;const struct iphdr *iph =ip_hdr (skb);struct sk_buff *data_skb =NULL ; -u8 uninitialized_var (protocol ); +u8 protocol;#if IS_ENABLED (CONFIG_NF_CONNTRACK )enum ip_conntrack_info ctinfo;struct nf_conn const *ct;
net/ipv6/ip6_flowlabel.c +1 -1
@@ -519,7 +519,7 @@ int ipv6_flowlabel_opt_get(struct sock *int ipv6_flowlabel_opt (struct sock *sk,char __user *optval,int optlen) { -int uninitialized_var (err ); +int err;struct net *net =sock_net (sk);struct ipv6_pinfo *np =inet6_sk (sk);struct in6_flowlabel_req freq;
net/ipv6/netfilter/nf_socket_ipv6.c +1 -1
@@ -102,7 +102,7 @@ nf_socket_get_sock_v6(struct net *net, sstruct sock *nf_sk_lookup_slow_v6 (struct net *net,const struct sk_buff *skb,const struct net_device *indev) { -__be16 uninitialized_var (dport ),uninitialized_var (sport ); +__be16 dport, sport;const struct in6_addr *daddr =NULL , *saddr =NULL ;struct ipv6hdr *iph =ipv6_hdr (skb), ipv6_var;struct sk_buff *data_skb =NULL ;
net/netfilter/nf_conntrack_ftp.c +1 -1
@@ -383,7 +383,7 @@ static int help(struct sk_buff *skb,int ret;u32 seq;int dir =CTINFO2DIR (ctinfo); -unsigned int uninitialized_var (matchlen ),uninitialized_var (matchoff ); +unsigned int matchlen, matchoff;struct nf_ct_ftp_master *ct_ftp_info =nfct_help_data (ct);struct nf_conntrack_expect *exp;union nf_inet_addr *daddr;
net/netfilter/nfnetlink_log.c +1 -1
@@ -638,7 +638,7 @@ nfulnl_log_packet(struct net *net,struct nfnl_log_net *log =nfnl_log_pernet (net);const struct nfnl_ct_hook *nfnl_ct =NULL ;struct nf_conn *ct =NULL ; -enum ip_conntrack_info uninitialized_var (ctinfo ); +enum ip_conntrack_info ctinfo;if (li_user && li_user->type ==NF_LOG_TYPE_ULOG ) li = li_user;
net/netfilter/nfnetlink_queue.c +2 -2
@@ -369,7 +369,7 @@ nfqnl_build_packet_message(struct net *nstruct net_device *indev;struct net_device *outdev;struct nf_conn *ct =NULL ; -enum ip_conntrack_info uninitialized_var (ctinfo ); +enum ip_conntrack_info ctinfo;struct nfnl_ct_hook *nfnl_ct;bool csum_verify;char *secdata =NULL ;
@@ -1175,7 +1175,7 @@ static int nfqnl_recv_verdict(struct netstruct nfqnl_instance *queue;unsigned int verdict;struct nf_queue_entry *entry; -enum ip_conntrack_info uninitialized_var (ctinfo ); +enum ip_conntrack_info ctinfo;struct nfnl_ct_hook *nfnl_ct;struct nf_conn *ct =NULL ;struct nfnl_queue_net *q =nfnl_queue_pernet (net);
net/sched/cls_flow.c +1 -1
@@ -232,7 +232,7 @@ static u32 flow_get_skgid(const struct sstatic u32 flow_get_vlan_tag (const struct sk_buff *skb) { -u16 uninitialized_var (tag ); +u16 tag;if (vlan_get_tag (skb, &tag) <0 )return 0 ;
net/sched/sch_cbq.c +1 -1
@@ -364,7 +364,7 @@ cbq_enqueue(struct sk_buff *skb, struct struct sk_buff **to_free) {struct cbq_sched_data *q =qdisc_priv (sch); -int uninitialized_var (ret ); +int ret;struct cbq_class *cl =cbq_classify (skb, sch, &ret);#ifdef CONFIG_NET_CLS_ACT
net/sched/sch_fq_codel.c +1 -1
@@ -191,7 +191,7 @@ static int fq_codel_enqueue(struct sk_bustruct fq_codel_sched_data *q =qdisc_priv (sch);unsigned int idx, prev_backlog, prev_qlen;struct fq_codel_flow *flow; -int uninitialized_var (ret ); +int ret;unsigned int pkt_len;bool memory_limited;
net/sched/sch_sfq.c +1 -1
@@ -351,7 +351,7 @@ sfq_enqueue(struct sk_buff *skb, structunsigned int hash, dropped;sfq_index x, qlen;struct sfq_slot *slot; -int uninitialized_var (ret ); +int ret;struct sk_buff *head;int delta;
sound/core/control_compat.c +1 -1
@@ -236,7 +236,7 @@ static int copy_ctl_value_from_user(stru {struct snd_ctl_elem_value32 __user *data32 = userdata;int i, type, size; -int uninitialized_var (count ); +int count;unsigned int indirect;if (copy_from_user (&data->id, &data32->id,sizeof (data->id)))
sound/isa/sb/sb16_csp.c +1 -1
@@ -116,7 +116,7 @@ static void info_read(struct snd_info_enint snd_sb_csp_new (struct snd_sb *chip,int device,struct snd_hwdep ** rhwdep) {struct snd_sb_csp *p; -int uninitialized_var (version ); +int version;int err;struct snd_hwdep *hw;
sound/usb/endpoint.c +1 -1
@@ -324,7 +324,7 @@ static void queue_pending_output_urbs(stwhile (test_bit (EP_FLAG_RUNNING , &ep->flags)) {unsigned long flags; -struct snd_usb_packet_info *uninitialized_var (packet ); +struct snd_usb_packet_info *packet;struct snd_urb_ctx *ctx =NULL ;struct urb *urb;int err, i;
Greg Kroah-Hartman
maintainerPATCH 9/204 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
@@ -3647,8 +3647,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)
@@ -3660,7 +3661,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 10/204 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
@@ -4313,6 +4313,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 11/204 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
@@ -775,8 +775,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 ;
@@ -1366,9 +1374,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 12/204 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
@@ -2206,10 +2206,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 13/204 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
@@ -427,7 +427,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 14/204 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 15/204 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
@@ -217,6 +217,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 16/204 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 17/204 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 18/204 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 19/204 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
@@ -1865,6 +1865,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 ;
@@ -1876,8 +1877,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 ;
@@ -1890,9 +1890,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 20/204 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
@@ -283,13 +283,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;
@@ -326,11 +327,16 @@ static int ray_probe(struct pcmcia_device *p_dev)init_timer (&local->timer); 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 21/204 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 22/204 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
@@ -189,7 +189,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 23/204 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 24/204 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
@@ -1016,6 +1016,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;
@@ -1027,9 +1028,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 25/204 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
@@ -47,12 +47,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 26/204 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
@@ -846,7 +846,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;
@@ -864,8 +864,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 27/204 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
@@ -199,7 +199,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,
@@ -2225,7 +2225,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 28/204 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
@@ -1574,6 +1574,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 ;
@@ -1583,12 +1584,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
@@ -93,6 +93,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 ;
@@ -155,7 +156,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 ;
@@ -176,7 +177,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 29/204 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
@@ -2976,7 +2976,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))
@@ -2990,10 +2990,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 ; }
@@ -3005,7 +3005,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 30/204 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
@@ -301,7 +301,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 31/204 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
@@ -64,10 +64,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 32/204 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
@@ -605,7 +605,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 33/204 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
@@ -1738,6 +1738,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
@@ -1932,13 +1932,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
@@ -171,7 +171,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 34/204 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
@@ -5530,6 +5530,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))
@@ -5558,11 +5559,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,
@@ -5602,6 +5607,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,
@@ -5679,25 +5690,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 35/204 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
@@ -443,6 +443,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 36/204 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
@@ -449,7 +449,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 37/204 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 38/204 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
@@ -407,8 +407,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 39/204 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 40/204 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
@@ -45,7 +45,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),
@@ -107,7 +112,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 41/204 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
@@ -37,6 +37,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 42/204 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
@@ -576,11 +576,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 43/204 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
@@ -558,8 +558,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
@@ -2239,8 +2239,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
@@ -251,8 +251,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 44/204 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
@@ -2026,8 +2026,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 45/204 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
@@ -2303,8 +2303,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 46/204 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
@@ -1630,6 +1630,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 47/204 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
@@ -1040,11 +1040,6 @@ static int chv_config_get(struct pinctrl_dev *pctldev, unsigned pin,break ; -case PIN_CONFIG_DRIVE_OPEN_DRAIN : -if (!(ctrl1 &CHV_PADCTRL1_ODEN )) -return -EINVAL ; -break ; -case PIN_CONFIG_BIAS_HIGH_IMPEDANCE : {u32 cfg;
@@ -1054,6 +1049,16 @@ static int chv_config_get(struct pinctrl_dev *pctldev, unsigned 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 48/204 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
@@ -1033,7 +1033,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 49/204 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
@@ -983,6 +983,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 50/204 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
@@ -180,8 +180,8 @@ struct nx_sg *nx_walk_and_build(struct nx_sg *, unsigned int,int 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 51/204 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
@@ -1271,6 +1271,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)
@@ -1762,12 +1766,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 52/204 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
@@ -1763,12 +1763,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 :
@@ -1778,6 +1786,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 53/204 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
@@ -1582,7 +1582,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 54/204 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
@@ -1154,6 +1154,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 55/204 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 56/204 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
@@ -1233,10 +1233,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 57/204 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
@@ -24,7 +24,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 58/204 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
@@ -210,7 +210,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 59/204 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
@@ -1484,7 +1484,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 60/204 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
@@ -191,7 +191,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 61/204 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
@@ -204,6 +204,10 @@ 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 62/204 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
@@ -208,6 +208,10 @@ 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 63/204 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
@@ -406,7 +406,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 64/204 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
@@ -44,9 +44,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 65/204 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
@@ -92,6 +92,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 66/204 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
@@ -1428,9 +1428,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);mfd_remove_devices (stmpe->dev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 67/204 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
@@ -236,7 +236,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 68/204 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
@@ -374,9 +374,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 69/204 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
@@ -228,6 +228,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 70/204 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
@@ -1251,13 +1251,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 71/204 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
@@ -310,14 +310,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 72/204 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
@@ -231,7 +231,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 73/204 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
@@ -155,8 +155,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
Greg Kroah-Hartman
maintainerPATCH 74/204 tcp: annotate data races in __tcp_oow_rate_limited()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 998127cdb4699b9d470a9348ffe9f1154346be5f ]
request sockets are lockless, __tcp_oow_rate_limited() could be called on the same object from different cpus. This is harmless.
Add READ_ONCE()/WRITE_ONCE() annotations to avoid a KCSAN report.
--- net/ipv4/tcp_input.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
net/ipv4/tcp_input.c +9 -3
@@ -3447,8 +3447,11 @@ static int tcp_ack_update_window(struct sock *sk, const struct sk_buff *skb, u32static bool __tcp_oow_rate_limited (struct net *net,int mib_idx,u32 *last_oow_ack_time) { -if (*last_oow_ack_time) { -s32 elapsed = (s32)(tcp_jiffies32 - *last_oow_ack_time); +/* Paired with the WRITE_ONCE() in this function. */ +u32 val =READ_ONCE (*last_oow_ack_time); + +if (val) { +s32 elapsed = (s32)(tcp_jiffies32 - val);if (0 <= elapsed && elapsed < sysctl_tcp_invalid_ratelimit) {NET_INC_STATS (net, mib_idx);
@@ -3456,7 +3459,10 @@ static bool __tcp_oow_rate_limited(struct net *net, int mib_idx, } } - *last_oow_ack_time = tcp_jiffies32; +/* Paired with the prior READ_ONCE() and with itself, +* as we might be lockless. +*/ +WRITE_ONCE (*last_oow_ack_time, tcp_jiffies32);return false;/* not rate-limited: go ahead, send dupack now! */ }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 75/204 net/sched: act_pedit: Add size check for TCA_PEDIT_PARMS_EX
In reply to Greg Kroah-HartmanFrom: Lin Ma <[email protected]>
[ Upstream commit 30c45b5361d39b4b793780ffac5538090b9e2eb1 ]
The attribute TCA_PEDIT_PARMS_EX is not be included in pedit_policy and one malicious user could fake a TCA_PEDIT_PARMS_EX whose length is smaller than the intended sizeof(struct tc_pedit). Hence, the dereference in tcf_pedit_init() could access dirty heap data.
static int tcf_pedit_init(...)
{
// ...
pattr = tb[TCA_PEDIT_PARMS]; // TCA_PEDIT_PARMS is included if (!pattr)
pattr = tb[TCA_PEDIT_PARMS_EX]; // but this is not
// ... parm = nla_data(pattr);
index = parm->index; // parm is able to be smaller than 4 bytes
// and this dereference gets dirty skb_buff
// data created in netlink_sendmsg
}This commit adds TCA_PEDIT_PARMS_EX length in pedit_policy which avoid the above case, just like the TCA_PEDIT_PARMS.
--- net/sched/act_pedit.c | 1 + 1 file changed, 1 insertion(+)
net/sched/act_pedit.c +1 -0
@@ -29,6 +29,7 @@ static struct tc_action_ops act_pedit_ops;static const struct nla_policy pedit_policy[TCA_PEDIT_MAX +1 ] = { [TCA_PEDIT_PARMS ] = { .len =sizeof (struct tc_pedit ) }, + [TCA_PEDIT_PARMS_EX ] = { .len =sizeof (struct tc_pedit ) }, [TCA_PEDIT_KEYS_EX ] = { .type =NLA_NESTED }, };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 76/204 sh: dma: Fix DMA channel offset calculation
In reply to Greg Kroah-HartmanFrom: Artur Rojek <[email protected]>
[ Upstream commit e82e47584847129a20b8c9f4a1dcde09374fb0e0 ]
Various SoCs of the SH3, SH4 and SH4A family, which use this driver, feature a differing number of DMA channels, which can be distributed between up to two DMAC modules. The existing implementation fails to correctly accommodate for all those variations, resulting in wrong channel offset calculations and leading to kernel panics.
Rewrite dma_base_addr() in order to properly calculate channel offsets in a DMAC module. Fix dmaor_read_reg() and dmaor_write_reg(), so that the correct DMAC module base is selected for the DMAOR register.
--- arch/sh/drivers/dma/dma-sh.c | 37 +++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-)
arch/sh/drivers/dma/dma-sh.c +24 -13
@@ -21,6 +21,18 @@#include <cpu/dma-register.h> #include <cpu/dma.h> +/* +* Some of the SoCs feature two DMAC modules. In such a case, the channels are +* distributed equally among them. +*/ +#ifdef SH_DMAC_BASE1 +#define SH_DMAC_NR_MD_CH (CONFIG_NR_ONCHIP_DMA_CHANNELS / 2) +#else +#define SH_DMAC_NR_MD_CH CONFIG_NR_ONCHIP_DMA_CHANNELS +#endif + +#define SH_DMAC_CH_SZ 0x10 +/* * Define the default configuration for dual address memory-memory transfer. * The 0x400 value represents auto-request, external->external.
@@ -32,7 +44,7 @@ static unsigned long dma_find_base(unsigned int chan)unsigned long base =SH_DMAC_BASE0 ;#ifdef SH_DMAC_BASE1 -if (chan >=6 ) +if (chan >=SH_DMAC_NR_MD_CH ) base =SH_DMAC_BASE1 ;#endif
@@ -43,13 +55,13 @@ static unsigned long dma_base_addr(unsigned int chan) {unsigned long base =dma_find_base (chan); -/* Normalize offset calculation */ -if (chan >=9 ) - chan -=6 ; -if (chan >=4 ) - base +=0x10 ; + chan = (chan %SH_DMAC_NR_MD_CH ) *SH_DMAC_CH_SZ ; + +/* DMAOR is placed inside the channel register space. Step over it. */ +if (chan >=DMAOR ) + base +=SH_DMAC_CH_SZ ; -return base + (chan *0x10 ); +return base + chan; }#ifdef CONFIG_SH_DMA_IRQ_MULTI
@@ -253,12 +265,11 @@ static int sh_dmac_get_dma_residue(struct dma_channel *chan)#define NR_DMAOR 1#endif -/* -* DMAOR bases are broken out amongst channel groups. DMAOR0 manages -* channels 0 - 5, DMAOR1 6 - 11 (optional). -*/ -#define dmaor_read_reg (n) __raw_readw(dma_find_base((n)*6)) -#define dmaor_write_reg (n, data) __raw_writew(data, dma_find_base(n)*6) +#define dmaor_read_reg (n) __raw_readw(dma_find_base((n) * \ + SH_DMAC_NR_MD_CH) + DMAOR) +#define dmaor_write_reg (n, data) __raw_writew(data, \ + dma_find_base((n) * \ + SH_DMAC_NR_MD_CH) + DMAOR)static inline int dmaor_reset (int no) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 77/204 NFSD: add encoding of op_recall flag for write delegation
In reply to Greg Kroah-HartmanFrom: Dai Ngo <[email protected]>
commit 58f5d894006d82ed7335e1c37182fbc5f08c2f51 upstream.
Modified nfsd4_encode_open to encode the op_recall flag properly for OPEN result with write delegation granted.
--- fs/nfsd/nfs4xdr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfsd/nfs4xdr.c +1 -1
@@ -3361,7 +3361,7 @@ nfsd4_encode_open(struct nfsd4_compoundr p =xdr_reserve_space (xdr,32 );if (!p)return nfserr_resource; - *p++ =cpu_to_be32 (0 ); + *p++ =cpu_to_be32 (open->op_recall);/* * TODO: space_limit's in delegations
Greg Kroah-Hartman
maintainerPATCH 78/204 mmc: core: disable TRIM on Kingston EMMC04G-M627
In reply to Greg Kroah-HartmanFrom: Robert Marko <[email protected]>
commit f1738a1f816233e6dfc2407f24a31d596643fd90 upstream.
It seems that Kingston EMMC04G-M627 despite advertising TRIM support does not work when the core is trying to use REQ_OP_WRITE_ZEROES.
We are seeing I/O errors in OpenWrt under 6.1 on Zyxel NBG7815 that we did not previously have and tracked it down to REQ_OP_WRITE_ZEROES.
Trying to use fstrim seems to also throw errors like:
[93010.835112] I/O error, dev loop0, sector 16902 op 0x3:(DISCARD) flags 0x800 phys_seg 1 prio class 2
Disabling TRIM makes the error go away, so lets add a quirk for this eMMC to disable TRIM.
--- drivers/mmc/core/quirks.h | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/mmc/core/quirks.h +7 -0
@@ -91,6 +91,13 @@ static const struct mmc_fixup mmc_blk_fi MMC_QUIRK_SEC_ERASE_TRIM_BROKEN),/* +* Kingston EMMC04G-M627 advertises TRIM but it does not seems to +* support being used to offload WRITE_ZEROES. +*/ +MMC_FIXUP ("M62704" ,CID_MANFID_KINGSTON ,0x0100 , add_quirk_mmc, + MMC_QUIRK_TRIM_BROKEN), + +/* * On Some Kingston eMMCs, performing trim can result in * unrecoverable data conrruption occasionally due to a firmware bug. */
Greg Kroah-Hartman
maintainerPATCH 79/204 mmc: core: disable TRIM on Micron MTFC4GACAJCN-1M
In reply to Greg Kroah-HartmanFrom: Robert Marko <[email protected]>
commit dbfbddcddcebc9ce8a08757708d4e4a99d238e44 upstream.
It seems that Micron MTFC4GACAJCN-1M despite advertising TRIM support does not work when the core is trying to use REQ_OP_WRITE_ZEROES.
We are seeing the following errors in OpenWrt under 6.1 on Qnap Qhora 301W that we did not previously have and tracked it down to REQ_OP_WRITE_ZEROES:
[ 18.085950] I/O error, dev loop0, sector 596 op 0x9:(WRITE_ZEROES) flags 0x800 phys_seg 0 prio class 2
Disabling TRIM makes the error go away, so lets add a quirk for this eMMC to disable TRIM.
--- drivers/mmc/core/quirks.h | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/mmc/core/quirks.h +7 -0
@@ -98,6 +98,13 @@ static const struct mmc_fixup mmc_blk_fi MMC_QUIRK_TRIM_BROKEN),/* +* Micron MTFC4GACAJCN-1M advertises TRIM but it does not seems to +* support being used to offload WRITE_ZEROES. +*/ +MMC_FIXUP ("Q2J54A" ,CID_MANFID_MICRON ,0x014e , add_quirk_mmc, + MMC_QUIRK_TRIM_BROKEN), + +/* * On Some Kingston eMMCs, performing trim can result in * unrecoverable data conrruption occasionally due to a firmware bug. */
Greg Kroah-Hartman
maintainerPATCH 80/204 integrity: Fix possible multiple allocation in integrity_inode_get()
In reply to Greg Kroah-HartmanFrom: Tianjia Zhang <[email protected]>
commit 9df6a4870dc371136e90330cfbbc51464ee66993 upstream.
When integrity_inode_get() is querying and inserting the cache, there is a conditional race in the concurrent environment.
The race condition is the result of not properly implementing "double-checked locking". In this case, it first checks to see if the iint cache record exists before taking the lock, but doesn't check again after taking the integrity_iint_lock.
--- security/integrity/iint.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
security/integrity/iint.c +9 -6
@@ -43,12 +43,10 @@ static struct integrity_iint_cache *__inelse if (inode > iint->inode) n = n->rb_right;else -break ; +return iint; } -if (!n) -return NULL ; -return iint; +return NULL ; }/*
@@ -112,10 +110,15 @@ struct integrity_iint_cache *integrity_i parent = *p; test_iint = rb_entry(parent, struct integrity_iint_cache, rb_node); -if (inode < test_iint->inode) +if (inode < test_iint->inode) { p = &(*p)->rb_left; -else + }else if (inode > test_iint->inode) { p = &(*p)->rb_right; + }else { +write_unlock (&integrity_iint_lock); +kmem_cache_free (iint_cache, iint); +return test_iint; + } } iint->inode = inode;
Greg Kroah-Hartman
maintainerPATCH 81/204 jffs2: reduce stack usage in jffs2_build_xattr_subsystem()
In reply to Greg Kroah-HartmanFrom: Fabian Frederick <[email protected]>
commit 1168f095417643f663caa341211e117db552989f upstream.
Use kcalloc() for allocation/flush of 128 pointers table to reduce stack usage.
Function now returns -ENOMEM or 0 on success.
stackusage
Before:./fs/jffs2/xattr.c:775 jffs2_build_xattr_subsystem 1208
dynamic,bounded
After:./fs/jffs2/xattr.c:775 jffs2_build_xattr_subsystem 192
dynamic,bounded
Also update definition when CONFIG_JFFS2_FS_XATTR is not enabled
Tested with an MTD mount point and some user set/getfattr.
Many current target on OpenWRT also suffer from a compilation warning (that become an error with CONFIG_WERROR) with the following output:
fs/jffs2/xattr.c: In function 'jffs2_build_xattr_subsystem':fs/jffs2/xattr.c:887:1: error: the frame size of 1088 bytes is larger than 1024 bytes [-Werror=frame-larger-than=]
887 | }
| ^
Using dynamic allocation fix this compilation warning.
Message-Id: <[email protected]>
--- fs/jffs2/build.c | 5 ++++- fs/jffs2/xattr.c | 13 +++++++++---- fs/jffs2/xattr.h | 4 ++-- 3 files changed, 15 insertions(+), 7 deletions(-)
fs/jffs2/build.c +4 -1
@@ -211,7 +211,10 @@ static int jffs2_build_filesystem(struct ic->scan_dents =NULL ;cond_resched (); } -jffs2_build_xattr_subsystem (c); + ret =jffs2_build_xattr_subsystem (c); +if (ret) + goto exit; + c->flags &= ~JFFS2_SB_FLAG_BUILDING ;dbg_fsbuild ("FS build complete\n" );
fs/jffs2/xattr.c +9 -4
@@ -772,10 +772,10 @@ void jffs2_clear_xattr_subsystem(struct }#define XREF_TMPHASH_SIZE (128) -void jffs2_build_xattr_subsystem (struct jffs2_sb_info *c) +int jffs2_build_xattr_subsystem (struct jffs2_sb_info *c) {struct jffs2_xattr_ref *ref, *_ref; -struct jffs2_xattr_ref *xref_tmphash[XREF_TMPHASH_SIZE ]; +struct jffs2_xattr_ref **xref_tmphash;struct jffs2_xattr_datum *xd, *_xd;struct jffs2_inode_cache *ic;struct jffs2_raw_node_ref *raw;
@@ -784,9 +784,12 @@ void jffs2_build_xattr_subsystem(structBUG_ON (!(c->flags &JFFS2_SB_FLAG_BUILDING )); + xref_tmphash =kcalloc (XREF_TMPHASH_SIZE , +sizeof (struct jffs2_xattr_ref *),GFP_KERNEL ); +if (!xref_tmphash) +return -ENOMEM ; +/* Phase.1 : Merge same xref */ -for (i=0 ; i <XREF_TMPHASH_SIZE ; i++) - xref_tmphash[i] =NULL ;for (ref=c->xref_temp; ref; ref=_ref) {struct jffs2_xattr_ref *tmp;
@@ -884,6 +887,8 @@ void jffs2_build_xattr_subsystem(struct"%u of xref (%u dead, %u orphan) found.\n" , xdatum_count, xdatum_unchecked_count, xdatum_orphan_count, xref_count, xref_dead_count, xref_orphan_count); +kfree (xref_tmphash); +return 0 ; } struct jffs2_xattr_datum *jffs2_setup_xattr_datum(struct jffs2_sb_info *c,
fs/jffs2/xattr.h +2 -2
@@ -71,7 +71,7 @@ static inline int is_xattr_ref_dead(stru#ifdef CONFIG_JFFS2_FS_XATTR extern void jffs2_init_xattr_subsystem (struct jffs2_sb_info *c); -extern void jffs2_build_xattr_subsystem (struct jffs2_sb_info *c); +extern int jffs2_build_xattr_subsystem (struct jffs2_sb_info *c);extern void jffs2_clear_xattr_subsystem (struct jffs2_sb_info *c); extern struct jffs2_xattr_datum *jffs2_setup_xattr_datum(struct jffs2_sb_info *c,
@@ -103,7 +103,7 @@ extern ssize_t jffs2_listxattr(struct de#else #define jffs2_init_xattr_subsystem (c) -#define jffs2_build_xattr_subsystem (c) +#define jffs2_build_xattr_subsystem (c) (0)#define jffs2_clear_xattr_subsystem (c)#define jffs2_xattr_do_crccheck_inode (c, ic)
Greg Kroah-Hartman
maintainerPATCH 82/204 btrfs: fix race when deleting quota root from the dirty cow roots list
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit b31cb5a6eb7a48b0a7bfdf06832b1fd5088d8c79 upstream.
When disabling quotas we are deleting the quota root from the list fs_info->dirty_cowonly_roots without taking the lock that protects it, which is struct btrfs_fs_info::trans_lock. This unsynchronized list manipulation may cause chaos if there's another concurrent manipulation of this list, such as when adding a root to it with ctree.c:add_root_to_dirty_list().
This can result in all sorts of weird failures caused by a race, such as the following crash:
[337571.278245] general protection fault, probably for non-canonical address 0xdead000000000108: 0000 [#1] PREEMPT SMP PTI [337571.278933] CPU: 1 PID: 115447 Comm: btrfs Tainted: G W 6.4.0-rc6-btrfs-next-134+ #1 [337571.279153] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.14.0-0-g155821a1990b-prebuilt.qemu.org 04/01/2014 [337571.279572] RIP: 0010:commit_cowonly_roots+0x11f/0x250 [btrfs] [337571.279928] Code: 85 38 06 00 (...) [337571.280363] RSP: 0018:ffff9f63446efba0 EFLAGS: 00010206 [337571.280582] RAX: ffff942d98ec2638 RBX: ffff9430b82b4c30 RCX: 0000000449e1c000 [337571.280798] RDX: dead000000000100 RSI: ffff9430021e4900 RDI: 0000000000036070 [337571.281015] RBP: ffff942d98ec2000 R08: ffff942d98ec2000 R09: 000000000000015b [337571.281254] R10: 0000000000000009 R11: 0000000000000001 R12: ffff942fe8fbf600 [337571.281476] R13: ffff942dabe23040 R14: ffff942dabe20800 R15: ffff942d92cf3b48 [337571.281723] FS: 00007f478adb7340(0000) GS:ffff94349fa40000(0000) knlGS:0000000000000000 [337571.281950] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [337571.282184] CR2: 00007f478ab9a3d5 CR3: 000000001e02c001 CR4: 0000000000370ee0 [337571.282416] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [337571.282647] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [337571.282874] Call Trace: [337571.283101] <TASK> [337571.283327] ? __die_body+0x1b/0x60 [337571.283570] ? die_addr+0x39/0x60 [337571.283796] ? exc_general_protection+0x22e/0x430 [337571.284022] ? asm_exc_general_protection+0x22/0x30 [337571.284251] ? commit_cowonly_roots+0x11f/0x250 [btrfs] [337571.284531] btrfs_commit_transaction+0x42e/0xf90 [btrfs] [337571.284803] ? _raw_spin_unlock+0x15/0x30 [337571.285031] ? release_extent_buffer+0x103/0x130 [btrfs] [337571.285305] reset_balance_state+0x152/0x1b0 [btrfs] [337571.285578] btrfs_balance+0xa50/0x11e0 [btrfs] [337571.285864] ? __kmem_cache_alloc_node+0x14a/0x410 [337571.286086] btrfs_ioctl+0x249a/0x3320 [btrfs] [337571.286358] ? mod_objcg_state+0xd2/0x360 [337571.286577] ? refill_obj_stock+0xb0/0x160 [337571.286798] ? seq_release+0x25/0x30 [337571.287016] ? __rseq_handle_notify_resume+0x3ba/0x4b0 [337571.287235] ? percpu_counter_add_batch+0x2e/0xa0 [337571.287455] ? __x64_sys_ioctl+0x88/0xc0 [337571.287675] __x64_sys_ioctl+0x88/0xc0 [337571.287901] do_syscall_64+0x38/0x90 [337571.288126] entry_SYSCALL_64_after_hwframe+0x72/0xdc [337571.288352] RIP: 0033:0x7f478aaffe9b
So fix this by locking struct btrfs_fs_info::trans_lock before deleting the quota root from that list.
--- fs/btrfs/qgroup.c | 2 ++ 1 file changed, 2 insertions(+)
fs/btrfs/qgroup.c +2 -0
@@ -969,7 +969,9 @@ int btrfs_quota_disable(struct btrfs_traif (ret) goto out; +spin_lock (&fs_info->trans_lock);list_del ("a_root->dirty_list); +spin_unlock (&fs_info->trans_lock);btrfs_tree_lock (quota_root->node);clean_tree_block (fs_info, quota_root->node);
Greg Kroah-Hartman
maintainerPATCH 83/204 ARM: orion5x: fix d2net gpio initialization
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
commit f8ef1233939495c405a9faa4bd1ae7d3f581bae4 upstream.
The DT version of this board has a custom file with the gpio device. However, it does nothing because the d2net_init() has no caller or prototype:
arch/arm/mach-orion5x/board-d2net.c:101:13: error: no previous prototype for 'd2net_init'
Call it from the board-dt file as intended.
--- arch/arm/mach-orion5x/board-dt.c | 3 +++ arch/arm/mach-orion5x/common.h | 6 ++++++ 2 files changed, 9 insertions(+)
arch/arm/mach-orion5x/board-dt.c +3 -0
@@ -63,6 +63,9 @@ static void __init orion5x_dt_init(void)if (of_machine_is_compatible ("maxtor,shared-storage-2" ))mss2_init (); +if (of_machine_is_compatible ("lacie,d2-network" )) +d2net_init (); +of_platform_default_populate (NULL , orion5x_auxdata_lookup,NULL ); }
arch/arm/mach-orion5x/common.h +6 -0
@@ -75,6 +75,12 @@ extern void mss2_init(void);static inline void mss2_init (void ) {}#endif +#ifdef CONFIG_MACH_D2NET_DT +void d2net_init (void ); +#else +static inline void d2net_init (void ) {} +#endif +/***************************************************************************** * Helpers to access Orion registers ****************************************************************************/
Greg Kroah-Hartman
maintainerPATCH 84/204 spi: spi-fsl-spi: remove always-true conditional in fsl_spi_do_one_msg
In reply to Greg Kroah-HartmanFrom: Rasmus Villemoes <[email protected]>
commit 24c363623361b430fb79459ca922e816e6f48603 upstream.
__spi_validate() in the generic SPI code sets ->speed_hz and ->bits_per_word to non-zero values, so this condition is always true.
--- drivers/spi/spi-fsl-spi.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/spi/spi-fsl-spi.c +4 -6
@@ -387,12 +387,10 @@ static int fsl_spi_do_one_msg(struct spi cs_change =1 ; status = -EINVAL ;list_for_each_entry (t, &m->transfers, transfer_list) { -if (t->bits_per_word || t->speed_hz) { -if (cs_change) - status =fsl_spi_setup_transfer (spi, t); -if (status <0 ) -break ; - } +if (cs_change) + status =fsl_spi_setup_transfer (spi, t); +if (status <0 ) +break ;if (cs_change) {fsl_spi_chipselect (spi,BITBANG_CS_ACTIVE );
Greg Kroah-Hartman
maintainerPATCH 85/204 spi: spi-fsl-spi: relax message sanity checking a little
In reply to Greg Kroah-HartmanFrom: Rasmus Villemoes <[email protected]>
commit 17ecffa289489e8442306bbc62ebb964e235cdad upstream.
The comment says that we should not allow changes (to bits_per_word/speed_hz) while CS is active, and indeed the code below does fsl_spi_setup_transfer() when the ->cs_change of the previous spi_transfer was set (and for the very first transfer).
So the sanity checking is a bit too strict - we can change it to follow the same logic as is used by the actual transfer loop.
--- drivers/spi/spi-fsl-spi.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/spi/spi-fsl-spi.c +5 -3
@@ -373,13 +373,15 @@ static int fsl_spi_do_one_msg(struct spi }/* Don't allow changes if CS is active */ - first = list_first_entry(&m->transfers, struct spi_transfer, - transfer_list); + cs_change =1 ;list_for_each_entry (t, &m->transfers, transfer_list) { +if (cs_change) + first = t; + cs_change = t->cs_change;if ((first->bits_per_word != t->bits_per_word) || (first->speed_hz != t->speed_hz)) {dev_err (&spi->dev, -"bits_per_word/speed_hz should be same for the same SPI transfer\n" ); +"bits_per_word/speed_hz cannot change while CS is active\n" );return -EINVAL ; } }
Greg Kroah-Hartman
maintainerPATCH 86/204 spi: spi-fsl-spi: allow changing bits_per_word while CS is still active
In reply to Greg Kroah-HartmanFrom: Rasmus Villemoes <[email protected]>
commit a798a7086c38d91d304132c194cff9f02197f5cd upstream.
Commit c9bfcb315104 (spi_mpc83xx: much improved driver) introduced logic to ensure bits_per_word and speed_hz stay the same for a series of spi_transfers with CS active, arguing that
The current driver may cause glitches on SPI CLK line since one must disable the SPI controller before changing any HW settings.
This sounds quite reasonable. So this is a quite naive attempt at relaxing this sanity checking to only ensure that speed_hz is constant - in the faint hope that if we do not causes changes to the clock-related fields of the SPMODE register (DIV16 and PM), those glitches won't appear.
The purpose of this change is to allow automatically optimizing large transfers to use 32 bits-per-word; taking one interrupt for every byte is extremely slow.
--- drivers/spi/spi-fsl-spi.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/spi/spi-fsl-spi.c +6 -5
@@ -339,7 +339,7 @@ static int fsl_spi_do_one_msg(struct spistruct spi_transfer *t, *first;unsigned int cs_change;const int nsecs =50 ; -int status; +int status, last_bpw;/* * In CPU mode, optimize large byte transfers to use larger
@@ -378,21 +378,22 @@ static int fsl_spi_do_one_msg(struct spiif (cs_change) first = t; cs_change = t->cs_change; -if ((first->bits_per_word != t->bits_per_word) || - (first->speed_hz != t->speed_hz)) { +if (first->speed_hz != t->speed_hz) {dev_err (&spi->dev, -"bits_per_word/speed_hz cannot change while CS is active\n" ); +"speed_hz cannot change while CS is active\n" );return -EINVAL ; } } + last_bpw =-1 ; cs_change =1 ; status = -EINVAL ;list_for_each_entry (t, &m->transfers, transfer_list) { -if (cs_change) +if (cs_change || last_bpw != t->bits_per_word) status =fsl_spi_setup_transfer (spi, t);if (status <0 )break ; + last_bpw = t->bits_per_word;if (cs_change) {fsl_spi_chipselect (spi,BITBANG_CS_ACTIVE );
Greg Kroah-Hartman
maintainerPATCH 87/204 netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
[ 1240eb93f0616b21c675416516ff3d74798fdc97 ]
In case of error when adding a new rule that refers to an anonymous set, deactivate expressions via NFT_TRANS_PREPARE state, not NFT_TRANS_RELEASE. Thus, the lookup expression marks anonymous sets as inactive in the next generation to ensure it is not reachable in this transaction anymore and decrement the set refcount as introduced by c1592a89942e ("netfilter:nf_tables: deactivate anonymous set from preparation phase"). The abort step takes care of undoing the anonymous set.
This is also consistent with rule deletion, where NFT_TRANS_PREPARE is used. Note that this error path is exercised in the preparation step of the commit protocol. This patch replaces nf_tables_rule_release() by the deactivate and destroy calls, this time with NFT_TRANS_PREPARE.
Due to this incorrect error handling, it is possible to access a dangling pointer to the anonymous set that remains in the transaction list.
[1009.379054] BUG: KASAN: use-after-free in nft_set_lookup_global+0x147/0x1a0 [nf_tables] [1009.379106] Read of size 8 at addr ffff88816c4c8020 by task nft-rule-add/137110 [1009.379116] CPU: 7 PID: 137110 Comm: nft-rule-add Not tainted 6.4.0-rc4+ #256 [1009.379128] Call Trace: [1009.379132] <TASK> [1009.379135] dump_stack_lvl+0x33/0x50 [1009.379146] ? nft_set_lookup_global+0x147/0x1a0 [nf_tables] [1009.379191] print_address_description.constprop.0+0x27/0x300 [1009.379201] kasan_report+0x107/0x120 [1009.379210] ? nft_set_lookup_global+0x147/0x1a0 [nf_tables] [1009.379255] nft_set_lookup_global+0x147/0x1a0 [nf_tables] [1009.379302] nft_lookup_init+0xa5/0x270 [nf_tables] [1009.379350] nf_tables_newrule+0x698/0xe50 [nf_tables] [1009.379397] ? nf_tables_rule_release+0xe0/0xe0 [nf_tables] [1009.379441] ? kasan_unpoison+0x23/0x50 [1009.379450] nfnetlink_rcv_batch+0x97c/0xd90 [nfnetlink] [1009.379470] ? nfnetlink_rcv_msg+0x480/0x480 [nfnetlink] [1009.379485] ? __alloc_skb+0xb8/0x1e0 [1009.379493] ? __alloc_skb+0xb8/0x1e0 [1009.379502] ? entry_SYSCALL_64_after_hwframe+0x46/0xb0 [1009.379509] ? unwind_get_return_address+0x2a/0x40 [1009.379517] ? write_profile+0xc0/0xc0 [1009.379524] ? avc_lookup+0x8f/0xc0 [1009.379532] ? __rcu_read_unlock+0x43/0x60
--- net/netfilter/nf_tables_api.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/netfilter/nf_tables_api.c +2 -1
@@ -2465,7 +2465,8 @@ static int nf_tables_newrule(struct netreturn 0 ; err2: -nf_tables_rule_release (&ctx, rule); +nft_rule_expr_deactivate (&ctx, rule,NFT_TRANS_PREPARE ); +nf_tables_rule_destroy (&ctx, rule); err1:for (i =0 ; i < n; i++) {if (info[i].ops !=NULL )
Greg Kroah-Hartman
maintainerPATCH 88/204 netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
[ 26b5a5712eb85e253724e56a54c17f8519bd8e4e ]
Add a new state to deal with rule expressions deactivation from the newrule error path, otherwise the anonymous set remains in the list in inactive state for the next generation. Mark the set/chain transaction as unbound so the abort path releases this object, set it as inactive in the next generation so it is not reachable anymore from this transaction and reference counter is dropped.
--- include/net/netfilter/nf_tables.h | 1 + net/netfilter/nf_tables_api.c | 26 ++++++++++++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-)
include/net/netfilter/nf_tables.h +1 -0
@@ -725,6 +725,7 @@ struct nft_expr_type {enum nft_trans_phase {NFT_TRANS_PREPARE , +NFT_TRANS_PREPARE_ERROR ,NFT_TRANS_ABORT ,NFT_TRANS_COMMIT ,NFT_TRANS_RELEASE
net/netfilter/nf_tables_api.c +22 -4
@@ -140,7 +140,8 @@ static void nft_trans_destroy(struct nftkfree (trans); } -static void nft_set_trans_bind (const struct nft_ctx *ctx,struct nft_set *set) +static void __nft_set_trans_bind (const struct nft_ctx *ctx,struct nft_set *set, +bool bind) {struct net *net = ctx->net;struct nft_trans *trans;
@@ -152,16 +153,26 @@ static void nft_set_trans_bind(const strswitch (trans->msg_type) {case NFT_MSG_NEWSET :if (nft_trans_set (trans) == set) -nft_trans_set_bound (trans) = true; +nft_trans_set_bound (trans) = bind;break ;case NFT_MSG_NEWSETELEM :if (nft_trans_elem_set (trans) == set) -nft_trans_elem_set_bound (trans) = true; +nft_trans_elem_set_bound (trans) = bind;break ; } } } +static void nft_set_trans_bind (const struct nft_ctx *ctx,struct nft_set *set) +{ +return __nft_set_trans_bind (ctx, set, true); +} + +static void nft_set_trans_unbind (const struct nft_ctx *ctx,struct nft_set *set) +{ +return __nft_set_trans_bind (ctx, set, false); +} + static int nf_tables_register_hooks(struct net *net, const struct nft_table *table, struct nft_chain *chain,
@@ -2465,7 +2476,7 @@ static int nf_tables_newrule(struct netreturn 0 ; err2: -nft_rule_expr_deactivate (&ctx, rule,NFT_TRANS_PREPARE ); +nft_rule_expr_deactivate (&ctx, rule,NFT_TRANS_PREPARE_ERROR );nf_tables_rule_destroy (&ctx, rule); err1:for (i =0 ; i < n; i++) {
@@ -3446,6 +3457,13 @@ void nf_tables_deactivate_set(const stru enum nft_trans_phase phase) {switch (phase) { +case NFT_TRANS_PREPARE_ERROR : +nft_set_trans_unbind (ctx, set); +if (set->flags &NFT_SET_ANONYMOUS ) +nft_deactivate_next (ctx->net, set); + + set->use--; +break ;case NFT_TRANS_PREPARE :if (set->flags &NFT_SET_ANONYMOUS )nft_deactivate_next (ctx->net, set);
Greg Kroah-Hartman
maintainerPATCH 89/204 netfilter: nf_tables: unbind non-anonymous set if rule construction fails
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
[ 3e70489721b6c870252c9082c496703677240f53 ]
Otherwise a dangling reference to a rule object that is gone remains in the set binding list.
--- net/netfilter/nf_tables_api.c | 2 ++ 1 file changed, 2 insertions(+)
net/netfilter/nf_tables_api.c +2 -0
@@ -3461,6 +3461,8 @@ void nf_tables_deactivate_set(const strunft_set_trans_unbind (ctx, set);if (set->flags &NFT_SET_ANONYMOUS )nft_deactivate_next (ctx->net, set); +else +list_del_rcu (&binding->list); set->use--;break ;
Greg Kroah-Hartman
maintainerPATCH 90/204 netfilter: conntrack: Avoid nf_ct_helper_hash uses after free
In reply to Greg Kroah-HartmanFrom: Florent Revest <[email protected]>
commit 6eef7a2b933885a17679eb8ed0796ddf0ee5309b upstream.
If nf_conntrack_init_start() fails (for example due to a register_nf_conntrack_bpf() failure), the nf_conntrack_helper_fini() clean-up path frees the nf_ct_helper_hash map.
When built with NF_CONNTRACK=y, further netfilter modules (e.g:netfilter_conntrack_ftp) can still be loaded and call nf_conntrack_helpers_register(), independently of whether nf_conntrack initialized correctly. This accesses the nf_ct_helper_hash dangling pointer and causes a uaf, possibly leading to random memory corruption.
This patch guards nf_conntrack_helper_register() from accessing a freed or uninitialized nf_ct_helper_hash pointer and fixes possible uses-after-free when loading a conntrack module.
--- net/netfilter/nf_conntrack_helper.c | 4 ++++ 1 file changed, 4 insertions(+)
net/netfilter/nf_conntrack_helper.c +4 -0
@@ -402,6 +402,9 @@ int nf_conntrack_helper_register(structBUG_ON (me->expect_class_max >=NF_CT_MAX_EXPECT_CLASSES );BUG_ON (strlen (me->name) >NF_CT_HELPER_NAME_LEN -1 ); +if (!nf_ct_helper_hash) +return -ENOENT ; +if (me->expect_policy->max_expected >NF_CT_EXPECT_MAX_CNT )return -EINVAL ;
@@ -572,4 +575,5 @@ void nf_conntrack_helper_fini(void) {nf_ct_extend_unregister (&helper_extend);nf_ct_free_hashtable (nf_ct_helper_hash, nf_ct_helper_hsize); + nf_ct_helper_hash =NULL ; }
Greg Kroah-Hartman
maintainerPATCH 91/204 netfilter: nf_tables: prevent OOB access in nft_byteorder_eval
In reply to Greg Kroah-HartmanFrom: Thadeu Lima de Souza Cascardo <[email protected]>
commit caf3ef7468f7534771b5c44cd8dbd6f7f87c2cbd upstream.
When evaluating byteorder expressions with size 2, a union with 32-bit and 16-bit members is used. Since the 16-bit members are aligned to 32-bit, the array accesses will be out-of-bounds.
It may lead to a stack-out-of-bounds access like the one below:
[ 23.095215] ================================================================== [ 23.095625] BUG: KASAN: stack-out-of-bounds in nft_byteorder_eval+0x13c/0x320 [ 23.096020] Read of size 2 at addr ffffc90000007948 by task ping/115 [ 23.096358] [ 23.096456] CPU: 0 PID: 115 Comm: ping Not tainted 6.4.0+ #413 [ 23.096770] Call Trace: [ 23.096910] <IRQ> [ 23.097030] dump_stack_lvl+0x60/0xc0 [ 23.097218] print_report+0xcf/0x630 [ 23.097388] ? nft_byteorder_eval+0x13c/0x320 [ 23.097577] ? kasan_addr_to_slab+0xd/0xc0 [ 23.097760] ? nft_byteorder_eval+0x13c/0x320 [ 23.097949] kasan_report+0xc9/0x110 [ 23.098106] ? nft_byteorder_eval+0x13c/0x320 [ 23.098298] __asan_load2+0x83/0xd0 [ 23.098453] nft_byteorder_eval+0x13c/0x320 [ 23.098659] nft_do_chain+0x1c8/0xc50 [ 23.098852] ? __pfx_nft_do_chain+0x10/0x10 [ 23.099078] ? __kasan_check_read+0x11/0x20 [ 23.099295] ? __pfx___lock_acquire+0x10/0x10 [ 23.099535] ? __pfx___lock_acquire+0x10/0x10 [ 23.099745] ? __kasan_check_read+0x11/0x20 [ 23.099929] nft_do_chain_ipv4+0xfe/0x140 [ 23.100105] ? __pfx_nft_do_chain_ipv4+0x10/0x10 [ 23.100327] ? lock_release+0x204/0x400 [ 23.100515] ? nf_hook.constprop.0+0x340/0x550 [ 23.100779] nf_hook_slow+0x6c/0x100 [ 23.100977] ? __pfx_nft_do_chain_ipv4+0x10/0x10 [ 23.101223] nf_hook.constprop.0+0x334/0x550 [ 23.101443] ? __pfx_ip_local_deliver_finish+0x10/0x10 [ 23.101677] ? __pfx_nf_hook.constprop.0+0x10/0x10 [ 23.101882] ? __pfx_ip_rcv_finish+0x10/0x10 [ 23.102071] ? __pfx_ip_local_deliver_finish+0x10/0x10 [ 23.102291] ? rcu_read_lock_held+0x4b/0x70 [ 23.102481] ip_local_deliver+0xbb/0x110 [ 23.102665] ? __pfx_ip_rcv+0x10/0x10 [ 23.102839] ip_rcv+0x199/0x2a0 [ 23.102980] ? __pfx_ip_rcv+0x10/0x10 [ 23.103140] __netif_receive_skb_one_core+0x13e/0x150 [ 23.103362] ? __pfx___netif_receive_skb_one_core+0x10/0x10 [ 23.103647] ? mark_held_locks+0x48/0xa0 [ 23.103819] ? process_backlog+0x36c/0x380 [ 23.103999] __netif_receive_skb+0x23/0xc0 [ 23.104179] process_backlog+0x91/0x380 [ 23.104350] __napi_poll.constprop.0+0x66/0x360 [ 23.104589] ? net_rx_action+0x1cb/0x610 [ 23.104811] net_rx_action+0x33e/0x610 [ 23.105024] ? _raw_spin_unlock+0x23/0x50 [ 23.105257] ? __pfx_net_rx_action+0x10/0x10 [ 23.105485] ? mark_held_locks+0x48/0xa0 [ 23.105741] __do_softirq+0xfa/0x5ab [ 23.105956] ? __dev_queue_xmit+0x765/0x1c00 [ 23.106193] do_softirq.part.0+0x49/0xc0 [ 23.106423] </IRQ> [ 23.106547] <TASK> [ 23.106670] __local_bh_enable_ip+0xf5/0x120 [ 23.106903] __dev_queue_xmit+0x789/0x1c00 [ 23.107131] ? __pfx___dev_queue_xmit+0x10/0x10 [ 23.107381] ? find_held_lock+0x8e/0xb0 [ 23.107585] ? lock_release+0x204/0x400 [ 23.107798] ? neigh_resolve_output+0x185/0x350 [ 23.108049] ? mark_held_locks+0x48/0xa0 [ 23.108265] ? neigh_resolve_output+0x185/0x350 [ 23.108514] neigh_resolve_output+0x246/0x350 [ 23.108753] ? neigh_resolve_output+0x246/0x350 [ 23.109003] ip_finish_output2+0x3c3/0x10b0 [ 23.109250] ? __pfx_ip_finish_output2+0x10/0x10 [ 23.109510] ? __pfx_nf_hook+0x10/0x10 [ 23.109732] __ip_finish_output+0x217/0x390 [ 23.109978] ip_finish_output+0x2f/0x130 [ 23.110207] ip_output+0xc9/0x170 [ 23.110404] ip_push_pending_frames+0x1a0/0x240 [ 23.110652] raw_sendmsg+0x102e/0x19e0 [ 23.110871] ? __pfx_raw_sendmsg+0x10/0x10 [ 23.111093] ? lock_release+0x204/0x400 [ 23.111304] ? __mod_lruvec_page_state+0x148/0x330 [ 23.111567] ? find_held_lock+0x8e/0xb0 [ 23.111777] ? find_held_lock+0x8e/0xb0 [ 23.111993] ? __rcu_read_unlock+0x7c/0x2f0 [ 23.112225] ? aa_sk_perm+0x18a/0x550 [ 23.112431] ? filemap_map_pages+0x4f1/0x900 [ 23.112665] ? __pfx_aa_sk_perm+0x10/0x10 [ 23.112880] ? find_held_lock+0x8e/0xb0 [ 23.113098] inet_sendmsg+0xa0/0xb0 [ 23.113297] ? inet_sendmsg+0xa0/0xb0 [ 23.113500] ? __pfx_inet_sendmsg+0x10/0x10 [ 23.113727] sock_sendmsg+0xf4/0x100 [ 23.113924] ? move_addr_to_kernel.part.0+0x4f/0xa0 [ 23.114190] __sys_sendto+0x1d4/0x290 [ 23.114391] ? __pfx___sys_sendto+0x10/0x10 [ 23.114621] ? __pfx_mark_lock.part.0+0x10/0x10 [ 23.114869] ? lock_release+0x204/0x400 [ 23.115076] ? find_held_lock+0x8e/0xb0 [ 23.115287] ? rcu_is_watching+0x23/0x60 [ 23.115503] ? __rseq_handle_notify_resume+0x6e2/0x860 [ 23.115778] ? __kasan_check_write+0x14/0x30 [ 23.116008] ? blkcg_maybe_throttle_current+0x8d/0x770 [ 23.116285] ? mark_held_locks+0x28/0xa0 [ 23.116503] ? do_syscall_64+0x37/0x90 [ 23.116713] __x64_sys_sendto+0x7f/0xb0 [ 23.116924] do_syscall_64+0x59/0x90 [ 23.117123] ? irqentry_exit_to_user_mode+0x25/0x30 [ 23.117387] ? irqentry_exit+0x77/0xb0 [ 23.117593] ? exc_page_fault+0x92/0x140 [ 23.117806] entry_SYSCALL_64_after_hwframe+0x6e/0xd8 [ 23.118081] RIP: 0033:0x7f744aee2bba [ 23.118282] Code: d8 64 89 02 48 c7 c0 ff ff ff ff eb b8 0f 1f 00 f3 0f 1e fa 41 89 ca 64 8b 04 25 18 00 00 00 85 c0 75 15 b8 2c 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 7e c3 0f 1f 44 00 00 41 54 48 83 ec 30 44 89 [ 23.119237] RSP: 002b:00007ffd04a7c9f8 EFLAGS: 00000246 ORIG_RAX: 000000000000002c [ 23.119644] RAX: ffffffffffffffda RBX: 00007ffd04a7e0a0 RCX: 00007f744aee2bba [ 23.120023] RDX: 0000000000000040 RSI: 000056488e9e6300 RDI: 0000000000000003 [ 23.120413] RBP: 000056488e9e6300 R08: 00007ffd04a80320 R09: 0000000000000010 [ 23.120809] R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000040 [ 23.121219] R13: 00007ffd04a7dc38 R14: 00007ffd04a7ca00 R15: 00007ffd04a7e0a0 [ 23.121617] </TASK> [ 23.121749] [ 23.121845] The buggy address belongs to the virtual mapping at [ 23.121845] [ffffc90000000000, ffffc90000009000) created by: [ 23.121845] irq_init_percpu_irqstack+0x1cf/0x270 [ 23.122707] [ 23.122803] The buggy address belongs to the physical page: [ 23.123104] page:0000000072ac19f0 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x24a09 [ 23.123609] flags: 0xfffffc0001000(reserved|node=0|zone=1|lastcpupid=0x1fffff) [ 23.123998] page_type: 0xffffffff() [ 23.124194] raw: 000fffffc0001000 ffffea0000928248 ffffea0000928248 0000000000000000 [ 23.124610] raw: 0000000000000000 0000000000000000 00000001ffffffff 0000000000000000 [ 23.125023] page dumped because: kasan: bad access detected [ 23.125326] [ 23.125421] Memory state around the buggy address: [ 23.125682] ffffc90000007800: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 23.126072] ffffc90000007880: 00 00 00 00 00 f1 f1 f1 f1 f1 f1 00 00 f2 f2 00 [ 23.126455] >ffffc90000007900: 00 00 00 00 00 00 00 00 00 f2 f2 f2 f2 00 00 00 [ 23.126840] ^ [ 23.127138] ffffc90000007980: 00 00 00 00 00 00 00 00 00 00 00 00 00 f3 f3 f3 [ 23.127522] ffffc90000007a00: f3 00 00 00 00 00 00 00 00 00 00 00 f1 f1 f1 f1 [ 23.127906] ================================================================== [ 23.128324] Disabling lock debugging due to kernel taint
Using simple s16 pointers for the 16-bit accesses fixes the problem. For the 32-bit accesses, src and dst can be used directly.
--- net/netfilter/nft_byteorder.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
net/netfilter/nft_byteorder.c +7 -7
@@ -33,11 +33,11 @@ static void nft_byteorder_eval(const strconst struct nft_byteorder *priv =nft_expr_priv (expr);u32 *src = ®s->data[priv->sreg];u32 *dst = ®s->data[priv->dreg]; -union {u32 u32;u16 u16; } *s, *d; +u16 *s16, *d16;unsigned int i; - s = (void *)src; - d = (void *)dst; + s16 = (void *)src; + d16 = (void *)dst;switch (priv->size) {case 8 : {
@@ -63,11 +63,11 @@ static void nft_byteorder_eval(const strswitch (priv->op) {case NFT_BYTEORDER_NTOH :for (i =0 ; i < priv->len /4 ; i++) - d[i].u32 =ntohl ((__force __be32 )s[i].u32); + dst[i] =ntohl ((__force __be32 )src[i]);break ;case NFT_BYTEORDER_HTON :for (i =0 ; i < priv->len /4 ; i++) - d[i].u32 = (__force __u32 )htonl (s[i].u32); + dst[i] = (__force __u32 )htonl (src[i]);break ; }break ;
@@ -75,11 +75,11 @@ static void nft_byteorder_eval(const strswitch (priv->op) {case NFT_BYTEORDER_NTOH :for (i =0 ; i < priv->len /2 ; i++) - d[i].u16 =ntohs ((__force __be16 )s[i].u16); + d16[i] =ntohs ((__force __be16 )s16[i]);break ;case NFT_BYTEORDER_HTON :for (i =0 ; i < priv->len /2 ; i++) - d[i].u16 = (__force __u16 )htons (s[i].u16); + d16[i] = (__force __u16 )htons (s16[i]);break ; }break ;
Greg Kroah-Hartman
maintainerPATCH 92/204 workqueue: clean up WORK_* constant types, clarify masking
In reply to Greg Kroah-HartmanFrom: Linus Torvalds <[email protected]>
commit afa4bb778e48d79e4a642ed41e3b4e0de7489a6c upstream.
Dave Airlie reports that gcc-13.1.1 has started complaining about some of the workqueue code in 32-bit arm builds:
kernel/workqueue.c: In function ‘get_work_pwq’:
kernel/workqueue.c:713:24: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
713 | return (void *)(data & WORK_STRUCT_WQ_DATA_MASK);
| ^[ ... a couple of other cases ... ]
and while it's not immediately clear exactly why gcc started complaining about it now, I suspect it's some C23-induced enum type handlign fixup in gcc-13 is the cause.
Whatever the reason for starting to complain, the code and data types are indeed disgusting enough that the complaint is warranted.
The wq code ends up creating various "helper constants" (like that WORK_STRUCT_WQ_DATA_MASK) using an enum type, which is all kinds of confused. The mask needs to be 'unsigned long', not some unspecified enum type.
To make matters worse, the actual "mask and cast to a pointer" is repeated a couple of times, and the cast isn't even always done to the right pointer, but - as the error case above - to a 'void *' with then the compiler finishing the job.
That's now how we roll in the kernel.
So create the masks using the proper types rather than some ambiguous enumeration, and use a nice helper that actually does the type conversion in one well-defined place.
Incidentally, this magically makes clang generate better code. That, admittedly, is really just a sign of clang having been seriously confused before, and cleaning up the typing unconfuses the compiler too.
--- include/linux/workqueue.h | 15 ++++++++------- kernel/workqueue.c | 13 ++++++++----- 2 files changed, 16 insertions(+), 12 deletions(-)
include/linux/workqueue.h +8 -7
@@ -72,7 +72,6 @@ enum {WORK_OFFQ_FLAG_BASE =WORK_STRUCT_COLOR_SHIFT , __WORK_OFFQ_CANCELING = WORK_OFFQ_FLAG_BASE, - WORK_OFFQ_CANCELING = (1 << __WORK_OFFQ_CANCELING),/* * When a work item is off queue, its high bits point to the last
@@ -83,12 +82,6 @@ enum {WORK_OFFQ_POOL_SHIFT =WORK_OFFQ_FLAG_BASE +WORK_OFFQ_FLAG_BITS ,WORK_OFFQ_LEFT =BITS_PER_LONG -WORK_OFFQ_POOL_SHIFT ,WORK_OFFQ_POOL_BITS =WORK_OFFQ_LEFT <=31 ?WORK_OFFQ_LEFT :31 , -WORK_OFFQ_POOL_NONE = (1LU <<WORK_OFFQ_POOL_BITS ) -1 , - -/* convenience constants */ -WORK_STRUCT_FLAG_MASK = (1UL <<WORK_STRUCT_FLAG_BITS ) -1 , -WORK_STRUCT_WQ_DATA_MASK = ~WORK_STRUCT_FLAG_MASK , -WORK_STRUCT_NO_POOL = (unsigned long )WORK_OFFQ_POOL_NONE <<WORK_OFFQ_POOL_SHIFT ,/* bit mask for work_busy() return values */ WORK_BUSY_PENDING = 1 << 0,
@@ -98,6 +91,14 @@ enum { WORKER_DESC_LEN = 24, }; +/* Convenience constants - of type 'unsigned long', not 'enum'! */ +#define WORK_OFFQ_CANCELING (1ul << __WORK_OFFQ_CANCELING) +#define WORK_OFFQ_POOL_NONE ((1ul << WORK_OFFQ_POOL_BITS) - 1) +#define WORK_STRUCT_NO_POOL (WORK_OFFQ_POOL_NONE << WORK_OFFQ_POOL_SHIFT) + +#define WORK_STRUCT_FLAG_MASK ((1ul << WORK_STRUCT_FLAG_BITS) - 1) +#define WORK_STRUCT_WQ_DATA_MASK (~WORK_STRUCT_FLAG_MASK) +struct work_struct {atomic_long_t data;struct list_head entry;
kernel/workqueue.c +8 -5
@@ -682,12 +682,17 @@ static void clear_work_data(struct work_set_work_data (work,WORK_STRUCT_NO_POOL ,0 ); } +static inline struct pool_workqueue *work_struct_pwq (unsigned long data) +{ +return (struct pool_workqueue *)(data &WORK_STRUCT_WQ_DATA_MASK ); +} +static struct pool_workqueue *get_work_pwq (struct work_struct *work) {unsigned long data =atomic_long_read (&work->data);if (data &WORK_STRUCT_PWQ ) -return (void *)(data &WORK_STRUCT_WQ_DATA_MASK ); +return work_struct_pwq (data);else return NULL ; }
@@ -715,8 +720,7 @@ static struct worker_pool *get_work_poolassert_rcu_or_pool_mutex ();if (data &WORK_STRUCT_PWQ ) -return ((struct pool_workqueue *) - (data &WORK_STRUCT_WQ_DATA_MASK ))->pool; +return work_struct_pwq (data)->pool; pool_id = data >>WORK_OFFQ_POOL_SHIFT ;if (pool_id ==WORK_OFFQ_POOL_NONE )
@@ -737,8 +741,7 @@ static int get_work_pool_id(struct work_unsigned long data =atomic_long_read (&work->data);if (data &WORK_STRUCT_PWQ ) -return ((struct pool_workqueue *) - (data &WORK_STRUCT_WQ_DATA_MASK ))->pool->id; +return work_struct_pwq (data)->pool->id;return data >>WORK_OFFQ_POOL_SHIFT ; }
Greg Kroah-Hartman
maintainerPATCH 93/204 net: mvneta: fix txq_map in case of txq_number==1
In reply to Greg Kroah-HartmanFrom: Klaus Kudielka <[email protected]>
[ Upstream commit 21327f81db6337c8843ce755b01523c7d3df715b ]
If we boot with mvneta.txq_number=1, the txq_map is set incorrectly:MVNETA_CPU_TXQ_ACCESS(1) refers to TX queue 1, but only TX queue 0 is initialized. Fix this.
--- drivers/net/ethernet/marvell/mvneta.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/marvell/mvneta.c +2 -2
@@ -1402,7 +1402,7 @@ static void mvneta_defaults_set(struct mvneta_port *pp)*/ if (txq_number ==1 ) txq_map = (cpu == pp->rxq_def) ? -MVNETA_CPU_TXQ_ACCESS (1 ) :0 ; +MVNETA_CPU_TXQ_ACCESS (0 ) :0 ; }else { txq_map =MVNETA_CPU_TXQ_ACCESS_ALL_MASK ;
@@ -3387,7 +3387,7 @@ static void mvneta_percpu_elect(struct mvneta_port *pp)*/ if (txq_number ==1 ) txq_map = (cpu == elected_cpu) ? -MVNETA_CPU_TXQ_ACCESS (1 ) :0 ; +MVNETA_CPU_TXQ_ACCESS (0 ) :0 ;else txq_map =mvreg_read (pp,MVNETA_CPU_MAP (cpu)) &MVNETA_CPU_TXQ_ACCESS_ALL_MASK ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 94/204 udp6: fix udp6_ehashfn() typo
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 51d03e2f2203e76ed02d33fb5ffbb5fc85ffaf54 ]
Amit Klein reported that udp6_ehash_secret was initialized but never used.
--- net/ipv6/udp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv6/udp.c +1 -1
@@ -99,7 +99,7 @@ static u32 udp6_ehashfn(const struct net *net, fhash =__ipv6_addr_jhash (faddr, udp_ipv6_hash_secret);return __inet6_ehashfn (lhash, lport, fhash, fport, - udp_ipv6_hash_secret +net_hash_mix (net)); + udp6_ehash_secret +net_hash_mix (net)); } static u32 udp6_portaddr_hash(const struct net *net,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 95/204 ntb: idt: Fix error handling in idt_pci_driver_init()
In reply to Greg Kroah-HartmanFrom: Yuan Can <[email protected]>
[ Upstream commit c012968259b451dc4db407f2310fe131eaefd800 ]
A problem about ntb_hw_idt create debugfs failed is triggered with the following log given:
[ 1236.637636] IDT PCI-E Non-Transparent Bridge Driver 2.0 [ 1236.639292] debugfs: Directory 'ntb_hw_idt' with parent '/' already present!
The reason is that idt_pci_driver_init() returns pci_register_driver() directly without checking its return value, if pci_register_driver() failed, it returns without destroy the newly created debugfs, resulting the debugfs of ntb_hw_idt can never be created later.
idt_pci_driver_init()
debugfs_create_dir() # create debugfs directory pci_register_driver()
driver_register()
bus_add_driver()
priv = kzalloc(...) # OOM happened
# return without destroy debugfs directory
Fix by removing debugfs when pci_register_driver() returns error.
--- drivers/ntb/hw/idt/ntb_hw_idt.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/ntb/hw/idt/ntb_hw_idt.c +6 -1
@@ -2689,6 +2689,7 @@ static struct pci_driver idt_pci_driver = {static int __init idt_pci_driver_init (void ) { +int ret;pr_info ("%s %s\n" ,NTB_DESC ,NTB_VER );/* Create the top DebugFS directory if the FS is initialized */
@@ -2696,7 +2697,11 @@ static int __init idt_pci_driver_init(void) dbgfs_topdir =debugfs_create_dir (KBUILD_MODNAME ,NULL );/* Register the NTB hardware driver to handle the PCI device */ -return pci_register_driver (&idt_pci_driver); + ret =pci_register_driver (&idt_pci_driver); +if (ret) +debugfs_remove_recursive (dbgfs_topdir); + +return ret; }module_init (idt_pci_driver_init);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 96/204 NTB: amd: Fix error handling in amd_ntb_pci_driver_init()
In reply to Greg Kroah-HartmanFrom: Yuan Can <[email protected]>
[ Upstream commit 98af0a33c1101c29b3ce4f0cf4715fd927c717f9 ]
A problem about ntb_hw_amd create debugfs failed is triggered with the following log given:
[ 618.431232] AMD(R) PCI-E Non-Transparent Bridge Driver 1.0 [ 618.433284] debugfs: Directory 'ntb_hw_amd' with parent '/' already present!
The reason is that amd_ntb_pci_driver_init() returns pci_register_driver() directly without checking its return value, if pci_register_driver() failed, it returns without destroy the newly created debugfs, resulting the debugfs of ntb_hw_amd can never be created later.
amd_ntb_pci_driver_init()
debugfs_create_dir() # create debugfs directory pci_register_driver()
driver_register()
bus_add_driver()
priv = kzalloc(...) # OOM happened
# return without destroy debugfs directory
Fix by removing debugfs when pci_register_driver() returns error.
--- drivers/ntb/hw/amd/ntb_hw_amd.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/ntb/hw/amd/ntb_hw_amd.c +6 -1
@@ -1135,12 +1135,17 @@ static struct pci_driver amd_ntb_pci_driver = {static int __init amd_ntb_pci_driver_init (void ) { +int ret;pr_info ("%s %s\n" ,NTB_DESC ,NTB_VER );if (debugfs_initialized ()) debugfs_dir =debugfs_create_dir (KBUILD_MODNAME ,NULL ); -return pci_register_driver (&amd_ntb_pci_driver); + ret =pci_register_driver (&amd_ntb_pci_driver); +if (ret) +debugfs_remove_recursive (debugfs_dir); + +return ret; }module_init (amd_ntb_pci_driver_init);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 97/204 ntb: intel: Fix error handling in intel_ntb_pci_driver_init()
In reply to Greg Kroah-HartmanFrom: Yuan Can <[email protected]>
[ Upstream commit 4c3c796aca02883ad35bb117468938cc4022ca41 ]
A problem about ntb_hw_intel create debugfs failed is triggered with the following log given:
[ 273.112733] Intel(R) PCI-E Non-Transparent Bridge Driver 2.0 [ 273.115342] debugfs: Directory 'ntb_hw_intel' with parent '/' already present!
The reason is that intel_ntb_pci_driver_init() returns pci_register_driver() directly without checking its return value, if pci_register_driver() failed, it returns without destroy the newly created debugfs, resulting the debugfs of ntb_hw_intel can never be created later.
intel_ntb_pci_driver_init()
debugfs_create_dir() # create debugfs directory pci_register_driver()
driver_register()
bus_add_driver()
priv = kzalloc(...) # OOM happened
# return without destroy debugfs directory
Fix by removing debugfs when pci_register_driver() returns error.
--- drivers/ntb/hw/intel/ntb_hw_intel.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/ntb/hw/intel/ntb_hw_intel.c +6 -1
@@ -3041,12 +3041,17 @@ static struct pci_driver intel_ntb_pci_driver = {static int __init intel_ntb_pci_driver_init (void ) { +int ret;pr_info ("%s %s\n" ,NTB_DESC ,NTB_VER );if (debugfs_initialized ()) debugfs_dir =debugfs_create_dir (KBUILD_MODNAME ,NULL ); -return pci_register_driver (&intel_ntb_pci_driver); + ret =pci_register_driver (&intel_ntb_pci_driver); +if (ret) +debugfs_remove_recursive (debugfs_dir); + +return ret; }module_init (intel_ntb_pci_driver_init);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 98/204 NTB: ntb_transport: fix possible memory leak while device_register() fails
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 8623ccbfc55d962e19a3537652803676ad7acb90 ]
If device_register() returns error, the name allocated by dev_set_name() need be freed. As comment of device_register() says, it should use put_device() to give up the reference in the error path. So fix this by calling put_device(), then the name can be freed in kobject_cleanup(), and client_dev is freed in ntb_transport_client_release().
--- drivers/ntb/ntb_transport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ntb/ntb_transport.c +1 -1
@@ -395,7 +395,7 @@ int ntb_transport_register_client_dev(char *device_name) rc =device_register (dev);if (rc) { -kfree (client_dev); +put_device (dev); goto err; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 99/204 ipv6/addrconf: fix a potential refcount underflow for idev
In reply to Greg Kroah-HartmanFrom: Ziyang Xuan <[email protected]>
[ Upstream commit 06a0716949c22e2aefb648526580671197151acc ]
Now in addrconf_mod_rs_timer(), reference idev depends on whether rs_timer is not pending. Then modify rs_timer timeout.
There is a time gap in [1], during which if the pending rs_timer becomes not pending. It will miss to hold idev, but the rs_timer is activated. Thus rs_timer callback function addrconf_rs_timer() will be executed and put idev later without holding idev. A refcount underflow issue for idev can be caused by this.
if (!timer_pending(&idev->rs_timer)) in6_dev_hold(idev); <--------------[1] mod_timer(&idev->rs_timer, jiffies + when);
To fix the issue, hold idev if mod_timer() return 0.
--- net/ipv6/addrconf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/ipv6/addrconf.c +1 -2
@@ -325,9 +325,8 @@ static void addrconf_del_dad_work(struct inet6_ifaddr *ifp)static void addrconf_mod_rs_timer (struct inet6_dev *idev,unsigned long when) { -if (!timer_pending (&idev->rs_timer)) +if (!mod_timer (&idev->rs_timer, jiffies + when))in6_dev_hold (idev); -mod_timer (&idev->rs_timer, jiffies + when); } static void addrconf_mod_dad_work(struct inet6_ifaddr *ifp,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 100/204 wifi: airo: avoid uninitialized warning in airo_get_rate()
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 9373771aaed17f5c2c38485f785568abe3a9f8c1 ]
Quieten a gcc (11.3.0) build error or warning by checking the function call status and returning -EBUSY if the function call failed. This is similar to what several other wireless drivers do for the SIOCGIWRATE ioctl call when there is a locking problem.
drivers/net/wireless/cisco/airo.c: error: 'status_rid.currentXmitRate' is used uninitialized [-Werror=uninitialized]
--- drivers/net/wireless/cisco/airo.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/cisco/airo.c +4 -1
@@ -6102,8 +6102,11 @@ static int airo_get_rate(struct net_device *dev, {struct airo_info *local = dev->ml_priv;StatusRid status_rid;/* Card status info */ +int ret; -readStatusRid (local, &status_rid,1 ); + ret =readStatusRid (local, &status_rid,1 ); +if (ret) +return -EBUSY ; vwrq->value =le16_to_cpu (status_rid.currentXmitRate) *500000 ;/* If more than one rate, set auto */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 101/204 net/sched: make psched_mtu() RTNL-less safe
In reply to Greg Kroah-HartmanFrom: Pedro Tammela <[email protected]>
[ Upstream commit 150e33e62c1fa4af5aaab02776b6c3812711d478 ]
Eric Dumazet says[1]:
-------
Speaking of psched_mtu(), I see that net/sched/sch_pie.c is using it without holding RTNL, so dev->mtu can be changed underneath. KCSAN could issue a warning.
-------
Annotate dev->mtu with READ_ONCE() so KCSAN don't issue a warning.
[1] https://lore.kernel.org/all/CANn89iJoJO5VtaJ-2=_d2aOQhb0Xw8iBT_Cxqp2HyuS-zj6azw@mail.gmail.com/
v1 -> v2: Fix commit message
--- include/net/pkt_sched.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/pkt_sched.h +1 -1
@@ -133,7 +133,7 @@ extern const struct nla_policy rtm_tca_policy[TCA_MAX + 1];*/ static inline unsigned int psched_mtu (const struct net_device *dev) { -return dev->mtu + dev->hard_header_len; +return READ_ONCE (dev->mtu) + dev->hard_header_len; }static inline bool is_classid_clsact_ingress (u32 classid)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 102/204 tpm: tpm_vtpm_proxy: fix a race condition in /dev/vtpmx creation
In reply to Greg Kroah-HartmanFrom: Jarkko Sakkinen <[email protected]>
commit f4032d615f90970d6c3ac1d9c0bce3351eb4445c upstream.
/dev/vtpmx is made visible before 'workqueue' is initialized, which can lead to a memory corruption in the worst case scenario.
Address this by initializing 'workqueue' as the very first step of the driver initialization.
--- drivers/char/tpm/tpm_vtpm_proxy.c | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-)
drivers/char/tpm/tpm_vtpm_proxy.c +7 -23
@@ -700,37 +700,21 @@ static struct miscdevice vtpmx_miscdev = .fops = &vtpmx_fops, }; -static int vtpmx_init (void ) -{ -return misc_register (&vtpmx_miscdev); -} - -static void vtpmx_cleanup (void ) -{ -misc_deregister (&vtpmx_miscdev); -} -static int __init vtpm_module_init (void ) {int rc; - rc =vtpmx_init (); -if (rc) { -pr_err ("couldn't create vtpmx device\n" ); -return rc; - } - workqueue =create_workqueue ("tpm-vtpm" );if (!workqueue) {pr_err ("couldn't create workqueue\n" ); - rc = -ENOMEM ; - goto err_vtpmx_cleanup; +return -ENOMEM ; } -return 0 ; - -err_vtpmx_cleanup: -vtpmx_cleanup (); + rc =misc_register (&vtpmx_miscdev); +if (rc) { +pr_err ("couldn't create vtpmx device\n" ); +destroy_workqueue (workqueue); + }return rc; }
@@ -738,7 +722,7 @@ err_vtpmx_cleanup: static void __exit vtpm_module_exit(void) {destroy_workqueue (workqueue); -vtpmx_cleanup (); +misc_deregister (&vtpmx_miscdev); }module_init (vtpm_module_init);
Greg Kroah-Hartman
maintainerPATCH 103/204 SUNRPC: Fix UAF in svc_tcp_listen_data_ready()
In reply to Greg Kroah-HartmanFrom: Ding Hui <[email protected]>
commit fc80fc2d4e39137869da3150ee169b40bf879287 upstream.
After the listener svc_sock is freed, and before invoking svc_tcp_accept() for the established child sock, there is a window that the newsock retaining a freed listener svc_sock in sk_user_data which cloning from parent. In the race window, if data is received on the newsock, we will observe use-after-free report in svc_tcp_listen_data_ready().
Reproduce by two tasks:
1. while :; do rpc.nfsd 0 ; rpc.nfsd; done
2. while :; do echo "" | ncat -4 127.0.0.1 2049 ; done
KASAN report:
==================================================================
BUG: KASAN: slab-use-after-free in svc_tcp_listen_data_ready+0x1cf/0x1f0 [sunrpc] Read of size 8 at addr ffff888139d96228 by task nc/102553 CPU: 7 PID: 102553 Comm: nc Not tainted 6.3.0+ #18 Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 11/12/2020 Call Trace: <IRQ> dump_stack_lvl+0x33/0x50 print_address_description.constprop.0+0x27/0x310 print_report+0x3e/0x70 kasan_report+0xae/0xe0 svc_tcp_listen_data_ready+0x1cf/0x1f0 [sunrpc] tcp_data_queue+0x9f4/0x20e0 tcp_rcv_established+0x666/0x1f60 tcp_v4_do_rcv+0x51c/0x850 tcp_v4_rcv+0x23fc/0x2e80 ip_protocol_deliver_rcu+0x62/0x300 ip_local_deliver_finish+0x267/0x350 ip_local_deliver+0x18b/0x2d0 ip_rcv+0x2fb/0x370 __netif_receive_skb_one_core+0x166/0x1b0 process_backlog+0x24c/0x5e0 __napi_poll+0xa2/0x500 net_rx_action+0x854/0xc90 __do_softirq+0x1bb/0x5de do_softirq+0xcb/0x100 </IRQ> <TASK> ... </TASK> Allocated by task 102371: kasan_save_stack+0x1e/0x40 kasan_set_track+0x21/0x30 __kasan_kmalloc+0x7b/0x90 svc_setup_socket+0x52/0x4f0 [sunrpc] svc_addsock+0x20d/0x400 [sunrpc] __write_ports_addfd+0x209/0x390 [nfsd] write_ports+0x239/0x2c0 [nfsd] nfsctl_transaction_write+0xac/0x110 [nfsd] vfs_write+0x1c3/0xae0 ksys_write+0xed/0x1c0 do_syscall_64+0x38/0x90 entry_SYSCALL_64_after_hwframe+0x72/0xdc Freed by task 102551: kasan_save_stack+0x1e/0x40 kasan_set_track+0x21/0x30 kasan_save_free_info+0x2a/0x50 __kasan_slab_free+0x106/0x190 __kmem_cache_free+0x133/0x270 svc_xprt_free+0x1e2/0x350 [sunrpc] svc_xprt_destroy_all+0x25a/0x440 [sunrpc] nfsd_put+0x125/0x240 [nfsd] nfsd_svc+0x2cb/0x3c0 [nfsd] write_threads+0x1ac/0x2a0 [nfsd] nfsctl_transaction_write+0xac/0x110 [nfsd] vfs_write+0x1c3/0xae0 ksys_write+0xed/0x1c0 do_syscall_64+0x38/0x90 entry_SYSCALL_64_after_hwframe+0x72/0xdc
Fix the UAF by simply doing nothing in svc_tcp_listen_data_ready() if state != TCP_LISTEN, that will avoid dereferencing svsk for all child socket.
--- net/sunrpc/svcsock.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-)
net/sunrpc/svcsock.c +13 -14
@@ -766,12 +766,6 @@ static void svc_tcp_listen_data_ready(stdprintk ("svc: socket %p TCP (listen) state change %d\n" , sk, sk->sk_state); -if (svsk) { -/* Refer to svc_setup_socket() for details. */ -rmb (); - svsk->sk_odata (sk); - } -/* * This callback may called twice when a new connection * is established as a child socket inherits everything
@@ -780,15 +774,20 @@ static void svc_tcp_listen_data_ready(st* when one of child sockets become ESTABLISHED. * 2) data_ready method of the child socket may be called * when it receives data before the socket is accepted. -* In case of 2, we should ignore it silently. +* In case of 2, we should ignore it silently and DO NOT +* dereference svsk. */ -if (sk->sk_state ==TCP_LISTEN ) { -if (svsk) { -set_bit (XPT_CONN , &svsk->sk_xprt.xpt_flags); -svc_xprt_enqueue (&svsk->sk_xprt); - }else -printk ("svc: socket %p: no user data\n" , sk); - } +if (sk->sk_state !=TCP_LISTEN ) +return ; + +if (svsk) { +/* Refer to svc_setup_socket() for details. */ +rmb (); + svsk->sk_odata (sk); +set_bit (XPT_CONN , &svsk->sk_xprt.xpt_flags); +svc_xprt_enqueue (&svsk->sk_xprt); + }else +printk ("svc: socket %p: no user data\n" , sk); }/*
Greg Kroah-Hartman
maintainerPATCH 104/204 perf intel-pt: Fix CYC timestamps after standalone CBR
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
commit 430635a0ef1ce958b7b4311f172694ece2c692b8 upstream.
After a standalone CBR (not associated with TSC), update the cycles reference timestamp and reset the cycle count, so that CYC timestamps are calculated relative to that point with the new frequency.
--- tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 2 ++ 1 file changed, 2 insertions(+)
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +2 -0
@@ -1499,6 +1499,8 @@ static void intel_pt_calc_cbr(struct int decoder->cbr = cbr; decoder->cbr_cyc_to_tsc = decoder->max_non_turbo_ratio_fp / cbr; + decoder->cyc_ref_timestamp = decoder->timestamp; + decoder->cycle_cnt =0 ; }static void intel_pt_calc_cyc_timestamp (struct intel_pt_decoder *decoder)
Greg Kroah-Hartman
maintainerPATCH 105/204 ext4: fix wrong unit use in ext4_mb_clear_bb
In reply to Greg Kroah-HartmanFrom: Kemeng Shi <[email protected]>
commit 247c3d214c23dfeeeb892e91a82ac1188bdaec9f upstream.
Function ext4_issue_discard need count in cluster. Pass count_clusters instead of count to fix the mismatch.
--- fs/ext4/mballoc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/ext4/mballoc.c +2 -2
@@ -4976,8 +4976,8 @@ do_more:* them with group lock_held */ if (test_opt (sb,DISCARD )) { - err =ext4_issue_discard (sb, block_group, bit, count, -NULL ); + err =ext4_issue_discard (sb, block_group, bit, + count_clusters,NULL );if (err && err != -EOPNOTSUPP )ext4_msg (sb,KERN_WARNING ,"discard request in" " group:%d block:%d count:%lu failed"
Greg Kroah-Hartman
maintainerPATCH 106/204 ext4: only update i_reserved_data_blocks on successful block allocation
In reply to Greg Kroah-HartmanFrom: Baokun Li <[email protected]>
commit de25d6e9610a8b30cce9bbb19b50615d02ebca02 upstream.
In our fault injection test, we create an ext4 file, migrate it to non-extent based file, then punch a hole and finally trigger a WARN_ON in the ext4_da_update_reserve_space():
EXT4-fs warning (device sda): ext4_da_update_reserve_space:369:
ino 14, used 11 with only 10 reserved data blocks
When writing back a non-extent based file, if we enable delalloc, the number of reserved blocks will be subtracted from the number of blocks mapped by ext4_ind_map_blocks(), and the extent status tree will be updated. We update the extent status tree by first removing the old extent_status and then inserting the new extent_status. If the block range we remove happens to be in an extent, then we need to allocate another extent_status with ext4_es_alloc_extent().
use old to remove to add new
|----------|------------|------------|
old extent_status
The problem is that the allocation of a new extent_status failed due to a fault injection, and __es_shrink() did not get free memory, resulting in a return of -ENOMEM. Then do_writepages() retries after receiving -ENOMEM, we map to the same extent again, and the number of reserved blocks is again subtracted from the number of blocks in that extent. Since the blocks in the same extent are subtracted twice, we end up triggering WARN_ON at ext4_da_update_reserve_space() because used > ei->i_reserved_data_blocks.
For non-extent based file, we update the number of reserved blocks after ext4_ind_map_blocks() is executed, which causes a problem that when we call ext4_ind_map_blocks() to create a block, it doesn't always create a block, but we always reduce the number of reserved blocks. So we move the logic for updating reserved blocks to ext4_ind_map_blocks() to ensure that the number of reserved blocks is updated only after we do succeed in allocating some new blocks.
--- fs/ext4/indirect.c | 8 ++++++++ fs/ext4/inode.c | 10 ---------- 2 files changed, 8 insertions(+), 10 deletions(-)
fs/ext4/indirect.c +8 -0
@@ -642,6 +642,14 @@ int ext4_ind_map_blocks(handle_t *handleext4_update_inode_fsync_trans (handle, inode,1 ); count = ar.len; + +/* +* Update reserved blocks/metadata blocks after successful block +* allocation which had been deferred till now. +*/ +if (flags &EXT4_GET_BLOCKS_DELALLOC_RESERVE ) +ext4_da_update_reserve_space (inode, count,1 ); + got_it: map->m_flags |=EXT4_MAP_MAPPED ; map->m_pblk =le32_to_cpu (chain[depth-1 ].key);
fs/ext4/inode.c +0 -10
@@ -665,16 +665,6 @@ found:*/ ext4_clear_inode_state (inode,EXT4_STATE_EXT_MIGRATE ); } - -/* -* Update reserved blocks/metadata blocks after successful -* block allocation which had been deferred till now. We don't -* support fallocate for non extent files. So we can update -* reserve space here. -*/ -if ((retval >0 ) && - (flags &EXT4_GET_BLOCKS_DELALLOC_RESERVE )) -ext4_da_update_reserve_space (inode, retval,1 ); }if (retval >0 ) {
Greg Kroah-Hartman
maintainerPATCH 107/204 jfs: jfs_dmap: Validate db_l2nbperpage while mounting
In reply to Greg Kroah-HartmanFrom: Siddh Raman Pant <[email protected]>
commit 11509910c599cbd04585ec35a6d5e1a0053d84c1 upstream.
In jfs_dmap.c at line 381, BLKTODMAP is used to get a logical block number inside dbFree(). db_l2nbperpage, which is the log2 number of blocks per page, is passed as an argument to BLKTODMAP which uses it for shifting.
Syzbot reported a shift out-of-bounds crash because db_l2nbperpage is too big. This happens because the large value is set without any validation in dbMount() at line 181.
Thus, make sure that db_l2nbperpage is correct while mounting.
Max number of blocks per page = Page size / Min block size => log2(Max num_block per page) = log2(Page size / Min block size)
= log2(Page size) - log2(Min block size)
=> Max db_l2nbperpage = L2PSIZE - L2MINBLOCKSIZE
--- fs/jfs/jfs_dmap.c | 6 ++++++ fs/jfs/jfs_filsys.h | 2 ++ 2 files changed, 8 insertions(+)
fs/jfs/jfs_dmap.c +6 -0
@@ -191,7 +191,13 @@ int dbMount(struct inode *ipbmap) dbmp_le = (struct dbmap_disk *) mp->data; bmp->db_mapsize =le64_to_cpu (dbmp_le->dn_mapsize); bmp->db_nfree =le64_to_cpu (dbmp_le->dn_nfree); + bmp->db_l2nbperpage =le32_to_cpu (dbmp_le->dn_l2nbperpage); +if (bmp->db_l2nbperpage >L2PSIZE -L2MINBLOCKSIZE ) { + err = -EINVAL ; + goto err_release_metapage; + } + bmp->db_numag =le32_to_cpu (dbmp_le->dn_numag);if (!bmp->db_numag) { err = -EINVAL ;
fs/jfs/jfs_filsys.h +2 -0
@@ -135,7 +135,9 @@#define NUM_INODE_PER_IAG INOSPERIAG#define MINBLOCKSIZE 512 +#define L2MINBLOCKSIZE 9#define MAXBLOCKSIZE 4096 +#define L2MAXBLOCKSIZE 12#define MAXFILESIZE ((s64)1 << 52)#define JFS_LINK_MAX 0xffffffff
Greg Kroah-Hartman
maintainerPATCH 108/204 PCI: Add function 1 DMA alias quirk for Marvell 88SE9235
In reply to Greg Kroah-HartmanFrom: Robin Murphy <[email protected]>
commit 88d341716b83abd355558523186ca488918627ee upstream.
Marvell's own product brief implies the 92xx series are a closely related family, and sure enough it turns out that 9235 seems to need the same quirk as the other three, although possibly only when certain ports are used.
--- drivers/pci/quirks.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pci/quirks.c +2 -0
@@ -4035,6 +4035,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_M/* https://bugzilla.kernel.org/show_bug.cgi?id=42679#c49 */ DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_MARVELL_EXT ,0x9230 , quirk_dma_func1_alias); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_MARVELL_EXT ,0x9235 , + quirk_dma_func1_alias);DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_TTI ,0x0642 , quirk_dma_func1_alias); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TTI, 0x0645,
Greg Kroah-Hartman
maintainerPATCH 109/204 misc: pci_endpoint_test: Re-init completion for every test
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
commit fb620ae73b70c2f57b9d3e911fc24c024ba2324f upstream.
The irq_raised completion used to detect the end of a test case is initialized when the test device is probed, but never reinitialized again before a test case. As a result, the irq_raised completion synchronization is effective only for the first ioctl test case executed. Any subsequent call to wait_for_completion() by another ioctl() call will immediately return, potentially too early, leading to false positive failures.
Fix this by reinitializing the irq_raised completion before starting a new ioctl() test command.
--- drivers/misc/pci_endpoint_test.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/misc/pci_endpoint_test.c +4 -0
@@ -425,6 +425,10 @@ static long pci_endpoint_test_ioctl(strustruct pci_endpoint_test *test =to_endpoint_test (file->private_data);mutex_lock (&test->mutex); + +reinit_completion (&test->irq_raised); + test->last_irq = -ENODATA ; +switch (cmd) {case PCITEST_BAR : bar = arg;
Greg Kroah-Hartman
maintainerPATCH 110/204 md/raid0: add discard support for the original layout
In reply to Greg Kroah-HartmanFrom: Jason Baron <[email protected]>
commit e836007089ba8fdf24e636ef2b007651fb4582e6 upstream.
We've found that using raid0 with the 'original' layout and discard enabled with different disk sizes (such that at least two zones are created) can result in data corruption. This is due to the fact that the discard handling in 'raid0_handle_discard()' assumes the 'alternate' layout. We've seen this corruption using ext4 but other filesystems are likely susceptible as well.
More specifically, while multiple zones are necessary to create the corruption, the corruption may not occur with multiple zones if they layout in such a way the layout matches what the 'alternate' layout would have produced. Thus, not all raid0 devices with the 'original' layout, different size disks and discard enabled will encounter this corruption.
The 3.14 kernel inadvertently changed the raid0 disk layout for different size disks. Thus, running a pre-3.14 kernel and post-3.14 kernel on the same raid0 array could corrupt data. This lead to the creation of the 'original' layout (to match the pre-3.14 layout) and the 'alternate' layout (to match the post 3.14 layout) in the 5.4 kernel time frame and an option to tell the kernel which layout to use (since it couldn't be autodetected). However, when the 'original' layout was added back to 5.4 discard support for the 'original' layout was not added leading this issue.
I've been able to reliably reproduce the corruption with the following test case:
1. create raid0 array with different size disks using original layout
2. mkfs
3. mount -o discard
4. create lots of files
5. remove 1/2 the files
6. fstrim -a (or just the mount point for the raid0 array)
7. umount
8. fsck -fn /dev/md0 (spews all sorts of corruptions)
Let's fix this by adding proper discard support to the 'original' layout. The fix 'maps' the 'original' layout disks to the order in which they are read/written such that we can compare the disks in the same way that the current 'alternate' layout does. A 'disk_shift' field is added to 'struct strip_zone'. This could be computed on the fly in raid0_handle_discard() but by adding this field, we save some computation in the discard path.
Note we could also potentially fix this by re-ordering the disks in the zones that follow the first one, and then always read/writing them using the 'alternate' layout. However, that is seen as a more substantial change, and we are attempting the least invasive fix at this time to remedy the corruption.
I've verified the change using the reproducer mentioned above. Typically, the corruption is seen after less than 3 iterations, while the patch has run 500+ iterations.
--- drivers/md/raid0.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++------- drivers/md/raid0.h | 1 2 files changed, 55 insertions(+), 8 deletions(-)
drivers/md/raid0.c +54 -8
@@ -294,6 +294,18 @@ static int create_strip_zones(struct mdd goto abort; } +if (conf->layout ==RAID0_ORIG_LAYOUT ) { +for (i =1 ; i < conf->nr_strip_zones; i++) { +sector_t first_sector = conf->strip_zone[i-1 ].zone_end; + +sector_div (first_sector, mddev->chunk_sectors); + zone = conf->strip_zone + i; +/* disk_shift is first disk index used in the zone */ + zone->disk_shift =sector_div (first_sector, + zone->nb_dev); + } + } +pr_debug ("md/raid0:%s: done.\n" ,mdname (mddev)); *private_conf = conf;
@@ -480,6 +492,20 @@ static inline int is_io_in_chunk_boundar } } +/* +* Convert disk_index to the disk order in which it is read/written. +* For example, if we have 4 disks, they are numbered 0,1,2,3. If we +* write the disks starting at disk 3, then the read/write order would +* be disk 3, then 0, then 1, and then disk 2 and we want map_disk_shift() +* to map the disks as follows 0,1,2,3 => 1,2,3,0. So disk 0 would map +* to 1, 1 to 2, 2 to 3, and 3 to 0. That way we can compare disks in +* that 'output' space to understand the read/write disk ordering. +*/ +static int map_disk_shift (int disk_index,int num_disks,int disk_shift) +{ +return ((disk_index + num_disks - disk_shift) % num_disks); +} +static void raid0_handle_discard (struct mddev *mddev,struct bio *bio) {struct r0conf *conf = mddev->private;
@@ -493,7 +519,9 @@ static void raid0_handle_discard(structsector_t end_disk_offset;unsigned int end_disk_index;unsigned int disk; +sector_t orig_start, orig_end; + orig_start = start; zone =find_zone (conf, &start);if (bio_end_sector (bio) > zone->zone_end) {
@@ -507,6 +535,7 @@ static void raid0_handle_discard(struct }else end =bio_end_sector (bio); + orig_end = end;if (zone != conf->strip_zone) end = end - zone[-1 ].zone_end;
@@ -518,13 +547,26 @@ static void raid0_handle_discard(struct last_stripe_index = end;sector_div (last_stripe_index, stripe_size); - start_disk_index = (int )(start - first_stripe_index * stripe_size) / - mddev->chunk_sectors; +/* In the first zone the original and alternate layouts are the same */ +if ((conf->layout ==RAID0_ORIG_LAYOUT ) && (zone != conf->strip_zone)) { +sector_div (orig_start, mddev->chunk_sectors); + start_disk_index =sector_div (orig_start, zone->nb_dev); + start_disk_index =map_disk_shift (start_disk_index, + zone->nb_dev, + zone->disk_shift); +sector_div (orig_end, mddev->chunk_sectors); + end_disk_index =sector_div (orig_end, zone->nb_dev); + end_disk_index =map_disk_shift (end_disk_index, + zone->nb_dev, zone->disk_shift); + }else { + start_disk_index = (int )(start - first_stripe_index * stripe_size) / + mddev->chunk_sectors; + end_disk_index = (int )(end - last_stripe_index * stripe_size) / + mddev->chunk_sectors; + } start_disk_offset = ((int )(start - first_stripe_index * stripe_size) % mddev->chunk_sectors) + first_stripe_index * mddev->chunk_sectors; - end_disk_index = (int )(end - last_stripe_index * stripe_size) / - mddev->chunk_sectors; end_disk_offset = ((int )(end - last_stripe_index * stripe_size) % mddev->chunk_sectors) + last_stripe_index * mddev->chunk_sectors;
@@ -533,18 +575,22 @@ static void raid0_handle_discard(structsector_t dev_start, dev_end;struct bio *discard_bio =NULL ;struct md_rdev *rdev; +int compare_disk; + + compare_disk =map_disk_shift (disk, zone->nb_dev, + zone->disk_shift); -if (disk < start_disk_index) +if (compare_disk < start_disk_index) dev_start = (first_stripe_index +1 ) * mddev->chunk_sectors; -else if (disk > start_disk_index) +else if (compare_disk > start_disk_index) dev_start = first_stripe_index * mddev->chunk_sectors;else dev_start = start_disk_offset; -if (disk < end_disk_index) +if (compare_disk < end_disk_index) dev_end = (last_stripe_index +1 ) * mddev->chunk_sectors; -else if (disk > end_disk_index) +else if (compare_disk > end_disk_index) dev_end = last_stripe_index * mddev->chunk_sectors;else dev_end = end_disk_offset;
drivers/md/raid0.h +1 -0
@@ -6,6 +6,7 @@ struct strip_zone {sector_t zone_end;/* Start of the next zone (in sectors) */ sector_t dev_start;/* Zone offset in real dev (in sectors) */ int nb_dev;/* # of devices attached to the zone */ +int disk_shift;/* start disk for the original layout */ };/* Linux 3.14 (20d0189b101) made an unintended change to
Greg Kroah-Hartman
maintainerPATCH 111/204 fs: dlm: return positive pid value for F_GETLK
In reply to Greg Kroah-HartmanFrom: Alexander Aring <[email protected]>
commit 92655fbda5c05950a411eaabc19e025e86e2a291 upstream.
The GETLK pid values have all been negated since commit 9d5b86ac13c5 ("fs/locks: Remove fl_nspid and use fs-specific l_pid for remote locks"). Revert this for local pids, and leave in place negative pids for remote owners.
--- fs/dlm/plock.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/dlm/plock.c +3 -1
@@ -366,7 +366,9 @@ int dlm_posix_get(dlm_lockspace_t *lockslocks_init_lock (fl); fl->fl_type = (op->info.ex) ?F_WRLCK :F_RDLCK ; fl->fl_flags =FL_POSIX ; - fl->fl_pid = -op->info.pid; + fl->fl_pid = op->info.pid; +if (op->info.nodeid !=dlm_our_nodeid ()) + fl->fl_pid = -fl->fl_pid; fl->fl_start = op->info.start; fl->fl_end = op->info.end; rv =0 ;
Greg Kroah-Hartman
maintainerPATCH 112/204 hwrng: imx-rngc - fix the timeout for init and self check
In reply to Greg Kroah-HartmanFrom: Martin Kaiser <[email protected]>
commit d744ae7477190967a3ddc289e2cd4ae59e8b1237 upstream.
Fix the timeout that is used for the initialisation and for the self test. wait_for_completion_timeout expects a timeout in jiffies, but RNGC_TIMEOUT is in milliseconds. Call msecs_to_jiffies to do the conversion.
--- drivers/char/hw_random/imx-rngc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/char/hw_random/imx-rngc.c +2 -4
@@ -104,7 +104,7 @@ static int imx_rngc_self_test(struct imx cmd =readl (rngc->base +RNGC_COMMAND );writel (cmd |RNGC_CMD_SELF_TEST , rngc->base +RNGC_COMMAND ); - ret =wait_for_completion_timeout (&rngc->rng_op_done,RNGC_TIMEOUT ); + ret =wait_for_completion_timeout (&rngc->rng_op_done,msecs_to_jiffies (RNGC_TIMEOUT ));if (!ret) {imx_rngc_irq_mask_clear (rngc);return -ETIMEDOUT ;
@@ -187,9 +187,7 @@ static int imx_rngc_init(struct hwrng *r cmd =readl (rngc->base +RNGC_COMMAND );writel (cmd |RNGC_CMD_SEED , rngc->base +RNGC_COMMAND ); - ret =wait_for_completion_timeout (&rngc->rng_op_done, -RNGC_TIMEOUT ); - + ret =wait_for_completion_timeout (&rngc->rng_op_done,msecs_to_jiffies (RNGC_TIMEOUT ));if (!ret) {imx_rngc_irq_mask_clear (rngc);return -ETIMEDOUT ;
Greg Kroah-Hartman
maintainerPATCH 113/204 meson saradc: fix clock divider mask length
In reply to Greg Kroah-HartmanFrom: George Stark <[email protected]>
commit c57fa0037024c92c2ca34243e79e857da5d2c0a9 upstream.
According to the datasheets of supported meson SoCs length of ADC_CLK_DIV field is 6-bit. Although all supported SoCs have the register with that field documented later SoCs use external clock rather than ADC internal clock so this patch affects only meson8 family (S8* SoCs).
--- drivers/iio/adc/meson_saradc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/meson_saradc.c +1 -1
@@ -75,7 +75,7 @@#define MESON_SAR_ADC_REG3_PANEL_DETECT_COUNT_MASK GENMASK(20, 18)#define MESON_SAR_ADC_REG3_PANEL_DETECT_FILTER_TB_MASK GENMASK(17, 16)#define MESON_SAR_ADC_REG3_ADC_CLK_DIV_SHIFT 10 -#define MESON_SAR_ADC_REG3_ADC_CLK_DIV_WIDTH 5 +#define MESON_SAR_ADC_REG3_ADC_CLK_DIV_WIDTH 6#define MESON_SAR_ADC_REG3_BLOCK_DLY_SEL_MASK GENMASK(9, 8)#define MESON_SAR_ADC_REG3_BLOCK_DLY_MASK GENMASK(7, 0)
Greg Kroah-Hartman
maintainerPATCH 114/204 Revert "8250: add support for ASIX devices with a FIFO bug"
In reply to Greg Kroah-HartmanFrom: Jiaqing Zhao <[email protected]>
commit a82d62f708545d22859584e0e0620da8e3759bbc upstream.
This reverts commit eb26dfe8aa7eeb5a5aa0b7574550125f8aa4c3b3.
Commit eb26dfe8aa7e ("8250: add support for ASIX devices with a FIFO bug") merged on Jul 13, 2012 adds a quirk for PCI_VENDOR_ID_ASIX (0x9710). But that ID is the same as PCI_VENDOR_ID_NETMOS defined in 1f8b061050c7 ("[PATCH] Netmos parallel/serial/combo support") merged on Mar 28, 2005. In pci_serial_quirks array, the NetMos entry always takes precedence over the ASIX entry even since it was initially merged, code in that commit is always unreachable.
In my tests, adding the FIFO workaround to pci_netmos_init() makes no difference, and the vendor driver also does not have such workaround. Given that the code was never used for over a decade, it's safe to revert it.
Also, the real PCI_VENDOR_ID_ASIX should be 0x125b, which is used on their newer AX99100 PCIe serial controllers released on 2016. The FIFO workaround should not be intended for these newer controllers, and it was never implemented in vendor driver.
--- drivers/tty/serial/8250/8250.h | 1 - drivers/tty/serial/8250/8250_pci.c | 19 ------------------- drivers/tty/serial/8250/8250_port.c | 11 +++-------- include/linux/serial_8250.h | 1 - 4 files changed, 3 insertions(+), 29 deletions(-)
drivers/tty/serial/8250/8250.h +0 -1
@@ -89,7 +89,6 @@ struct serial8250_config {#define UART_BUG_TXEN (1 << 1)/* UART has buggy TX IIR status */ #define UART_BUG_NOMSR (1 << 2)/* UART has buggy MSR status bits (Au1x00) */ #define UART_BUG_THRE (1 << 3)/* UART has buggy THRE reassertion */ -#define UART_BUG_PARITY (1 << 4)/* UART mishandles parity if FIFO enabled */ #ifdef CONFIG_SERIAL_8250_SHARE_IRQ
drivers/tty/serial/8250/8250_pci.c +0 -19
@@ -1052,14 +1052,6 @@ static int pci_oxsemi_tornado_init(strucreturn number_uarts; } -static int pci_asix_setup (struct serial_private *priv, -const struct pciserial_board *board, -struct uart_8250_port *port,int idx) -{ - port->bugs |=UART_BUG_PARITY ; -return pci_default_setup (priv, board, port, idx); -} -/* Quatech devices have their own extra interface features */ struct quatech_feature {
@@ -1686,7 +1678,6 @@ pci_wch_ch38x_setup(struct serial_privat#define PCI_DEVICE_ID_WCH_CH355_4S 0x7173#define PCI_VENDOR_ID_AGESTAR 0x5372#define PCI_DEVICE_ID_AGESTAR_9375 0x6872 -#define PCI_VENDOR_ID_ASIX 0x9710#define PCI_DEVICE_ID_BROADCOM_TRUMANAGE 0x160a#define PCI_DEVICE_ID_AMCC_ADDIDATA_APCI7800 0x818e
@@ -2467,16 +2458,6 @@ static struct pci_serial_quirk pci_seria .setup = pci_wch_ch38x_setup, },/* -* ASIX devices with FIFO bug -*/ - { - .vendor = PCI_VENDOR_ID_ASIX, - .device = PCI_ANY_ID, - .subvendor = PCI_ANY_ID, - .subdevice = PCI_ANY_ID, - .setup = pci_asix_setup, - }, -/* * Broadcom TruManage (NetXtreme) */ {
drivers/tty/serial/8250/8250_port.c +3 -8
@@ -2609,11 +2609,8 @@ static unsigned char serial8250_compute_if (c_cflag &CSTOPB ) cval |=UART_LCR_STOP ; -if (c_cflag &PARENB ) { +if (c_cflag &PARENB ) cval |=UART_LCR_PARITY ; -if (up->bugs &UART_BUG_PARITY ) - up->fifo_bug = true; - }if (!(c_cflag &PARODD )) cval |=UART_LCR_EPAR ;#ifdef CMSPAR
@@ -2702,8 +2699,7 @@ serial8250_do_set_termios(struct uart_po up->lcr = cval;/* Save computed LCR */ if (up->capabilities &UART_CAP_FIFO && port->fifosize >1 ) { -/* NOTE: If fifo_bug is not set, a user can set RX_trigger. */ -if ((baud <2400 && !up->dma) || up->fifo_bug) { +if (baud <2400 && !up->dma) { up->fcr &= ~UART_FCR_TRIGGER_MASK ; up->fcr |=UART_FCR_TRIGGER_1 ; }
@@ -3039,8 +3035,7 @@ static int do_set_rxtrig(struct tty_portstruct uart_8250_port *up =up_to_u8250p (uport);int rxtrig; -if (!(up->capabilities &UART_CAP_FIFO ) || uport->fifosize <=1 || - up->fifo_bug) +if (!(up->capabilities &UART_CAP_FIFO ) || uport->fifosize <=1 )return -EINVAL ; rxtrig =bytes_to_fcr_rxtrig (up, bytes);
include/linux/serial_8250.h +0 -1
@@ -99,7 +99,6 @@ struct uart_8250_port {struct list_head list;/* ports on this IRQ */ u32 capabilities;/* port capabilities */ unsigned short bugs;/* port bugs */ -bool fifo_bug;/* min RX trigger if enabled */ unsigned int tx_loadsz;/* transmit fifo load size */ unsigned char acr;unsigned char fcr;
Greg Kroah-Hartman
maintainerPATCH 115/204 tty: serial: samsung_tty: Fix a memory leak in s3c24xx_serial_getclk() in case of error
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
commit a9c09546e903f1068acfa38e1ee18bded7114b37 upstream.
If clk_get_rate() fails, the clk that has just been allocated needs to be freed.
Message-ID: <e4baf6039368f52e5a5453982ddcb9a330fc689e.1686412569.git.christophe.jaillet@wanadoo.fr>
--- drivers/tty/serial/samsung.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/tty/serial/samsung.c +5 -1
@@ -1177,8 +1177,12 @@ static unsigned int s3c24xx_serial_getclcontinue ; rate =clk_get_rate (clk); -if (!rate) +if (!rate) { +dev_err (ourport->port.dev, +"Failed to get clock rate for %s.\n" , clkname); +clk_put (clk);continue ; + }if (ourport->info->has_divslot) {unsigned long div = rate / req_baud;
Greg Kroah-Hartman
maintainerPATCH 116/204 tty: serial: samsung_tty: Fix a memory leak in s3c24xx_serial_getclk() when iterating clk
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
commit 832e231cff476102e8204a9e7bddfe5c6154a375 upstream.
When the best clk is searched, we iterate over all possible clk.
If we find a better match, the previous one, if any, needs to be freed. If a better match has already been found, we still need to free the new one, otherwise it leaks.
Message-ID: <cf3e0053d2fc7391b2d906a86cd01a5ef15fb9dc.1686412569.git.christophe.jaillet@wanadoo.fr>
--- drivers/tty/serial/samsung.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/tty/serial/samsung.c +8 -0
@@ -1208,10 +1208,18 @@ static unsigned int s3c24xx_serial_getcl calc_deviation = -calc_deviation;if (calc_deviation < deviation) { +/* +* If we find a better clk, release the previous one, if +* any. +*/ +if (!IS_ERR (*best_clk)) +clk_put (*best_clk); *best_clk = clk; best_quot = quot; *clk_num = cnt; deviation = calc_deviation; + }else { +clk_put (clk); } }
Greg Kroah-Hartman
maintainerPATCH 117/204 ring-buffer: Fix deadloop issue on reading trace_pipe
In reply to Greg Kroah-HartmanFrom: Zheng Yejian <[email protected]>
commit 7e42907f3a7b4ce3a2d1757f6d78336984daf8f5 upstream.
Soft lockup occurs when reading file 'trace_pipe':
watchdog: BUG: soft lockup - CPU#6 stuck for 22s! [cat:4488] [...] RIP: 0010:ring_buffer_empty_cpu+0xed/0x170 RSP: 0018:ffff88810dd6fc48 EFLAGS: 00000246 RAX: 0000000000000000 RBX: 0000000000000246 RCX: ffffffff93d1aaeb RDX: ffff88810a280040 RSI: 0000000000000008 RDI: ffff88811164b218 RBP: ffff88811164b218 R08: 0000000000000000 R09: ffff88815156600f R10: ffffed102a2acc01 R11: 0000000000000001 R12: 0000000051651901 R13: 0000000000000000 R14: ffff888115e49500 R15: 0000000000000000 [...] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f8d853c2000 CR3: 000000010dcd8000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: __find_next_entry+0x1a8/0x4b0 ? peek_next_entry+0x250/0x250 ? down_write+0xa5/0x120 ? down_write_killable+0x130/0x130 trace_find_next_entry_inc+0x3b/0x1d0 tracing_read_pipe+0x423/0xae0 ? tracing_splice_read_pipe+0xcb0/0xcb0 vfs_read+0x16b/0x490 ksys_read+0x105/0x210 ? __ia32_sys_pwrite64+0x200/0x200 ? switch_fpu_return+0x108/0x220 do_syscall_64+0x33/0x40 entry_SYSCALL_64_after_hwframe+0x61/0xc6
Through the vmcore, I found it's because in tracing_read_pipe(), ring_buffer_empty_cpu() found some buffer is not empty but then it cannot read anything due to "rb_num_of_entries() == 0" always true, Then it infinitely loop the procedure due to user buffer not been filled, see following code path:
tracing_read_pipe() {
... ...
waitagain:
tracing_wait_pipe() // 1. find non-empty buffer here
trace_find_next_entry_inc() // 2. loop here try to find an entry
__find_next_entry()
ring_buffer_empty_cpu(); // 3. find non-empty buffer
peek_next_entry() // 4. but peek always return NULL
ring_buffer_peek()
rb_buffer_peek()
rb_get_reader_page()
// 5. because rb_num_of_entries() == 0 always true here
// then return NULL
// 6. user buffer not been filled so goto 'waitgain'
// and eventually leads to an deadloop in kernel!!!}
By some analyzing, I found that when resetting ringbuffer, the 'entries' of its pages are not all cleared (see rb_reset_cpu()). Then when reducing the ringbuffer, and if some reduced pages exist dirty 'entries' data, they will be added into 'cpu_buffer->overrun' (see rb_remove_pages()), which cause wrong 'overrun' count and eventually cause the deadloop issue.
To fix it, we need to clear every pages in rb_reset_cpu().
--- kernel/trace/ring_buffer.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)
kernel/trace/ring_buffer.c +15 -9
@@ -4277,28 +4277,34 @@ unsigned long ring_buffer_size(struct ri }EXPORT_SYMBOL_GPL (ring_buffer_size); +static void rb_clear_buffer_page (struct buffer_page *page) +{ +local_set (&page->write,0 ); +local_set (&page->entries,0 ); +rb_init_page (page->page); + page->read =0 ; +} +static void rb_reset_cpu (struct ring_buffer_per_cpu *cpu_buffer) { +struct buffer_page *page; +rb_head_page_deactivate (cpu_buffer); cpu_buffer->head_page = list_entry(cpu_buffer->pages, struct buffer_page, list); -local_set (&cpu_buffer->head_page->write,0 ); -local_set (&cpu_buffer->head_page->entries,0 ); -local_set (&cpu_buffer->head_page->page->commit,0 ); - - cpu_buffer->head_page->read =0 ; +rb_clear_buffer_page (cpu_buffer->head_page); +list_for_each_entry (page, cpu_buffer->pages, list) { +rb_clear_buffer_page (page); + } cpu_buffer->tail_page = cpu_buffer->head_page; cpu_buffer->commit_page = cpu_buffer->head_page;INIT_LIST_HEAD (&cpu_buffer->reader_page->list);INIT_LIST_HEAD (&cpu_buffer->new_pages); -local_set (&cpu_buffer->reader_page->write,0 ); -local_set (&cpu_buffer->reader_page->entries,0 ); -local_set (&cpu_buffer->reader_page->page->commit,0 ); - cpu_buffer->reader_page->read =0 ; +rb_clear_buffer_page (cpu_buffer->reader_page);local_set (&cpu_buffer->entries_bytes,0 );local_set (&cpu_buffer->overrun,0 );
Greg Kroah-Hartman
maintainerPATCH 118/204 xtensa: ISS: fix call to split_if_spec
In reply to Greg Kroah-HartmanFrom: Max Filippov <[email protected]>
commit bc8d5916541fa19ca5bc598eb51a5f78eb891a36 upstream.
split_if_spec expects a NULL-pointer as an end marker for the argument list, but tuntap_probe never supplied that terminating NULL. As a result incorrectly formatted interface specification string may cause a crash because of the random memory access. Fix that by adding NULL terminator to the split_if_spec argument list.
--- arch/xtensa/platforms/iss/network.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/xtensa/platforms/iss/network.c +1 -1
@@ -234,7 +234,7 @@ static int tuntap_probe(struct iss_net_p init +=sizeof (TRANSPORT_TUNTAP_NAME ) -1 ;if (*init ==',' ) { - rem =split_if_spec (init +1 , &mac_str, &dev_name); + rem =split_if_spec (init +1 , &mac_str, &dev_name,NULL );if (rem !=NULL ) {pr_err ("%s: extra garbage on specification : '%s'\n" , dev->name, rem);
Greg Kroah-Hartman
maintainerPATCH 119/204 scsi: qla2xxx: Wait for io return on terminate rport
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
commit fc0cba0c7be8261a1625098bd1d695077ec621c9 upstream.
System crash due to use after free.
Current code allows terminate_rport_io to exit before making sure all IOs has returned. For FCP-2 device, IO's can hang on in HW because driver has not tear down the session in FW at first sign of cable pull. When dev_loss_tmo timer pops, terminate_rport_io is called and upper layer is about to free various resources. Terminate_rport_io trigger qla to do the final cleanup, but the cleanup might not be fast enough where it leave qla still holding on to the same resource.
Wait for IO's to return to upper layer before resources are freed.
--- drivers/scsi/qla2xxx/qla_attr.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/scsi/qla2xxx/qla_attr.c +13 -0
@@ -1779,6 +1779,7 @@ static void qla2x00_terminate_rport_io(struct fc_rport *rport) {fc_port_t *fcport = *(fc_port_t **)rport->dd_data; +scsi_qla_host_t *vha;if (!fcport)return ;
@@ -1788,9 +1789,12 @@ qla2x00_terminate_rport_io(struct fc_rpoif (test_bit (ABORT_ISP_ACTIVE , &fcport->vha->dpc_flags))return ; + vha = fcport->vha;if (unlikely (pci_channel_offline (fcport->vha->hw->pdev))) {qla2x00_abort_all_cmds (fcport->vha,DID_NO_CONNECT <<16 ); +qla2x00_eh_wait_for_pending_commands (fcport->vha, fcport->d_id.b24, +0 ,WAIT_TARGET );return ; }/*
@@ -1805,6 +1809,15 @@ qla2x00_terminate_rport_io(struct fc_rpoelse qla2x00_port_logout (fcport->vha, fcport); } + +/* check for any straggling io left behind */ +if (qla2x00_eh_wait_for_pending_commands (fcport->vha, fcport->d_id.b24,0 ,WAIT_TARGET )) { +ql_log (ql_log_warn, vha,0x300b , +"IO not return. Resetting. \n" ); +set_bit (ISP_ABORT_NEEDED , &vha->dpc_flags); +qla2xxx_wake_dpc (vha); +qla2x00_wait_for_chip_reset (vha); + } } static int
Greg Kroah-Hartman
maintainerPATCH 120/204 scsi: qla2xxx: Fix potential NULL pointer dereference
In reply to Greg Kroah-HartmanFrom: Bikash Hazarika <[email protected]>
commit 464ea494a40c6e3e0e8f91dd325408aaf21515ba upstream.
Klocwork tool reported 'cur_dsd' may be dereferenced. Add fix to validate pointer before dereferencing the pointer.
--- drivers/scsi/qla2xxx/qla_iocb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_iocb.c +2 -1
@@ -598,7 +598,8 @@ qla24xx_build_scsi_type_6_iocbs(srb_t *s *((uint32_t *)(&cmd_pkt->entry_type)) =cpu_to_le32 (COMMAND_TYPE_6 );/* No data transfer */ -if (!scsi_bufflen (cmd) || cmd->sc_data_direction ==DMA_NONE ) { +if (!scsi_bufflen (cmd) || cmd->sc_data_direction ==DMA_NONE || + tot_dsds ==0 ) { cmd_pkt->byte_count =cpu_to_le32 (0 );return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 121/204 scsi: qla2xxx: Check valid rport returned by fc_bsg_to_rport()
In reply to Greg Kroah-HartmanFrom: Nilesh Javali <[email protected]>
commit af73f23a27206ffb3c477cac75b5fcf03410556e upstream.
Klocwork reported warning of rport maybe NULL and will be dereferenced. rport returned by call to fc_bsg_to_rport() could be NULL and dereferenced.
Check valid rport returned by fc_bsg_to_rport().
--- drivers/scsi/qla2xxx/qla_bsg.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/scsi/qla2xxx/qla_bsg.c +4 -0
@@ -264,6 +264,10 @@ qla2x00_process_els(struct bsg_job *bsg_if (bsg_request->msgcode ==FC_BSG_RPT_ELS ) { rport =fc_bsg_to_rport (bsg_job); +if (!rport) { + rval = -ENOMEM ; + goto done; + } fcport = *(fc_port_t **) rport->dd_data; host =rport_to_shost (rport); vha =shost_priv (host);
Greg Kroah-Hartman
maintainerPATCH 122/204 scsi: qla2xxx: Pointer may be dereferenced
In reply to Greg Kroah-HartmanFrom: Shreyas Deodhar <[email protected]>
commit 00eca15319d9ce8c31cdf22f32a3467775423df4 upstream.
Klocwork tool reported pointer 'rport' returned from call to function fc_bsg_to_rport() may be NULL and will be dereferenced.
Add a fix to validate rport before dereferencing.
--- drivers/scsi/qla2xxx/qla_bsg.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/scsi/qla2xxx/qla_bsg.c +2 -0
@@ -2493,6 +2493,8 @@ qla24xx_bsg_request(struct bsg_job *bsg_if (bsg_request->msgcode ==FC_BSG_RPT_ELS ) { rport =fc_bsg_to_rport (bsg_job); +if (!rport) +return ret; host =rport_to_shost (rport); vha =shost_priv (host); }else {
Greg Kroah-Hartman
maintainerPATCH 123/204 serial: atmel: dont enable IRQs prematurely
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit 27a826837ec9a3e94cc44bd9328b8289b0fcecd7 upstream.
The atmel_complete_tx_dma() function disables IRQs at the start of the function by calling spin_lock_irqsave(&port->lock, flags); There is no need to disable them a second time using the spin_lock_irq() function and, in fact, doing so is a bug because it will enable IRQs prematurely when we call spin_unlock_irq().
Just use spin_lock/unlock() instead without disabling or enabling IRQs.
--- drivers/tty/serial/atmel_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/tty/serial/atmel_serial.c +2 -2
@@ -798,11 +798,11 @@ static void atmel_complete_tx_dma(void * port->icount.tx += atmel_port->tx_len; -spin_lock_irq (&atmel_port->lock_tx); +spin_lock (&atmel_port->lock_tx);async_tx_ack (atmel_port->desc_tx); atmel_port->cookie_tx = -EINVAL ; atmel_port->desc_tx =NULL ; -spin_unlock_irq (&atmel_port->lock_tx); +spin_unlock (&atmel_port->lock_tx);if (uart_circ_chars_pending (xmit) <WAKEUP_CHARS )uart_write_wakeup (port);
Greg Kroah-Hartman
maintainerPATCH 124/204 perf probe: Add test for regression introduced by switch to die_get_decl_file()
In reply to Greg Kroah-HartmanFrom: Georg Müller <[email protected]>
commit 56cbeacf143530576905623ac72ae0964f3293a6 upstream.
This patch adds a test to validate that 'perf probe' works for binaries where DWARF info is split into multiple CUs
--- tools/perf/tests/shell/test_uprobe_from_different_cu.sh | 77 ++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100755 tools/perf/tests/shell/test_uprobe_from_different_cu.sh
tools/perf/tests/shell/test_uprobe_from_different_cu.sh new file +77 -0
@@ -0,0 +1,77 @@ +#!/bin/bash +# test perf probe of function from different CU +# SPDX-License-Identifier: GPL-2.0 + +set -e + +temp_dir=$(mktemp -d /tmp/perf-uprobe-different-cu-sh.XXXXXXXXXX) + +cleanup() +{ + trap - EXIT TERM INT + if [[ "${temp_dir}" =~ ^/tmp/perf-uprobe-different-cu-sh.*$ ]]; then + echo "--- Cleaning up ---" + perf probe -x ${temp_dir}/testfile -d foo + rm -f "${temp_dir}/"* + rmdir "${temp_dir}" + fi +} + +trap_cleanup() +{ + cleanup + exit 1 +} + +trap trap_cleanup EXIT TERM INT + +cat > ${temp_dir}/testfile-foo.h << EOF +struct t +{ + int *p; + int c; +}; + +extern int foo (int i, struct t *t); +EOF + +cat > ${temp_dir}/testfile-foo.c << EOF +#include "testfile-foo.h" + +int +foo (int i, struct t *t) +{ + int j, res = 0; + for (j = 0; j < i && j < t->c; j++) + res += t->p[j]; + + return res; +} +EOF + +cat > ${temp_dir}/testfile-main.c << EOF +#include "testfile-foo.h" + +static struct t g; + +int +main (int argc, char **argv) +{ + int i; + int j[argc]; + g.c = argc; + g.p = j; + for (i = 0; i < argc; i++) + j[i] = (int) argv[i][0]; + return foo (3, &g); +} +EOF + +gcc -g -Og -flto -c ${temp_dir}/testfile-foo.c -o ${temp_dir}/testfile-foo.o +gcc -g -Og -c ${temp_dir}/testfile-main.c -o ${temp_dir}/testfile-main.o +gcc -g -Og -o ${temp_dir}/testfile ${temp_dir}/testfile-foo.o ${temp_dir}/testfile-main.o + +perf probe -x ${temp_dir}/testfile --funcs foo +perf probe -x ${temp_dir}/testfile foo + +cleanup
Greg Kroah-Hartman
maintainerPATCH 125/204 fuse: revalidate: dont invalidate if interrupted
In reply to Greg Kroah-HartmanFrom: Miklos Szeredi <[email protected]>
commit a9d1c4c6df0e568207907c04aed9e7beb1294c42 upstream.
If the LOOKUP request triggered from fuse_dentry_revalidate() is interrupted, then the dentry will be invalidated, possibly resulting in submounts being unmounted.
--- fs/fuse/dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/fuse/dir.c +1 -1
@@ -232,7 +232,7 @@ static int fuse_dentry_revalidate(structspin_unlock (&fc->lock); }kfree (forget); -if (ret == -ENOMEM ) +if (ret == -ENOMEM || ret == -EINTR ) goto out;if (ret ||fuse_invalid_attr (&outarg.attr) || (outarg.attr.mode ^ inode->i_mode) &S_IFMT )
Greg Kroah-Hartman
maintainerPATCH 126/204 can: bcm: Fix UAF in bcm_proc_show()
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
commit 55c3b96074f3f9b0aee19bf93cd71af7516582bb upstream.
BUG: KASAN: slab-use-after-free in bcm_proc_show+0x969/0xa80 Read of size 8 at addr ffff888155846230 by task cat/7862 CPU: 1 PID: 7862 Comm: cat Not tainted 6.5.0-rc1-00153-gc8746099c197 #230 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.15.0-1 04/01/2014 Call Trace: <TASK> dump_stack_lvl+0xd5/0x150 print_report+0xc1/0x5e0 kasan_report+0xba/0xf0 bcm_proc_show+0x969/0xa80 seq_read_iter+0x4f6/0x1260 seq_read+0x165/0x210 proc_reg_read+0x227/0x300 vfs_read+0x1d5/0x8d0 ksys_read+0x11e/0x240 do_syscall_64+0x35/0xb0 entry_SYSCALL_64_after_hwframe+0x63/0xcd Allocated by task 7846: kasan_save_stack+0x1e/0x40 kasan_set_track+0x21/0x30 __kasan_kmalloc+0x9e/0xa0 bcm_sendmsg+0x264b/0x44e0 sock_sendmsg+0xda/0x180 ____sys_sendmsg+0x735/0x920 ___sys_sendmsg+0x11d/0x1b0 __sys_sendmsg+0xfa/0x1d0 do_syscall_64+0x35/0xb0 entry_SYSCALL_64_after_hwframe+0x63/0xcd Freed by task 7846: kasan_save_stack+0x1e/0x40 kasan_set_track+0x21/0x30 kasan_save_free_info+0x27/0x40 ____kasan_slab_free+0x161/0x1c0 slab_free_freelist_hook+0x119/0x220 __kmem_cache_free+0xb4/0x2e0 rcu_core+0x809/0x1bd0
bcm_op is freed before procfs entry be removed in bcm_release(), this lead to bcm_proc_show() may read the freed bcm_op.
--- net/can/bcm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
net/can/bcm.c +6 -6
@@ -1572,6 +1572,12 @@ static int bcm_release(struct socket *solock_sock (sk); +#if IS_ENABLED (CONFIG_PROC_FS ) +/* remove procfs entry */ +if (net->can.bcmproc_dir && bo->bcm_proc_read) +remove_proc_entry (bo->procname, net->can.bcmproc_dir); +#endif /* CONFIG_PROC_FS */ +list_for_each_entry_safe (op, next, &bo->tx_ops, list)bcm_remove_op (op);
@@ -1607,12 +1613,6 @@ static int bcm_release(struct socket *solist_for_each_entry_safe (op, next, &bo->rx_ops, list)bcm_remove_op (op); -#if IS_ENABLED (CONFIG_PROC_FS ) -/* remove procfs entry */ -if (net->can.bcmproc_dir && bo->bcm_proc_read) -remove_proc_entry (bo->procname, net->can.bcmproc_dir); -#endif /* CONFIG_PROC_FS */ -/* remove device reference */ if (bo->bound) { bo->bound =0 ;
Greg Kroah-Hartman
maintainerPATCH 127/204 ext4: correct inline offset when handling xattrs in inode body
In reply to Greg Kroah-HartmanFrom: Eric Whitney <[email protected]>
commit 6909cf5c4101214f4305a62d582a5b93c7e1eb9a upstream.
When run on a file system where the inline_data feature has been enabled, xfstests generic/269, generic/270, and generic/476 cause ext4 to emit error messages indicating that inline directory entries are corrupted. This occurs because the inline offset used to locate inline directory entries in the inode body is not updated when an xattr in that shared region is deleted and the region is shifted in memory to recover the space it occupied. If the deleted xattr precedes the system.data attribute, which points to the inline directory entries, that attribute will be moved further up in the region. The inline offset continues to point to whatever is located in system.data's former location, with unfortunate effects when used to access directory entries or (presumably) inline data in the inode body.
--- fs/ext4/xattr.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
fs/ext4/xattr.c +14 -0
@@ -1757,6 +1757,20 @@ static int ext4_xattr_set_entry(struct ememmove (here, (void *)here + size, (void *)last - (void *)here +sizeof (__u32));memset (last,0 , size); + +/* +* Update i_inline_off - moved ibody region might contain +* system.data attribute. Handling a failure here won't +* cause other complications for setting an xattr. +*/ +if (!is_block &&ext4_has_inline_data (inode)) { + ret =ext4_find_inline_data_nolock (inode); +if (ret) { +ext4_warning_inode (inode, +"unable to update i_inline_off" ); + goto out; + } + } }else if (s->not_found) {/* Insert new name. */ size_t size =EXT4_XATTR_LEN (name_len);
Greg Kroah-Hartman
maintainerPATCH 128/204 debugobjects: Recheck debug_objects_enabled before reporting
In reply to Greg Kroah-HartmanFrom: Tetsuo Handa <[email protected]>
[ Upstream commit 8b64d420fe2450f82848178506d3e3a0bd195539 ]
syzbot is reporting false a positive ODEBUG message immediately after ODEBUG was disabled due to OOM.
[ 1062.309646][T22911] ODEBUG: Out of memory. ODEBUG disabled [ 1062.886755][ T5171] ------------[ cut here ]------------ [ 1062.892770][ T5171] ODEBUG: assert_init not available (active state 0) object: ffffc900056afb20 object type: timer_list hint: process_timeout+0x0/0x40
CPU 0 [ T5171] CPU 1 [T22911]
-------------- --------------
debug_object_assert_init() {
if (!debug_objects_enabled)
return;
db = get_bucket(addr);
lookup_object_or_alloc() {
debug_objects_enabled = 0;
return NULL;
}
debug_objects_oom() {
pr_warn("Out of memory. ODEBUG disabled\n");
// all buckets get emptied here, and
}
lookup_object_or_alloc(addr, db, descr, false, true) {
// this bucket is already empty.
return ERR_PTR(-ENOENT);
}
// Emits false positive warning.
debug_print_object(&o, "assert_init");
}Recheck debug_object_enabled in debug_print_object() to avoid that.
--- lib/debugobjects.c | 9 +++++++++ 1 file changed, 9 insertions(+)
lib/debugobjects.c +9 -0
@@ -280,6 +280,15 @@ static void debug_print_object(struct debug_obj *obj, char *msg)struct debug_obj_descr *descr = obj->descr;static int limit; +/* +* Don't report if lookup_object_or_alloc() by the current thread +* failed because lookup_object_or_alloc()/debug_objects_oom() by a +* concurrent thread turned off debug_objects_enabled and cleared +* the hash buckets. +*/ +if (!debug_objects_enabled) +return ; +if (limit <5 && descr != descr_test) {void *hint = descr->debug_hint ? descr->debug_hint (obj->object) :NULL ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 129/204 nbd: Add the maximum limit of allocated index in nbd_dev_add
In reply to Greg Kroah-HartmanFrom: Zhong Jinghua <[email protected]>
[ Upstream commit f12bc113ce904777fd6ca003b473b427782b3dde ]
If the index allocated by idr_alloc greater than MINORMASK >> part_shift, the device number will overflow, resulting in failure to create a block device.
Fix it by imiting the size of the max allocation.
--- drivers/block/nbd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/block/nbd.c +2 -1
@@ -1630,7 +1630,8 @@ static int nbd_dev_add(int index)if (err == -ENOSPC ) err = -EEXIST ; }else { - err =idr_alloc (&nbd_index_idr, nbd,0 ,0 ,GFP_KERNEL ); + err =idr_alloc (&nbd_index_idr, nbd,0 , + (MINORMASK >> part_shift) +1 ,GFP_KERNEL );if (err >=0 ) index = err; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 130/204 md: fix data corruption for raid456 when reshape restart while grow up
In reply to Greg Kroah-HartmanFrom: Yu Kuai <[email protected]>
[ Upstream commit 873f50ece41aad5c4f788a340960c53774b5526e ]
Currently, if reshape is interrupted, echo "reshape" to sync_action will restart reshape from scratch, for example:
echo frozen > sync_action
echo reshape > sync_action
This will corrupt data before reshape_position if the array is growing, fix the problem by continue reshape from reshape_position.
--- drivers/md/md.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/md/md.c +12 -2
@@ -4615,11 +4615,21 @@ action_store(struct mddev *mddev, const char *page, size_t len)return -EINVAL ; err =mddev_lock (mddev);if (!err) { -if (test_bit (MD_RECOVERY_RUNNING , &mddev->recovery)) +if (test_bit (MD_RECOVERY_RUNNING , &mddev->recovery)) { err = -EBUSY ; -else { + }else if (mddev->reshape_position == MaxSector || + mddev->pers->check_reshape ==NULL || + mddev->pers->check_reshape (mddev)) {clear_bit (MD_RECOVERY_FROZEN , &mddev->recovery); err = mddev->pers->start_reshape (mddev); + }else { +/* +* If reshape is still in progress, and +* md_check_recovery() can continue to reshape, +* don't restart reshape because data can be +* corrupted for raid456. +*/ +clear_bit (MD_RECOVERY_FROZEN , &mddev->recovery); }mddev_unlock (mddev); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 131/204 md/raid10: prevent soft lockup while flush writes
In reply to Greg Kroah-HartmanFrom: Yu Kuai <[email protected]>
[ Upstream commit 010444623e7f4da6b4a4dd603a7da7469981e293 ]
Currently, there is no limit for raid1/raid10 plugged bio. While flushing writes, raid1 has cond_resched() while raid10 doesn't, and too many writes can cause soft lockup.
Follow up soft lockup can be triggered easily with writeback test for raid10 with ramdisks:
watchdog: BUG: soft lockup - CPU#10 stuck for 27s! [md0_raid10:1293] Call Trace: <TASK> call_rcu+0x16/0x20 put_object+0x41/0x80 __delete_object+0x50/0x90 delete_object_full+0x2b/0x40 kmemleak_free+0x46/0xa0 slab_free_freelist_hook.constprop.0+0xed/0x1a0 kmem_cache_free+0xfd/0x300 mempool_free_slab+0x1f/0x30 mempool_free+0x3a/0x100 bio_free+0x59/0x80 bio_put+0xcf/0x2c0 free_r10bio+0xbf/0xf0 raid_end_bio_io+0x78/0xb0 one_write_done+0x8a/0xa0 raid10_end_write_request+0x1b4/0x430 bio_endio+0x175/0x320 brd_submit_bio+0x3b9/0x9b7 [brd] __submit_bio+0x69/0xe0 submit_bio_noacct_nocheck+0x1e6/0x5a0 submit_bio_noacct+0x38c/0x7e0 flush_pending_writes+0xf0/0x240 raid10d+0xac/0x1ed0
Fix the problem by adding cond_resched() to raid10 like what raid1 did.
Note that unlimited plugged bio still need to be optimized, for example, in the case of lots of dirty pages writeback, this will take lots of memory and io will spend a long time in plug, hence io latency is bad.
--- drivers/md/raid10.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/md/raid10.c +2 -0
@@ -924,6 +924,7 @@ static void flush_pending_writes(struct r10conf *conf)else generic_make_request (bio); bio = next; +cond_resched (); }blk_finish_plug (&plug); }else
@@ -1109,6 +1110,7 @@ static void raid10_unplug(struct blk_plug_cb *cb, bool from_schedule)else generic_make_request (bio); bio = next; +cond_resched (); }kfree (plug); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 132/204 posix-timers: Ensure timer ID search-loop limit is valid
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
[ Upstream commit 8ce8849dd1e78dadcee0ec9acbd259d239b7069f ]
posix_timer_add() tries to allocate a posix timer ID by starting from the cached ID which was stored by the last successful allocation.
This is done in a loop searching the ID space for a free slot one by one. The loop has to terminate when the search wrapped around to the starting point.
But that's racy vs. establishing the starting point. That is read out lockless, which leads to the following problem:
CPU0 CPU1posix_timer_add()
start = sig->posix_timer_id;
lock(hash_lock);
... posix_timer_add()
if (++sig->posix_timer_id < 0)
start = sig->posix_timer_id;
sig->posix_timer_id = 0;So CPU1 can observe a negative start value, i.e. -1, and the loop break never happens because the condition can never be true:
if (sig->posix_timer_id == start)
break;
While this is unlikely to ever turn into an endless loop as the ID space is huge (INT_MAX), the racy read of the start value caught the attention of KCSAN and Dmitry unearthed that incorrectness.
Rewrite it so that all id operations are under the hash lock.
--- include/linux/sched/signal.h | 2 +- kernel/time/posix-timers.c | 31 ++++++++++++++++++------------- 2 files changed, 19 insertions(+), 14 deletions(-)
include/linux/sched/signal.h +1 -1
@@ -119,7 +119,7 @@ struct signal_struct {#ifdef CONFIG_POSIX_TIMERS /* POSIX.1b Interval Timers */ -int posix_timer_id; +unsigned int next_posix_timer_id;struct list_head posix_timers;/* ITIMER_REAL timer for the process */
kernel/time/posix-timers.c +18 -13
@@ -168,25 +168,30 @@ static struct k_itimer *posix_timer_by_id(timer_t id)static int posix_timer_add (struct k_itimer *timer) {struct signal_struct *sig = current->signal; -int first_free_id = sig->posix_timer_id;struct hlist_head *head; -int ret = -ENOENT ; +unsigned int cnt, id; -do { +/* +* FIXME: Replace this by a per signal struct xarray once there is +* a plan to handle the resulting CRIU regression gracefully. +*/ +for (cnt =0 ; cnt <=INT_MAX ; cnt++) {spin_lock (&hash_lock); - head = &posix_timers_hashtable[hash (sig, sig->posix_timer_id)]; -if (!__posix_timers_find (head, sig, sig->posix_timer_id)) { + id = sig->next_posix_timer_id; + +/* Write the next ID back. Clamp it to the positive space */ + sig->next_posix_timer_id = (id +1 ) &INT_MAX ; + + head = &posix_timers_hashtable[hash (sig, id)]; +if (!__posix_timers_find (head, sig, id)) {hlist_add_head_rcu (&timer->t_hash, head); - ret = sig->posix_timer_id; +spin_unlock (&hash_lock); +return id; } -if (++sig->posix_timer_id <0 ) - sig->posix_timer_id =0 ; -if ((sig->posix_timer_id == first_free_id) && (ret == -ENOENT )) -/* Loop over all possible ids completed */ - ret = -EAGAIN ;spin_unlock (&hash_lock); - }while (ret == -ENOENT ); -return ret; + } +/* POSIX return code when no timer ID could be allocated */ +return -EAGAIN ; }static inline void unlock_timer (struct k_itimer *timr,unsigned long flags)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 133/204 sched/fair: Dont balance task to its current running CPU
In reply to Greg Kroah-HartmanFrom: Yicong Yang <[email protected]>
[ Upstream commit 0dd37d6dd33a9c23351e6115ae8cdac7863bc7de ]
We've run into the case that the balancer tries to balance a migration disabled task and trigger the warning in set_task_cpu() like below:
------------[ cut here ]------------ WARNING: CPU: 7 PID: 0 at kernel/sched/core.c:3115 set_task_cpu+0x188/0x240 Modules linked in: hclgevf xt_CHECKSUM ipt_REJECT nf_reject_ipv4 <...snip> CPU: 7 PID: 0 Comm: swapper/7 Kdump: loaded Tainted: G O 6.1.0-rc4+ #1 Hardware name: Huawei TaiShan 2280 V2/BC82AMDC, BIOS 2280-V2 CS V5.B221.01 12/09/2021 pstate: 604000c9 (nZCv daIF +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : set_task_cpu+0x188/0x240 lr : load_balance+0x5d0/0xc60 sp : ffff80000803bc70 x29: ffff80000803bc70 x28: ffff004089e190e8 x27: ffff004089e19040 x26: ffff007effcabc38 x25: 0000000000000000 x24: 0000000000000001 x23: ffff80000803be84 x22: 000000000000000c x21: ffffb093e79e2a78 x20: 000000000000000c x19: ffff004089e19040 x18: 0000000000000000 x17: 0000000000001fad x16: 0000000000000030 x15: 0000000000000000 x14: 0000000000000003 x13: 0000000000000000 x12: 0000000000000000 x11: 0000000000000001 x10: 0000000000000400 x9 : ffffb093e4cee530 x8 : 00000000fffffffe x7 : 0000000000ce168a x6 : 000000000000013e x5 : 00000000ffffffe1 x4 : 0000000000000001 x3 : 0000000000000b2a x2 : 0000000000000b2a x1 : ffffb093e6d6c510 x0 : 0000000000000001 Call trace: set_task_cpu+0x188/0x240 load_balance+0x5d0/0xc60 rebalance_domains+0x26c/0x380 _nohz_idle_balance.isra.0+0x1e0/0x370 run_rebalance_domains+0x6c/0x80 __do_softirq+0x128/0x3d8 ____do_softirq+0x18/0x24 call_on_irq_stack+0x2c/0x38 do_softirq_own_stack+0x24/0x3c __irq_exit_rcu+0xcc/0xf4 irq_exit_rcu+0x18/0x24 el1_interrupt+0x4c/0xe4 el1h_64_irq_handler+0x18/0x2c el1h_64_irq+0x74/0x78 arch_cpu_idle+0x18/0x4c default_idle_call+0x58/0x194 do_idle+0x244/0x2b0 cpu_startup_entry+0x30/0x3c secondary_start_kernel+0x14c/0x190 __secondary_switched+0xb0/0xb4 ---[ end trace 0000000000000000 ]---
Further investigation shows that the warning is superfluous, the migration disabled task is just going to be migrated to its current running CPU. This is because that on load balance if the dst_cpu is not allowed by the task, we'll re-select a new_dst_cpu as a candidate. If no task can be balanced to dst_cpu we'll try to balance the task to the new_dst_cpu instead. In this case when the migration disabled task is not on CPU it only allows to run on its current CPU, load balance will select its current CPU as new_dst_cpu and later triggers the warning above.
The new_dst_cpu is chosen from the env->dst_grpmask. Currently it contains CPUs in sched_group_span() and if we have overlapped groups it's possible to run into this case. This patch makes env->dst_grpmask of group_balance_mask() which exclude any CPUs from the busiest group and solve the issue. For balancing in a domain with no overlapped groups the behaviour keeps same as before.
--- kernel/sched/fair.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/fair.c +1 -1
@@ -8142,7 +8142,7 @@ static int load_balance(int this_cpu, struct rq *this_rq, .sd = sd, .dst_cpu = this_cpu, .dst_rq = this_rq, - .dst_grpmask = sched_group_span(sd->groups), + .dst_grpmask = group_balance_mask(sd->groups), .idle = idle, .loop_break = sched_nr_migrate_break, .cpus = cpus,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 134/204 bpf: Address KCSAN report on bpf_lru_list
In reply to Greg Kroah-HartmanFrom: Martin KaFai Lau <[email protected]>
[ Upstream commit ee9fd0ac3017c4313be91a220a9ac4c99dde7ad4 ]
KCSAN reported a data-race when accessing node->ref. Although node->ref does not have to be accurate,
take this chance to use a more common READ_ONCE() and WRITE_ONCE() pattern instead of data_race().
There is an existing bpf_lru_node_is_ref() and bpf_lru_node_set_ref(). This patch also adds bpf_lru_node_clear_ref() to do the WRITE_ONCE(node->ref, 0) also.
==================================================================
BUG: KCSAN: data-race in __bpf_lru_list_rotate / __htab_lru_percpu_map_update_elem
write to 0xffff888137038deb of 1 bytes by task 11240 on cpu 1:
__bpf_lru_node_move kernel/bpf/bpf_lru_list.c:113 [inline] __bpf_lru_list_rotate_active kernel/bpf/bpf_lru_list.c:149 [inline] __bpf_lru_list_rotate+0x1bf/0x750 kernel/bpf/bpf_lru_list.c:240 bpf_lru_list_pop_free_to_local kernel/bpf/bpf_lru_list.c:329 [inline] bpf_common_lru_pop_free kernel/bpf/bpf_lru_list.c:447 [inline] bpf_lru_pop_free+0x638/0xe20 kernel/bpf/bpf_lru_list.c:499 prealloc_lru_pop kernel/bpf/hashtab.c:290 [inline] __htab_lru_percpu_map_update_elem+0xe7/0x820 kernel/bpf/hashtab.c:1316 bpf_percpu_hash_update+0x5e/0x90 kernel/bpf/hashtab.c:2313 bpf_map_update_value+0x2a9/0x370 kernel/bpf/syscall.c:200 generic_map_update_batch+0x3ae/0x4f0 kernel/bpf/syscall.c:1687 bpf_map_do_batch+0x2d9/0x3d0 kernel/bpf/syscall.c:4534 __sys_bpf+0x338/0x810 __do_sys_bpf kernel/bpf/syscall.c:5096 [inline] __se_sys_bpf kernel/bpf/syscall.c:5094 [inline] __x64_sys_bpf+0x43/0x50 kernel/bpf/syscall.c:5094 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
read to 0xffff888137038deb of 1 bytes by task 11241 on cpu 0:
bpf_lru_node_set_ref kernel/bpf/bpf_lru_list.h:70 [inline] __htab_lru_percpu_map_update_elem+0x2f1/0x820 kernel/bpf/hashtab.c:1332 bpf_percpu_hash_update+0x5e/0x90 kernel/bpf/hashtab.c:2313 bpf_map_update_value+0x2a9/0x370 kernel/bpf/syscall.c:200 generic_map_update_batch+0x3ae/0x4f0 kernel/bpf/syscall.c:1687 bpf_map_do_batch+0x2d9/0x3d0 kernel/bpf/syscall.c:4534 __sys_bpf+0x338/0x810 __do_sys_bpf kernel/bpf/syscall.c:5096 [inline] __se_sys_bpf kernel/bpf/syscall.c:5094 [inline] __x64_sys_bpf+0x43/0x50 kernel/bpf/syscall.c:5094 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
value changed: 0x01 -> 0x00
Reported by Kernel Concurrency Sanitizer on:
CPU: 0 PID: 11241 Comm: syz-executor.3 Not tainted 6.3.0-rc7-syzkaller-00136-g6a66fdd29ea1 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 03/30/2023 ==================================================================
--- kernel/bpf/bpf_lru_list.c | 21 +++++++++++++-------- kernel/bpf/bpf_lru_list.h | 7 ++----- 2 files changed, 15 insertions(+), 13 deletions(-)
kernel/bpf/bpf_lru_list.c +13 -8
@@ -44,7 +44,12 @@ static struct list_head *local_pending_list(struct bpf_lru_locallist *loc_l)/* bpf_lru_node helpers */ static bool bpf_lru_node_is_ref (const struct bpf_lru_node *node) { -return node->ref; +return READ_ONCE (node->ref); +} + +static void bpf_lru_node_clear_ref (struct bpf_lru_node *node) +{ +WRITE_ONCE (node->ref,0 ); } static void bpf_lru_list_count_inc(struct bpf_lru_list *l,
@@ -92,7 +97,7 @@ static void __bpf_lru_node_move_in(struct bpf_lru_list *l,bpf_lru_list_count_inc (l, tgt_type); node->type = tgt_type; - node->ref =0 ; +bpf_lru_node_clear_ref (node);list_move (&node->list, &l->lists[tgt_type]); }
@@ -113,7 +118,7 @@ static void __bpf_lru_node_move(struct bpf_lru_list *l,bpf_lru_list_count_inc (l, tgt_type); node->type = tgt_type; } - node->ref =0 ; +bpf_lru_node_clear_ref (node);/* If the moving node is the next_inactive_rotation candidate, * move the next_inactive_rotation pointer also.
@@ -356,7 +361,7 @@ static void __local_list_add_pending(struct bpf_lru *lru, *(u32 *)((void *)node + lru->hash_offset) = hash; node->cpu = cpu; node->type =BPF_LRU_LOCAL_LIST_T_PENDING ; - node->ref =0 ; +bpf_lru_node_clear_ref (node);list_add (&node->list,local_pending_list (loc_l)); }
@@ -422,7 +427,7 @@ static struct bpf_lru_node *bpf_percpu_lru_pop_free(struct bpf_lru *lru,if (!list_empty (free_list)) { node = list_first_entry(free_list, struct bpf_lru_node, list); *(u32 *)((void *)node + lru->hash_offset) = hash; - node->ref =0 ; +bpf_lru_node_clear_ref (node);__bpf_lru_node_move (l, node,BPF_LRU_LIST_T_INACTIVE ); }
@@ -525,7 +530,7 @@ static void bpf_common_lru_push_free(struct bpf_lru *lru, } node->type =BPF_LRU_LOCAL_LIST_T_FREE ; - node->ref =0 ; +bpf_lru_node_clear_ref (node);list_move (&node->list,local_free_list (loc_l));raw_spin_unlock_irqrestore (&loc_l->lock, flags);
@@ -571,7 +576,7 @@ static void bpf_common_lru_populate(struct bpf_lru *lru, void *buf, node = (struct bpf_lru_node *)(buf + node_offset); node->type =BPF_LRU_LIST_T_FREE ; - node->ref =0 ; +bpf_lru_node_clear_ref (node);list_add (&node->list, &l->lists[BPF_LRU_LIST_T_FREE ]); buf += elem_size; }
@@ -597,7 +602,7 @@ static void bpf_percpu_lru_populate(struct bpf_lru *lru, void *buf, node = (struct bpf_lru_node *)(buf + node_offset); node->cpu = cpu; node->type =BPF_LRU_LIST_T_FREE ; - node->ref =0 ; +bpf_lru_node_clear_ref (node);list_add (&node->list, &l->lists[BPF_LRU_LIST_T_FREE ]); i++; buf += elem_size;
kernel/bpf/bpf_lru_list.h +2 -5
@@ -66,11 +66,8 @@ struct bpf_lru {static inline void bpf_lru_node_set_ref (struct bpf_lru_node *node) { -/* ref is an approximation on access frequency. It does not -* have to be very accurate. Hence, no protection is used. -*/ -if (!node->ref) - node->ref =1 ; +if (!READ_ONCE (node->ref)) +WRITE_ONCE (node->ref,1 ); } int bpf_lru_init(struct bpf_lru *lru, bool percpu, u32 hash_offset,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 135/204 wifi: wext-core: Fix -Wstringop-overflow warning in ioctl_standard_iw_point()
In reply to Greg Kroah-HartmanFrom: Gustavo A. R. Silva <[email protected]>
[ Upstream commit 71e7552c90db2a2767f5c17c7ec72296b0d92061 ]
-Wstringop-overflow is legitimately warning us about extra_size pontentially being zero at some point, hence potenially ending up _allocating_ zero bytes of memory for extra pointer and then trying to access such object in a call to copy_from_user().
Fix this by adding a sanity check to ensure we never end up trying to allocate zero bytes of data for extra pointer, before continue executing the rest of the code in the function.
Address the following -Wstringop-overflow warning seen when built
m68k architecture with allyesconfig configuration:
from net/wireless/wext-core.c:11:
In function '_copy_from_user',
inlined from 'copy_from_user' at include/linux/uaccess.h:183:7,
inlined from 'ioctl_standard_iw_point' at net/wireless/wext-core.c:825:7:arch/m68k/include/asm/string.h:48:25: warning: '__builtin_memset' writing 1 or more bytes into a region of size 0 overflows the destination [-Wstringop-overflow=]
48 | #define memset(d, c, n) __builtin_memset(d, c, n)
| ^~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/uaccess.h:153:17: note: in expansion of macro 'memset'
153 | memset(to + (n - res), 0, res);
| ^~~~~~In function 'kmalloc',
inlined from 'kzalloc' at include/linux/slab.h:694:9,
inlined from 'ioctl_standard_iw_point' at net/wireless/wext-core.c:819:10:include/linux/slab.h:577:16: note: at offset 1 into destination object of size 0 allocated by '__kmalloc'
577 | return __kmalloc(size, flags);
| ^~~~~~~~~~~~~~~~~~~~~~This help with the ongoing efforts to globally enable -Wstringop-overflow.
--- net/wireless/wext-core.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/wireless/wext-core.c +6 -0
@@ -798,6 +798,12 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd, } } +/* Sanity-check to ensure we never end up _allocating_ zero +* bytes of data for extra. +*/ +if (extra_size <=0 ) +return -EFAULT ; +/* kzalloc() ensures NULL-termination for essid_compat. */ extra =kzalloc (extra_size,GFP_KERNEL );if (!extra)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 136/204 igb: Fix igb_down hung on surprise removal
In reply to Greg Kroah-HartmanFrom: Ying Hsu <[email protected]>
[ Upstream commit 004d25060c78fc31f66da0fa439c544dda1ac9d5 ]
In a setup where a Thunderbolt hub connects to Ethernet and a display through USB Type-C, users may experience a hung task timeout when they remove the cable between the PC and the Thunderbolt hub. This is because the igb_down function is called multiple times when the Thunderbolt hub is unplugged. For example, the igb_io_error_detected triggers the first call, and the igb_remove triggers the second call. The second call to igb_down will block at napi_synchronize. Here's the call trace:
__schedule+0x3b0/0xddb
? __mod_timer+0x164/0x5d3
schedule+0x44/0xa8
schedule_timeout+0xb2/0x2a4
? run_local_timers+0x4e/0x4e
msleep+0x31/0x38
igb_down+0x12c/0x22a [igb 6615058754948bfde0bf01429257eb59f13030d4]
__igb_close+0x6f/0x9c [igb 6615058754948bfde0bf01429257eb59f13030d4]
igb_close+0x23/0x2b [igb 6615058754948bfde0bf01429257eb59f13030d4]
__dev_close_many+0x95/0xec
dev_close_many+0x6e/0x103
unregister_netdevice_many+0x105/0x5b1
unregister_netdevice_queue+0xc2/0x10d
unregister_netdev+0x1c/0x23
igb_remove+0xa7/0x11c [igb 6615058754948bfde0bf01429257eb59f13030d4]
pci_device_remove+0x3f/0x9c
device_release_driver_internal+0xfe/0x1b4
pci_stop_bus_device+0x5b/0x7f
pci_stop_bus_device+0x30/0x7f
pci_stop_bus_device+0x30/0x7f
pci_stop_and_remove_bus_device+0x12/0x19
pciehp_unconfigure_device+0x76/0xe9
pciehp_disable_slot+0x6e/0x131
pciehp_handle_presence_or_link_change+0x7a/0x3f7
pciehp_ist+0xbe/0x194
irq_thread_fn+0x22/0x4d
? irq_thread+0x1fd/0x1fd
irq_thread+0x17b/0x1fd
? irq_forced_thread_fn+0x5f/0x5f
kthread+0x142/0x153
? __irq_get_irqchip_state+0x46/0x46
? kthread_associate_blkcg+0x71/0x71
ret_from_fork+0x1f/0x30In this case, igb_io_error_detected detaches the network interface and requests a PCIE slot reset, however, the PCIE reset callback is not being invoked and thus the Ethernet connection breaks down. As the PCIE error in this case is a non-fatal one, requesting a slot reset can be avoided.
This patch fixes the task hung issue and preserves Ethernet connection by ignoring non-fatal PCIE errors.
--- drivers/net/ethernet/intel/igb/igb_main.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ethernet/intel/igb/igb_main.c +5 -0
@@ -8257,6 +8257,11 @@ static pci_ers_result_t igb_io_error_detected(struct pci_dev *pdev,struct net_device *netdev =pci_get_drvdata (pdev);struct igb_adapter *adapter =netdev_priv (netdev); +if (state == pci_channel_io_normal) { +dev_warn (&pdev->dev,"Non-correctable non-fatal error reported.\n" ); +return PCI_ERS_RESULT_CAN_RECOVER ; + } +netif_device_detach (netdev);if (state == pci_channel_io_perm_failure)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 137/204 spi: bcm63xx: fix max prepend length
In reply to Greg Kroah-HartmanFrom: Jonas Gorski <[email protected]>
[ Upstream commit 5158814cbb37bbb38344b3ecddc24ba2ed0365f2 ]
The command word is defined as following:
/* Command */
#define SPI_CMD_COMMAND_SHIFT 0
#define SPI_CMD_DEVICE_ID_SHIFT 4
#define SPI_CMD_PREPEND_BYTE_CNT_SHIFT 8
#define SPI_CMD_ONE_BYTE_SHIFT 11
#define SPI_CMD_ONE_WIRE_SHIFT 12If the prepend byte count field starts at bit 8, and the next defined bit is SPI_CMD_ONE_BYTE at bit 11, it can be at most 3 bits wide, and thus the max value is 7, not 15.
--- drivers/spi/spi-bcm63xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-bcm63xx.c +1 -1
@@ -134,7 +134,7 @@ enum bcm63xx_regs_spi { SPI_MSG_DATA_SIZE, }; -#define BCM63XX_SPI_MAX_PREPEND 15 +#define BCM63XX_SPI_MAX_PREPEND 7#define BCM63XX_SPI_MAX_CS 8#define BCM63XX_SPI_BUS_NUM 0
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 138/204 fbdev: imxfb: warn about invalid left/right margin
In reply to Greg Kroah-HartmanFrom: Martin Kaiser <[email protected]>
[ Upstream commit 4e47382fbca916d7db95cbf9e2d7ca2e9d1ca3fe ]
Warn about invalid var->left_margin or var->right_margin. Their values are read from the device tree.
We store var->left_margin-3 and var->right_margin-1 in register fields. These fields should be >= 0.
--- drivers/video/fbdev/imxfb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/fbdev/imxfb.c +2 -2
@@ -601,10 +601,10 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *infif (var->hsync_len <1 || var->hsync_len >64 )printk (KERN_ERR "%s: invalid hsync_len %d\n" , info->fix.id, var->hsync_len); -if (var->left_margin >255 ) +if (var->left_margin <3 || var->left_margin >255 )printk (KERN_ERR "%s: invalid left_margin %d\n" , info->fix.id, var->left_margin); -if (var->right_margin >255 ) +if (var->right_margin <1 || var->right_margin >255 )printk (KERN_ERR "%s: invalid right_margin %d\n" , info->fix.id, var->right_margin);if (var->yres <1 || var->yres > ymax_mask)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 139/204 pinctrl: amd: Use amd_pinconf_set() for all config options
In reply to Greg Kroah-HartmanFrom: Mario Limonciello <[email protected]>
[ Upstream commit 635a750d958e158e17af0f524bedc484b27fbb93 ]
On ASUS TUF A16 it is reported that the ITE5570 ACPI device connected to GPIO 7 is causing an interrupt storm. This issue doesn't happen on Windows.
Comparing the GPIO register configuration between Windows and Linux bit 20 has been configured as a pull up on Windows, but not on Linux. Checking GPIO declaration from the firmware it is clear it *should* have been a pull up on Linux as well.
```
GpioInt (Level, ActiveLow, Exclusive, PullUp, 0x0000,
"\\_SB.GPIO", 0x00, ResourceConsumer, ,)
{ // Pin list
0x0007
}
```On Linux amd_gpio_set_config() is currently only used for programming the debounce. Actually the GPIO core calls it with all the arguments that are supported by a GPIO, pinctrl-amd just responds -ENOTSUPP.
To solve this issue expand amd_gpio_set_config() to support the other arguments amd_pinconf_set() supports, namely PIN_CONFIG_BIAS_PULL_DOWN, PIN_CONFIG_BIAS_PULL_UP, and PIN_CONFIG_DRIVE_STRENGTH.
--- drivers/pinctrl/pinctrl-amd.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-)
drivers/pinctrl/pinctrl-amd.c +15 -13
@@ -169,18 +169,6 @@ static int amd_gpio_set_debounce(struct gpio_chip *gc, unsigned offset,return ret; } -static int amd_gpio_set_config (struct gpio_chip *gc,unsigned offset, -unsigned long config) -{ -u32 debounce; - -if (pinconf_to_config_param (config) !=PIN_CONFIG_INPUT_DEBOUNCE ) -return -ENOTSUPP ; - - debounce =pinconf_to_config_argument (config); -return amd_gpio_set_debounce (gc, offset, debounce); -} -#ifdef CONFIG_DEBUG_FS static void amd_gpio_dbg_show (struct seq_file *s,struct gpio_chip *gc) {
@@ -632,7 +620,7 @@ static int amd_pinconf_get(struct pinctrl_dev *pctldev, }static int amd_pinconf_set (struct pinctrl_dev *pctldev,unsigned int pin, -unsigned long *configs,unsigned num_configs) +unsigned long *configs,unsigned int num_configs) {int i;u32 arg;
@@ -722,6 +710,20 @@ static int amd_pinconf_group_set(struct pinctrl_dev *pctldev,return 0 ; } +static int amd_gpio_set_config (struct gpio_chip *gc,unsigned int pin, +unsigned long config) +{ +struct amd_gpio *gpio_dev =gpiochip_get_data (gc); + +if (pinconf_to_config_param (config) ==PIN_CONFIG_INPUT_DEBOUNCE ) { +u32 debounce =pinconf_to_config_argument (config); + +return amd_gpio_set_debounce (gc, pin, debounce); + } + +return amd_pinconf_set (gpio_dev->pctrl, pin, &config,1 ); +} +static const struct pinconf_ops amd_pinconf_ops = { .pin_config_get = amd_pinconf_get, .pin_config_set = amd_pinconf_set,
Signature · 1 line
2.39.2