4.19.291-rc1 review
Subsystems (8)
Greg Kroah-Hartman
maintainercover 4.19.291-rc1 review
This is the start of the stable review cycle for the 4.19.291 release. There are 323 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.19.291-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.19.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.19.291-rc1
Dinh Nguyen <[email protected]>
arm64: dts: stratix10: fix incorrect I2C property for SCL signal
Joe Perches <[email protected]>
drivers core: Use sysfs_emit and sysfs_emit_at for show(device *...) functions
Xu Yang <[email protected]>
ARM: dts: nxp/imx6sll: fix wrong property name in usbphy node
Andreas Kemnade <[email protected]>
ARM: dts: imx6sll: fixup of operating points
Peng Fan <[email protected]>
ARM: dts: imx: add usb alias
Shengjiu Wang <[email protected]>
ARM: dts: imx6sll: Make ssi node name same as other platforms
Johan Hovold <[email protected]>
PM: sleep: wakeirq: fix wake irq arming
Chunfeng Yun <[email protected]>
PM / wakeirq: support enabling wake-up irq after runtime_suspend called
Aneesh Kumar K.V <[email protected]>
powerpc/mm/altmap: Fix altmap boundary check
Roger Quadros <[email protected]>
mtd: rawnand: omap_elm: Fix incorrect type in assignment
Mirsad Goran Todorovac <[email protected]>
test_firmware: return ENOMEM instead of ENOSPC on failed memory allocation
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()
Steffen Maier <[email protected]>
scsi: zfcp: Defer fc_rport blocking until after ADISC response
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
Jamal Hadi Salim <[email protected]>
net: sched: cls_u32: Fix match key mis-addressing
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()
Heiko Carstens <[email protected]>
KVM: s390: fix sthyi error handling
[email protected] <[email protected]>
word-at-a-time: use the same return type for has_zero regardless of endianness
Bart Van Assche <[email protected]>
loop: Select I/O scheduler 'none' from inside add_disk()
Peter Zijlstra <[email protected]>
perf: Fix function pointer case
Lee Jones <[email protected]>
net/sched: cls_u32: Fix reference counter leak leading to overflow
Thomas Petazzoni <[email protected]>
ASoC: cs42l51: fix driver to properly autoload with automatic module loading
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
Jason Wang <[email protected]>
virtio-net: fix race between set queues and probe
Ruihong Luo <[email protected]>
serial: 8250_dw: Preserve original value of DLF register
Andy Shevchenko <[email protected]>
serial: 8250_dw: split Synopsys DesignWare 8250 common functions
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
Filipe Manana <[email protected]>
btrfs: check for commit error at btrfs_attach_transaction_barrier()
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: clarify CVE handling
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
Łukasz Bartosik <[email protected]>
USB: quirks: add quirk for Focusrite Scarlett
Guiting Shen <[email protected]>
usb: ohci-at91: Fix the unhandle interrupt when resume
Jisheng Zhang <[email protected]>
usb: dwc3: don't reset device side if dwc3 was configured as host-only
Gratian Crisan <[email protected]>
usb: dwc3: pci: skip BYT GPIO lookup table for hardwired phy
Jakub Vanek <[email protected]>
Revert "usb: dwc3: core: Enable AutoRetry feature in the controller"
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
Gaosheng Cui <[email protected]>
drm/msm: Fix IS_ERR_OR_NULL() vs NULL check in a5xx_submit_in_rb()
Dan Carpenter <[email protected]>
RDMA/mlx4: Make check for invalid flags stricter
Yuanjun Gong <[email protected]>
benet: fix return value check in be_lancer_xmit_workarounds()
Lin Ma <[email protected]>
net/sched: mqprio: Add length check for TCA_MQPRIO_{MAX/MIN}_RATE64
Vladimir Oltean <[email protected]>
net/sched: mqprio: add extack to mqprio_parse_nlattr()
Vladimir Oltean <[email protected]>
net/sched: mqprio: refactor nlattr parsing to a separate function
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()
Harshit Mogalapalli <[email protected]>
phy: hisilicon: Fix an out of bounds check in hisi_inno_phy_probe()
Wang Ming <[email protected]>
i40e: Fix an NULL vs IS_ERR() bug for debugfs_create_dir()
Chao Yu <[email protected]>
ext4: fix to check return value of freeze_bdev() in ext4_shutdown()
Nilesh Javali <[email protected]>
scsi: qla2xxx: Array index may go out of bound
Ye Bin <[email protected]>
scsi: qla2xxx: Fix inconsistent format argument type in qla_os.c
Zheng Yejian <[email protected]>
ftrace: Fix possible warning on checking all pages used in ftrace_process_locs()
Linus Torvalds <[email protected]>
ftrace: Store the order of pages allocated in ftrace_page
Steven Rostedt (VMware) <[email protected]>
ftrace: Check if pages were allocated before calling free_pages()
Steven Rostedt (VMware) <[email protected]>
ftrace: Add information on number of page groups allocated
Alexander Aring <[email protected]>
fs: dlm: interrupt posix locks only when process is killed
Alexander Aring <[email protected]>
dlm: rearrange async condition return
Alexander Aring <[email protected]>
dlm: cleanup plock_op vs plock_xop
Ilpo Järvinen <[email protected]>
PCI/ASPM: Avoid link retraining race
Ilpo Järvinen <[email protected]>
PCI/ASPM: Factor out pcie_wait_for_retrain()
Bjorn Helgaas <[email protected]>
PCI/ASPM: Return 0 or -ETIMEDOUT from pcie_retrain_link()
Stefan Mätje <[email protected]>
PCI: Rework pcie_retrain_link() wait loop
Zhihao Cheng <[email protected]>
ext4: Fix reusing stale buffer heads from last failed mounting
Chunguang Xu <[email protected]>
ext4: rename journal_dev to s_journal_dev inside ext4_sb_info
Filipe Manana <[email protected]>
btrfs: fix extent buffer leak after tree mod log failure at split_node()
Zheng Wang <[email protected]>
bcache: Fix __bch_btree_node_alloc to make the failure behavior consistent
Coly Li <[email protected]>
bcache: remove 'int n' from parameter list of bch_bucket_alloc_set()
Shenghui Wang <[email protected]>
bcache: use MAX_CACHES_PER_SET instead of magic number 8 in __bch_bucket_alloc_set
Hans de Goede <[email protected]>
gpio: tps68470: Make tps68470_gpio_output() always set the initial value
Mohamed Khalfella <[email protected]>
tracing/histograms: Return an error if we fail to add histogram to hist_vars list
Eric Dumazet <[email protected]>
tcp: annotate data-races around fastopenq.max_qlen
Eric Dumazet <[email protected]>
tcp: annotate data-races around tp->notsent_lowat
Eric Dumazet <[email protected]>
tcp: annotate data-races around rskq_defer_accept
Eric Dumazet <[email protected]>
tcp: annotate data-races around tp->linger2
Cambda Zhu <[email protected]>
net: Replace the limit of TCP_LINGER2 with TCP_FIN_TIMEOUT_MAX
Florian Westphal <[email protected]>
netfilter: nf_tables: can't schedule in nft_chain_validate
Florian Westphal <[email protected]>
netfilter: nf_tables: fix spurious set element insertion failure
Kuniyuki Iwashima <[email protected]>
llc: Don't drop packet from non-root netns.
Zhang Shurong <[email protected]>
fbdev: au1200fb: Fix missing IRQ check in au1200fb_drv_probe
Kuniyuki Iwashima <[email protected]>
Revert "tcp: avoid the lookup process failing to get sk in ehash table"
Yuanjun Gong <[email protected]>
net:ipv6: check return value of pskb_trim()
Tanmay Patil <[email protected]>
net: ethernet: ti: cpsw_ale: Fix cpsw_ale_get_field()/cpsw_ale_set_field()
Mario Limonciello <[email protected]>
pinctrl: amd: Use amd_pinconf_set() for all config options
Martin Kaiser <[email protected]>
fbdev: imxfb: warn about invalid left/right margin
Jonas Gorski <[email protected]>
spi: bcm63xx: fix max prepend length
Ying Hsu <[email protected]>
igb: Fix igb_down hung on surprise removal
Johannes Berg <[email protected]>
wifi: iwlwifi: mvm: avoid baid size integer overflow
Gustavo A. R. Silva <[email protected]>
wifi: wext-core: Fix -Wstringop-overflow warning in ioctl_standard_iw_point()
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()
Mohamed Khalfella <[email protected]>
tracing/histograms: Add histograms to hist_vars if they have referenced variables
Daniel Vetter <[email protected]>
drm/atomic: Fix potential use-after-free in nonblocking commits
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
Xiubo Li <[email protected]>
ceph: don't let check_caps skip sending responses for revoke msgs
Martin Kaiser <[email protected]>
hwrng: imx-rngc - fix the timeout for init and self check
Dan Carpenter <[email protected]>
serial: atmel: don't enable IRQs prematurely
Alexander Aring <[email protected]>
fs: dlm: return positive pid value for F_GETLK
Jason Baron <[email protected]>
md/raid0: add discard support for the 'original' layout
Damien Le Moal <[email protected]>
misc: pci_endpoint_test: Re-init completion for every test
Damien Le Moal <[email protected]>
misc: pci_endpoint_test: Free IRQs before removing the device
Rick Wertenbroek <[email protected]>
PCI: rockchip: Use u32 variable to access 32-bit registers
Rick Wertenbroek <[email protected]>
PCI: rockchip: Fix legacy IRQ generation for RK3399 PCIe endpoint core
Rick Wertenbroek <[email protected]>
PCI: rockchip: Add poll and timeout to wait for PHY PLLs to be locked
Rick Wertenbroek <[email protected]>
PCI: rockchip: Write PCI Device ID to correct register
Rick Wertenbroek <[email protected]>
PCI: rockchip: Assert PCI Configuration Enable bit after probe
Manivannan Sadhasivam <[email protected]>
PCI: qcom: Disable write access to read only registers for IP v2.3.3
Robin Murphy <[email protected]>
PCI: Add function 1 DMA alias quirk for Marvell 88SE9235
Ondrej Zary <[email protected]>
PCI/PM: Avoid putting EloPOS E2/S2/H2 PCIe Ports in D3cold
Siddh Raman Pant <[email protected]>
jfs: jfs_dmap: Validate db_l2nbperpage while mounting
Baokun Li <[email protected]>
ext4: only update i_reserved_data_blocks on successful block allocation
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()
Florian Fainelli <[email protected]>
net: bcmgenet: Ensure MDIO unregistration has clocks enabled
Jarkko Sakkinen <[email protected]>
tpm: tpm_vtpm_proxy: fix a race condition in /dev/vtpmx creation
Mario Limonciello <[email protected]>
pinctrl: amd: Only use special debounce behavior for GPIO 0
Mario Limonciello <[email protected]>
pinctrl: amd: Detect internal GPIO0 debounce handling
Mario Limonciello <[email protected]>
pinctrl: amd: Fix mistake in handling clearing pins at startup
Pedro Tammela <[email protected]>
net/sched: make psched_mtu() RTNL-less safe
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
Jiasheng Jiang <[email protected]>
NTB: ntb_tool: Add check for devm_kcalloc
Yang Yingliang <[email protected]>
NTB: ntb_transport: fix possible memory leak while device_register() fails
Yuan Can <[email protected]>
ntb: intel: Fix error handling in intel_ntb_pci_driver_init()
Yuan Can <[email protected]>
NTB: amd: Fix error handling in amd_ntb_pci_driver_init()
Yuan Can <[email protected]>
ntb: idt: Fix error handling in idt_pci_driver_init()
Eric Dumazet <[email protected]>
udp6: fix udp6_ehashfn() typo
Kuniyuki Iwashima <[email protected]>
icmp6: Fix null-ptr-deref of ip6_null_entry->rt6i_idev in icmp6_dev().
Stephen Suryaputra <[email protected]>
vrf: Increment Icmp6InMsgs on the original netdev
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
Moritz Fischer <[email protected]>
net: lan743x: Don't sleep in atomic context
Thadeu Lima de Souza Cascardo <[email protected]>
netfilter: nf_tables: prevent OOB access in nft_byteorder_eval
Florent Revest <[email protected]>
netfilter: conntrack: Avoid nf_ct_helper_hash uses after free
Florian Westphal <[email protected]>
netfilter: nf_tables: fix scheduling-while-atomic splat
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: unbind non-anonymous set if rule construction fails
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: reject unbound anonymous set before commit phase
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: use net_generic infra for transaction data
Pablo Neira Ayuso <[email protected]>
netfilter: add helper function to set up the nfnetlink header and use it
Pablo Neira Ayuso <[email protected]>
netfilter: nftables: add helper function to set the base sequence number
Florian Westphal <[email protected]>
netfilter: nf_tables: add rescheduling points during loop detection walks
Florian Westphal <[email protected]>
netfilter: nf_tables: fix nat hook table deletion
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()
Zheng Wang <[email protected]>
bcache: Remove unnecessary NULL point check in node allocations
Robert Marko <[email protected]>
mmc: core: disable TRIM on Micron MTFC4GACAJCN-1M
Robert Marko <[email protected]>
mmc: core: disable TRIM on Kingston EMMC04G-M627
Dai Ngo <[email protected]>
NFSD: add encoding of op_recall flag for write delegation
Takashi Iwai <[email protected]>
ALSA: jack: Fix mutex call in snd_jack_report()
Robert Hancock <[email protected]>
i2c: xiic: Don't try to handle more interrupt events after error
Marek Vasut <[email protected]>
i2c: xiic: Defer xiic_wakeup() and __xiic_start_xfer() in xiic_process()
Artur Rojek <[email protected]>
sh: dma: Fix DMA channel offset calculation
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
Chao Yu <[email protected]>
f2fs: fix error path handling in truncate_dnode()
Nishanth Menon <[email protected]>
mailbox: ti-msgmgr: Fill non-message tx data fields with 0x0
Jonas Gorski <[email protected]>
spi: bcm-qspi: return error if neither hif_mspi nor mspi is available
Tobias Heider <[email protected]>
Add MODULE_FIRMWARE() for FIRMWARE_TG357766.
Chengfeng Ye <[email protected]>
sctp: fix potential deadlock on &net->sctp.addr_wq_lock
Christophe JAILLET <[email protected]>
rtc: st-lpc: Release some resources in st_rtc_probe() in case of error
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
Nico Boehr <[email protected]>
KVM: s390: fix KVM_S390_GET_CMMA_BITS for GFNs in memslot holes
Stephan Gerhold <[email protected]>
mfd: rt5033: Drop rt5033-battery sub-device
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
Masahiro Yamada <[email protected]>
ARC: define ASM_NL and __ALIGN(_STR) outside #ifdef __ASSEMBLY__ guard
Vineet Gupta <[email protected]>
ARCv2: entry: rewrite to enable use of double load/stores LDD/STD
Vineet Gupta <[email protected]>
ARCv2: entry: avoid a branch
Vineet Gupta <[email protected]>
ARCv2: entry: push out the Z flag unclobber from common EXCEPTION_PROLOGUE
Vineet Gupta <[email protected]>
ARCv2: entry: comments about hardware auto-save on taken interrupts
Masahiro Yamada <[email protected]>
modpost: fix section mismatch message for R_ARM_{PC24,CALL,JUMP24}Masahiro Yamada <[email protected]>
modpost: fix section mismatch message for R_ARM_ABS32
Randy Dunlap <[email protected]>
crypto: nx - fix build warnings when DEBUG_FS is not enabled
Herbert Xu <[email protected]>
hwrng: virtio - Fix race on data_avail and actual data
Laurent Vivier <[email protected]>
hwrng: virtio - always add a pending request
Laurent Vivier <[email protected]>
hwrng: virtio - don't waste entropy
Laurent Vivier <[email protected]>
hwrng: virtio - don't wait on cleanup
Laurent Vivier <[email protected]>
hwrng: virtio - add an internal buffer
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()
Wolfram Sang <[email protected]>
arm64: dts: renesas: ulcb-kf: Remove flow control for SCIF1
Patrick Kelsey <[email protected]>
IB/hfi1: Fix sdma.h tx->num_descs off-by-one errors
Randy Dunlap <[email protected]>
soc/fsl/qe: fix usb.c build errors
Cristian Ciocaltea <[email protected]>
ASoC: es8316: 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().
Cambda Zhu <[email protected]>
ipvlan: Fix return value of ipvlan_queue_xmit()
Ilia.Gavrilov <[email protected]>
netfilter: nf_conntrack_sip: fix the ct_sip_parse_numerical_param() return value.
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
Marek Vasut <[email protected]>
wifi: rsi: Do not set MMC_PM_KEEP_POWER in shutdown
Fedor Pchelkin <[email protected]>
wifi: ath9k: don't allow to overwrite ENDPOINT0 attributes
Christophe JAILLET <[email protected]>
wifi: ray_cs: Fix an error handling path in ray_probe()
Andy Shevchenko <[email protected]>
wifi: ray_cs: Drop useless status variable in parse_addr()
Andy Shevchenko <[email protected]>
wifi: ray_cs: Utilize strnlen() in parse_addr()
Christophe JAILLET <[email protected]>
wifi: wl3501_cs: Fix an error handling path in wl3501_probe()
Jakub Kicinski <[email protected]>
wl3501_cs: use eth_hw_addr_set()
Jakub Kicinski <[email protected]>
net: create netdev->dev_addr assignment helpers
Lee Jones <[email protected]>
wl3501_cs: Fix misspelling and provide missing documentation
Alex Dewar <[email protected]>
wl3501_cs: Remove unnecessary NULL check
Lee Jones <[email protected]>
wl3501_cs: Fix a bunch of formatting issues related to function docs
Christophe JAILLET <[email protected]>
wifi: atmel: Fix an error handling path in atmel_probe()
Christophe JAILLET <[email protected]>
wifi: orinoco: Fix an error handling path in orinoco_cs_probe()
Christophe JAILLET <[email protected]>
wifi: orinoco: Fix an error handling path in spectrum_cs_probe()
Krzysztof Kozlowski <[email protected]>
nfc: llcp: fix possible use of uninitialized variable in nfc_llcp_send_connect()
Krzysztof Kozlowski <[email protected]>
nfc: constify several pointers to u8, char and sk_buff
Christophe JAILLET <[email protected]>
wifi: mwifiex: Fix the size of a memory allocation in mwifiex_ret_802_11_scan()
Pengcheng Yang <[email protected]>
samples/bpf: Fix buffer overflow in tcp_basertt
Fedor Pchelkin <[email protected]>
wifi: ath9k: avoid referencing uninit memory in ath9k_wmi_ctrl_rx
Peter Seiderer <[email protected]>
wifi: ath9k: fix AR9003 mac hardware hang check register offset calculation
Roberto Sassu <[email protected]>
evm: Complete description of evm_inode_setattr()
Arnd Bergmann <[email protected]>
ARM: 9303/1: kprobes: avoid missing-declaration warnings
Nikita Zhandarovich <[email protected]>
PM: domains: fix integer overflow issues in genpd_parse_state()
Feng Mingxi <[email protected]>
clocksource/drivers/cadence-ttc: Fix memory leak in ttc_timer_probe
Rajan Vaja <[email protected]>
clocksource/drivers/cadence-ttc: Use ttc driver as platform driver
Daniel Lezcano <[email protected]>
clocksource/drivers: Unify the names to timer-* format
John Paul Adrian Glaubitz <[email protected]>
irqchip/jcore-aic: Fix missing allocation of IRQ descriptors
Marc Zyngier <[email protected]>
irqchip/jcore-aic: Kill use of irq_create_strict_mappings()
Li Nan <[email protected]>
md/raid10: fix io loss while replacement replace rdev
Li Nan <[email protected]>
md/raid10: fix wrong setting of max_corr_read_errors
Li Nan <[email protected]>
md/raid10: fix overflow of md/safe_mode_delay
Li Nan <[email protected]>
md/raid10: check slab-out-of-bounds in md_bitmap_get_counter
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
Greg Kroah-Hartman <[email protected]>
video: imsttfb: check for ioremap() failures
Thomas Gleixner <[email protected]>
x86/smp: Use dedicated cache-line for mwait_play_dead()
Bob Peterson <[email protected]>
gfs2: Don't deref jdesc in evict
-------------
Diffstat:
Documentation/admin-guide/security-bugs.rst | 37 +-
MAINTAINERS | 10 +-
Makefile | 4 +-
arch/arc/include/asm/entry-arcv2.h | 374 ++++++++--------
arch/arc/include/asm/linkage.h | 22 +-
arch/arc/kernel/asm-offsets.c | 7 +
arch/arc/kernel/entry-arcv2.S | 4 +-
arch/arc/mm/tlbex.S | 11 +
arch/arm/boot/dts/bcm5301x.dtsi | 1 -
arch/arm/boot/dts/imx6qdl.dtsi | 4 +
arch/arm/boot/dts/imx6sl.dtsi | 3 +
arch/arm/boot/dts/imx6sll.dtsi | 32 +-
arch/arm/boot/dts/imx6sx.dtsi | 3 +
arch/arm/boot/dts/imx6ul.dtsi | 2 +
arch/arm/boot/dts/imx7d.dtsi | 6 +
arch/arm/boot/dts/imx7s.dtsi | 2 +
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/arm/probes/kprobes/checkers-common.c | 2 +-
arch/arm/probes/kprobes/core.c | 2 +-
arch/arm/probes/kprobes/opt-arm.c | 2 -
arch/arm/probes/kprobes/test-core.c | 2 +-
arch/arm/probes/kprobes/test-core.h | 4 +
.../boot/dts/altera/socfpga_stratix10_socdk.dts | 2 +-
arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 3 +-
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/mm/init_64.c | 3 +-
arch/powerpc/platforms/52xx/mpc52xx_pic.c | 2 +-
arch/s390/kernel/smp.c | 2 +-
arch/s390/kernel/sthyi.c | 6 +-
arch/s390/kvm/intercept.c | 9 +-
arch/s390/kvm/kvm-s390.c | 4 +
arch/sh/drivers/dma/dma-sh.c | 37 +-
arch/sh/kernel/cpu/sh2/probe.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/arch_topology.c | 2 +-
drivers/base/cacheinfo.c | 18 +-
drivers/base/core.c | 8 +-
drivers/base/cpu.c | 34 +-
drivers/base/firmware_loader/fallback.c | 2 +-
drivers/base/memory.c | 24 +-
drivers/base/node.c | 34 +-
drivers/base/platform.c | 2 +-
drivers/base/power/domain.c | 6 +-
drivers/base/power/power.h | 8 +-
drivers/base/power/runtime.c | 6 +-
drivers/base/power/sysfs.c | 50 +--
drivers/base/power/wakeirq.c | 111 ++++-
drivers/base/soc.c | 8 +-
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/hw_random/virtio-rng.c | 86 +++-
drivers/char/tpm/tpm_tis_core.c | 10 +-
drivers/char/tpm/tpm_vtpm_proxy.c | 30 +-
drivers/clk/clk-gate.c | 2 +-
drivers/clocksource/Makefile | 26 +-
...{time-armada-370-xp.c => timer-armada-370-xp.c} | 0
.../{cadence_ttc_timer.c => timer-cadence-ttc.c} | 45 +-
.../clocksource/{time-efm32.c => timer-efm32.c} | 0
.../{fsl_ftm_timer.c => timer-fsl-ftm.c} | 0
.../{time-lpc32xx.c => timer-lpc32xx.c} | 0
.../clocksource/{time-orion.c => timer-orion.c} | 0
drivers/clocksource/{owl-timer.c => timer-owl.c} | 0
.../{time-pistachio.c => timer-pistachio.c} | 0
drivers/clocksource/{qcom-timer.c => timer-qcom.c} | 0
.../clocksource/{versatile.c => timer-versatile.c} | 0
.../clocksource/{vf_pit_timer.c => timer-vf-pit.c} | 0
.../clocksource/{vt8500_timer.c => timer-vt8500.c} | 0
.../clocksource/{zevio-timer.c => timer-zevio.c} | 0
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_atomic.c | 11 +-
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/msm/adreno/a5xx_gpu.c | 2 +-
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/i2c/busses/i2c-xiic.c | 39 +-
drivers/ide/ide-acpi.c | 2 +-
drivers/ide/ide-atapi.c | 2 +-
drivers/ide/ide-io-std.c | 4 +-
drivers/ide/ide-io.c | 8 +-
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/cxgb4/cq.c | 2 +-
drivers/infiniband/hw/hfi1/sdma.c | 4 +-
drivers/infiniband/hw/hfi1/sdma.h | 15 +-
drivers/infiniband/hw/mlx4/qp.c | 24 +-
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/irqchip/irq-jcore-aic.c | 11 +-
drivers/mailbox/ti-msgmgr.c | 12 +-
drivers/md/bcache/alloc.c | 35 +-
drivers/md/bcache/bcache.h | 4 +-
drivers/md/bcache/btree.c | 16 +-
drivers/md/bcache/super.c | 6 +-
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-bitmap.c | 17 +-
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/tuners/qt1010.c | 4 +-
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 | 10 +-
drivers/mmc/core/quirks.h | 14 +
drivers/mmc/host/sdhci.c | 2 +-
drivers/mtd/nand/raw/nand_ecc.c | 2 +-
drivers/mtd/nand/raw/omap_elm.c | 24 +-
drivers/mtd/nand/raw/s3c2410.c | 2 +-
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/genet/bcmmii.c | 2 +
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/microchip/lan743x_main.c | 21 +-
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/ipvlan/ipvlan_core.c | 9 +-
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/virtio_net.c | 4 +-
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/intel/iwlwifi/mvm/sta.c | 2 +-
drivers/net/wireless/intersil/orinoco/orinoco_cs.c | 13 +-
.../net/wireless/intersil/orinoco/spectrum_cs.c | 13 +-
drivers/net/wireless/marvell/mwifiex/scan.c | 6 +-
drivers/net/wireless/ray_cs.c | 36 +-
drivers/net/wireless/rsi/rsi_91x_sdio.c | 3 -
drivers/net/wireless/wl3501_cs.c | 51 ++-
drivers/ntb/hw/amd/ntb_hw_amd.c | 7 +-
drivers/ntb/hw/idt/ntb_hw_idt.c | 7 +-
drivers/ntb/hw/intel/ntb_hw_gen1.c | 7 +-
drivers/ntb/ntb_transport.c | 2 +-
drivers/ntb/test/ntb_tool.c | 2 +
drivers/pci/controller/dwc/pcie-qcom.c | 2 +
drivers/pci/controller/pcie-rockchip-ep.c | 64 +--
drivers/pci/controller/pcie-rockchip.c | 17 +
drivers/pci/controller/pcie-rockchip.h | 11 +-
drivers/pci/pci.c | 10 +-
drivers/pci/pcie/aspm.c | 57 ++-
drivers/pci/quirks.c | 2 +
drivers/phy/hisilicon/phy-hisi-inno-usb2.c | 2 +-
drivers/pinctrl/intel/pinctrl-cherryview.c | 15 +-
drivers/pinctrl/pinctrl-amd.c | 41 +-
drivers/pinctrl/pinctrl-amd.h | 1 +
drivers/pinctrl/pinctrl-at91-pio4.c | 2 +
drivers/platform/x86/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/s390/scsi/zfcp_fc.c | 6 +-
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/scsi/qla2xxx/qla_os.c | 5 +-
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_dwlib.c | 128 ++++++
drivers/tty/serial/8250/8250_dwlib.h | 19 +
drivers/tty/serial/8250/8250_pci.c | 19 -
drivers/tty/serial/8250/8250_port.c | 11 +-
drivers/tty/serial/8250/Kconfig | 3 +
drivers/tty/serial/8250/Makefile | 1 +
drivers/tty/serial/atmel_serial.c | 4 +-
drivers/tty/serial/samsung.c | 14 +-
drivers/usb/core/quirks.c | 4 +
drivers/usb/dwc3/core.c | 20 +-
drivers/usb/dwc3/core.h | 3 -
drivers/usb/dwc3/dwc3-pci.c | 6 +-
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 | 34 +-
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/ctree.c | 2 +
fs/btrfs/qgroup.c | 2 +
fs/btrfs/transaction.c | 9 +-
fs/ceph/caps.c | 9 +
fs/dlm/netlink.c | 2 +-
fs/dlm/plock.c | 104 +++--
fs/ext2/ext2.h | 12 -
fs/ext2/super.c | 23 +-
fs/ext4/ext4.h | 2 +-
fs/ext4/fsmap.c | 8 +-
fs/ext4/indirect.c | 8 +
fs/ext4/inode.c | 10 -
fs/ext4/ioctl.c | 5 +-
fs/ext4/mballoc.c | 4 +-
fs/ext4/super.c | 25 +-
fs/ext4/xattr.c | 14 +
fs/f2fs/node.c | 4 +-
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/bmap.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/overlayfs/copy_up.c | 2 +-
fs/sysv/itree.c | 4 +
fs/ubifs/commit.c | 6 +-
fs/ubifs/dir.c | 2 +-
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/etherdevice.h | 12 +
include/linux/netdevice.h | 18 +
include/linux/netfilter/nfnetlink.h | 27 ++
include/linux/nmi.h | 2 +-
include/linux/pci.h | 1 +
include/linux/pm_wakeirq.h | 9 +-
include/linux/sched/signal.h | 2 +-
include/linux/serial_8250.h | 1 -
include/linux/tcp.h | 2 +-
include/linux/workqueue.h | 15 +-
include/net/addrconf.h | 16 +
include/net/ipv6.h | 8 +-
include/net/netfilter/nf_tables.h | 14 +
include/net/netns/nftables.h | 5 -
include/net/nfc/nfc.h | 4 +-
include/net/pkt_sched.h | 2 +-
include/net/sock.h | 1 +
include/net/tcp.h | 7 +-
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/dma/debug.c | 2 +-
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/ftrace.c | 75 +++-
kernel/trace/ring_buffer.c | 48 +-
kernel/trace/trace.c | 21 +-
kernel/trace/trace.h | 2 +
kernel/trace/trace_events.c | 14 +-
kernel/trace/trace_events_hist.c | 9 +-
kernel/watchdog_hld.c | 6 +-
kernel/workqueue.c | 13 +-
lib/debugobjects.c | 9 +
lib/radix-tree.c | 2 +-
lib/test_firmware.c | 18 +-
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/inet_hashtables.c | 17 +-
net/ipv4/inet_timewait_sock.c | 8 +-
net/ipv4/netfilter/nf_socket_ipv4.c | 6 +-
net/ipv4/tcp.c | 27 +-
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/icmp.c | 22 +-
net/ipv6/ip6_flowlabel.c | 2 +-
net/ipv6/ip6_gre.c | 3 +-
net/ipv6/ip6mr.c | 2 +-
net/ipv6/netfilter/nf_socket_ipv6.c | 2 +-
net/ipv6/reassembly.c | 4 +-
net/ipv6/udp.c | 2 +-
net/llc/llc_input.c | 3 -
net/netfilter/ipset/ip_set_core.c | 17 +-
net/netfilter/nf_conntrack_ftp.c | 2 +-
net/netfilter/nf_conntrack_helper.c | 4 +
net/netfilter/nf_conntrack_netlink.c | 77 +---
net/netfilter/nf_conntrack_sip.c | 2 +-
net/netfilter/nf_tables_api.c | 486 ++++++++++++---------
net/netfilter/nf_tables_trace.c | 9 +-
net/netfilter/nfnetlink_acct.c | 11 +-
net/netfilter/nfnetlink_cthelper.c | 11 +-
net/netfilter/nfnetlink_cttimeout.c | 22 +-
net/netfilter/nfnetlink_log.c | 13 +-
net/netfilter/nfnetlink_queue.c | 16 +-
net/netfilter/nft_byteorder.c | 14 +-
net/netfilter/nft_chain_filter.c | 11 +-
net/netfilter/nft_compat.c | 11 +-
net/netfilter/nft_dynset.c | 6 +-
net/netlink/af_netlink.c | 5 +-
net/netlink/diag.c | 7 +-
net/nfc/core.c | 4 +-
net/nfc/hci/llc_shdlc.c | 10 +-
net/nfc/llcp.h | 8 +-
net/nfc/llcp_commands.c | 47 +-
net/nfc/llcp_core.c | 44 +-
net/nfc/nfc.h | 2 +-
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 | 77 +++-
net/sched/sch_cake.c | 2 +-
net/sched/sch_cbq.c | 2 +-
net/sched/sch_fq_codel.c | 2 +-
net/sched/sch_mqprio.c | 144 +++---
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 +
samples/bpf/tcp_basertt_kern.c | 2 +-
scripts/mod/modpost.c | 24 +-
scripts/tags.sh | 9 +-
security/integrity/evm/evm_main.c | 2 +
security/integrity/iint.c | 15 +-
sound/core/control_compat.c | 2 +-
sound/core/jack.c | 15 +-
sound/isa/sb/sb16_csp.c | 2 +-
sound/pci/ac97/ac97_codec.c | 4 +-
sound/soc/codecs/cs42l51-i2c.c | 6 +
sound/soc/codecs/cs42l51.c | 7 -
sound/soc/codecs/cs42l51.h | 1 -
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 +
469 files changed, 3441 insertions(+), 2100 deletions(-)Greg Kroah-Hartman
maintainerPATCH 1/323 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
@@ -1586,6 +1586,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/323 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
@@ -96,6 +96,17 @@ DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t DEFINE_PER_CPU_READ_MOSTLY(struct cpuinfo_x86, cpu_info);EXPORT_PER_CPU_SYMBOL (cpu_info); +struct mwait_cpu_dead { +unsigned int control; +unsigned int status; +}; + +/* +* Cache line aligned data for mwait_play_dead(). Separate on purpose so +* that it's unlikely to be touched by other CPUs. +*/ +static DEFINE_PER_CPU_ALIGNED(struct mwait_cpu_dead, mwait_cpu_dead); +/* Logical package management. We might want to allocate that dynamically */ unsigned int __max_logical_packages__read_mostly ;EXPORT_SYMBOL (__max_logical_packages);
@@ -1595,10 +1606,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 )
@@ -1632,13 +1643,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 ) {
@@ -1650,9 +1654,9 @@ static inline void mwait_play_dead(void)* case where we return around the loop. */ mb (); -clflush (mwait_ptr); +clflush (md);mb (); -__monitor (mwait_ptr,0 ,0 ); +__monitor (md,0 ,0 );mb ();__mwait (eax,0 );/*
Greg Kroah-Hartman
maintainerPATCH 3/323 video: imsttfb: check for ioremap() failures
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
commit 13b7c0390a5d3840e1e2cda8f44a310fdbb982de upstream.
We should check if ioremap() were to somehow fail in imsttfb_probe() and handle the unwinding of the resources allocated here properly.
Ideally if anyone cares about this driver (it's for a PowerMac era PCI display card), they wouldn't even be using fbdev anymore. Or the devm_* apis could be used, but that's just extra work for diminishing returns...
--- drivers/video/fbdev/imsttfb.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)
drivers/video/fbdev/imsttfb.c +18 -3
@@ -1470,6 +1470,7 @@ static int imsttfb_probe(struct pci_devstruct imstt_par *par;struct fb_info *info;struct device_node *dp; +int ret = -ENOMEM ; dp =pci_device_to_OF_node (pdev);if (dp)
@@ -1508,23 +1509,37 @@ static int imsttfb_probe(struct pci_devdefault :printk (KERN_INFO "imsttfb: Device 0x%x unknown, " "contact maintainer.\n" , pdev->device); -release_mem_region (addr, size); -framebuffer_release (info); -return -ENODEV ; + ret = -ENODEV ; + goto error; } info->fix.smem_start = addr; info->screen_base = (__u8 *)ioremap (addr, par->ramdac ==IBM ?0x400000 :0x800000 ); +if (!info->screen_base) + goto error; info->fix.mmio_start = addr +0x800000 ; par->dc_regs =ioremap (addr +0x800000 ,0x1000 ); +if (!par->dc_regs) + goto error; par->cmap_regs_phys = addr +0x840000 ; par->cmap_regs = (__u8 *)ioremap (addr +0x840000 ,0x1000 ); +if (!par->cmap_regs) + goto error; info->pseudo_palette = par->palette;init_imstt (info);pci_set_drvdata (pdev, info);return 0 ; + +error: +if (par->dc_regs) +iounmap (par->dc_regs); +if (info->screen_base) +iounmap (info->screen_base); +release_mem_region (addr, size); +framebuffer_release (info); +return ret; }static void imsttfb_remove (struct pci_dev *pdev)
Greg Kroah-Hartman
maintainerPATCH 4/323 fbdev: imsttfb: Fix use after free bug in imsttfb_probe
In reply to Greg Kroah-HartmanFrom: Zheng Wang <[email protected]>
commit c75f5a55061091030a13fef71b9995b89bc86213 upstream.
A use-after-free bug may occur if init_imstt invokes framebuffer_release and free the info ptr. The caller, imsttfb_probe didn't notice that and still keep the ptr as private data in pdev.
If we remove the driver which will call imsttfb_remove to make cleanup, UAF happens.
Fix it by return error code if bad case happens in init_imstt.
--- drivers/video/fbdev/imsttfb.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/video/fbdev/imsttfb.c +8 -7
@@ -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" );
@@ -1456,12 +1456,13 @@ static void init_imstt(struct fb_info *iif (register_framebuffer (info) <0 ) {framebuffer_release (info); -return ; +return -ENODEV ; } tmp = (read_reg_le32 (par->dc_regs,SSTATUS ) &0x0f00 ) >>8 ;fb_info (info,"%s frame buffer; %uMB vram; chip version %u\n" , info->fix.id, info->fix.smem_len >>20 , tmp); +return 0 ; }static int imsttfb_probe (struct pci_dev *pdev,const struct pci_device_id *ent)
@@ -1527,10 +1528,10 @@ static int imsttfb_probe(struct pci_devif (!par->cmap_regs) goto error; info->pseudo_palette = par->palette; -init_imstt (info); - -pci_set_drvdata (pdev, info); -return 0 ; + ret =init_imstt (info); +if (!ret) +pci_set_drvdata (pdev, info); +return ret; error:if (par->dc_regs)
Greg Kroah-Hartman
maintainerPATCH 5/323 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
@@ -2798,6 +2798,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/323 scripts/tags.sh: Resolve gtags empty index generation
In reply to Greg Kroah-HartmanFrom: Ahmed S. Darwish <[email protected]>
commit e1b37563caffc410bb4b55f153ccb14dede66815 upstream.
gtags considers any file outside of its current working directory "outside the source tree" and refuses to index it. For O= kernel builds, or when "make" is invoked from a directory other then the kernel source tree, gtags ignores the entire kernel source and generates an empty index.
Force-set gtags current working directory to the kernel source tree.
Due to commit 9da0763bdd82 ("kbuild: Use relative path when building in a subdir of the source tree"), if the kernel build is done in a sub-directory of the kernel source tree, the kernel Makefile will set the kernel's $srctree to ".." for shorter compile-time and run-time warnings. Consequently, the list of files to be indexed will be in the "../*" form, rendering all such paths invalid once gtags switches to the kernel source tree as its current working directory.
If gtags indexing is requested and the build directory is not the kernel source tree, index all files in absolute-path form.
Note, indexing in absolute-path form will not affect the generated index, as paths in gtags indices are always relative to the gtags "root directory" anyway (as evidenced by "gtags --dump").
--- scripts/tags.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
scripts/tags.sh +8 -1
@@ -28,6 +28,13 @@ fi # ignore userspace tools ignore="$ignore ( -path ${tree}tools ) -prune -o" +# gtags(1) refuses to index any file outside of its current working dir. +# If gtags indexing is requested and the build output directory is not +# the kernel source tree, index all files in absolute-path form. +if [[ "$1" == "gtags" && -n "${tree}" ]]; then + tree=$(realpath "$tree")/ +fi + # Detect if ALLSOURCE_ARCHS is set. If not, we assume SRCARCH if [ "${ALLSOURCE_ARCHS}" = "" ]; then ALLSOURCE_ARCHS=${SRCARCH}
@@ -136,7 +143,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/323 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
@@ -2989,6 +2989,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/323 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 | 8 ++++---- 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/cxgb4/cq.c | 2 +- drivers/infiniband/hw/mlx4/qp.c | 6 +++--- 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/tuners/qt1010.c | 4 ++-- 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/nand/raw/nand_ecc.c | 2 +- drivers/mtd/nand/raw/s3c2410.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/gfs2/bmap.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/overlayfs/copy_up.c | 2 +- fs/ubifs/commit.c | 6 +++--- fs/ubifs/dir.c | 2 +- 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/dma/debug.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_cake.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 +- 141 files changed, 216 insertions(+), 217 deletions(-)
arch/arm/mach-sa1100/assabet.c +1 -1
@@ -570,7 +570,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
@@ -444,7 +444,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
@@ -181,7 +181,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
@@ -145,7 +145,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
@@ -178,7 +178,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
@@ -1112,7 +1112,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;/*
@@ -1302,7 +1302,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;
@@ -2458,7 +2458,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);
@@ -2947,10 +2947,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
@@ -988,7 +988,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
@@ -2778,7 +2778,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
@@ -544,9 +544,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
@@ -421,7 +421,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 +4 -4
@@ -605,12 +605,12 @@ static int drive_is_ready(ide_drive_t *dvoid ide_timer_expiry (struct timer_list *t) {ide_hwif_t *hwif =from_timer (hwif, t, timer); -ide_drive_t *uninitialized_var (drive ); +ide_drive_t *drive;ide_handler_t *handler;unsigned long flags;int wait =-1 ;int plug_device =0 ; -struct request *uninitialized_var (rq_in_flight ); +struct request *rq_in_flight;spin_lock_irqsave (&hwif->lock, flags);
@@ -763,13 +763,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
@@ -1726,7 +1726,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;
@@ -3694,7 +3694,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;struct ib_device *ib_dev;
drivers/infiniband/hw/cxgb4/cm.c +1 -1
@@ -3195,7 +3195,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/cxgb4/cq.c +1 -1
@@ -755,7 +755,7 @@ skip_cqe:static int __c4iw_poll_cq_one (struct c4iw_cq *chp,struct c4iw_qp *qhp,struct ib_wc *wc,struct c4iw_srq *srq) { -struct t4_cqe uninitialized_var (cqe ); +struct t4_cqe cqe;struct t4_wq *wq = qhp ? &qhp->wq :NULL ;u32 credit =0 ;u8 cqe_flushed;
drivers/infiniband/hw/mlx4/qp.c +3 -3
@@ -3463,11 +3463,11 @@ static int _mlx4_ib_post_send(struct ib_int nreq;int err =0 ;unsigned ind; -int uninitialized_var (size ); -unsigned uninitialized_var (seglen ); +int size; +unsigned seglen;__be32 dummy;__be32 *lso_wqe; -__be32 uninitialized_var (lso_hdr_sz ); +__be32 lso_hdr_sz;__be32 blh;int i;struct mlx4_ib_dev *mdev =to_mdev (ibqp->device);
drivers/infiniband/hw/mlx5/cq.c +1 -1
@@ -1333,7 +1333,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
@@ -1822,7 +1822,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
@@ -671,7 +671,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
@@ -2603,7 +2603,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/tuners/qt1010.c +2 -2
@@ -224,7 +224,7 @@ static int qt1010_set_params(struct dvb_static int qt1010_init_meas1 (struct qt1010_priv *priv,u8 oper,u8 reg,u8 reg_init_val,u8 *retval) { -u8 i, val1,uninitialized_var (val2 ); +u8 i, val1, val2;int err;qt1010_i2c_oper_t i2c_data[] = {
@@ -259,7 +259,7 @@ static int qt1010_init_meas1(struct qt10static int qt1010_init_meas2 (struct qt1010_priv *priv,u8 reg_init_val,u8 *retval) { -u8 i,uninitialized_var (val ); +u8 i, val;int err;qt1010_i2c_oper_t i2c_data[] = { {QT1010_WR ,0x07 , reg_init_val },
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
@@ -802,9 +802,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 )
@@ -1801,7 +1801,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
@@ -316,7 +316,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/nand/raw/nand_ecc.c +1 -1
@@ -144,7 +144,7 @@ void __nand_calculate_ecc(const unsigned/* rp0..rp15..rp17 are the various accumulated parities (per byte) */ uint32_t rp0, rp1, rp2, rp3, rp4, rp5, rp6, rp7;uint32_t rp8, rp9, rp10, rp11, rp12, rp13, rp14, rp15, rp16; -uint32_t uninitialized_var (rp17 );/* to make compiler happy */ +uint32_t rp17;uint32_t par;/* the cumulative parity for all data */ uint32_t tmppar;/* the cumulative parity for this iteration; for rp12, rp14 and rp16 at the end of the
drivers/mtd/nand/raw/s3c2410.c +1 -1
@@ -304,7 +304,7 @@ static int s3c2410_nand_setrate(struct sint tacls_max = (info->cpu_type ==TYPE_S3C2412 ) ?8 :4 ;int tacls, twrph0, twrph1;unsigned long clkrate =clk_get_rate (info->clk); -unsigned long uninitialized_var (set ), cfg,uninitialized_var (mask ); +unsigned long set, cfg, mask;unsigned long flags;/* calculate the timing information for the controller */
drivers/mtd/ubi/eba.c +1 -1
@@ -612,7 +612,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
@@ -1461,7 +1461,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 ))
@@ -1505,7 +1505,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
@@ -7291,7 +7291,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
@@ -3771,7 +3771,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
@@ -2291,7 +2291,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
@@ -429,7 +429,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;
@@ -526,7 +526,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;
@@ -714,7 +714,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
@@ -1891,7 +1891,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
@@ -230,7 +230,7 @@ static unsigned int ath9k_reg_rmw(void *struct ath_hw *ah = 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
@@ -2115,7 +2115,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
@@ -2784,7 +2784,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
@@ -4275,7 +4275,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
@@ -4174,7 +4174,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
@@ -3811,7 +3811,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
@@ -3648,7 +3648,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
@@ -1537,7 +1537,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
@@ -1146,7 +1146,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
@@ -553,8 +553,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
@@ -828,7 +828,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 )) {
@@ -885,7 +885,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
@@ -1245,8 +1245,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
@@ -268,7 +268,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
@@ -887,7 +887,7 @@ static struct dentry *afs_lookup(structstatic 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 inode *inode;struct key *key;
fs/afs/security.c +1 -1
@@ -340,7 +340,7 @@ int afs_check_permit(struct afs_vnode *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
@@ -269,7 +269,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
@@ -2774,7 +2774,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
@@ -359,7 +359,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/gfs2/bmap.c +1 -1
@@ -1754,7 +1754,7 @@ static int punch_hole(struct gfs2_inodeu64 lblock = (offset + (1 << bsize_shift) -1 ) >> bsize_shift;__u16 start_list[GFS2_MAX_META_HEIGHT ];__u16 __end_list[GFS2_MAX_META_HEIGHT ], *end_list =NULL ; -unsigned int start_aligned,uninitialized_var (end_aligned ); +unsigned int start_aligned, end_aligned;unsigned int strip_h = ip->i_height -1 ;u32 btotal =0 ;int ret, state;
fs/hfsplus/unicode.c +1 -1
@@ -398,7 +398,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
@@ -401,7 +401,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
@@ -4722,7 +4722,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;
@@ -7052,7 +7052,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
@@ -866,9 +866,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,
@@ -912,7 +912,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 ;
@@ -4420,9 +4420,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
@@ -416,7 +416,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 ;
@@ -613,7 +613,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
@@ -1219,7 +1219,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/overlayfs/copy_up.c +1 -1
@@ -713,7 +713,7 @@ static int ovl_copy_up_meta_inode_data(sstruct path upperpath, datapath;int err;char *capability =NULL ; -ssize_t uninitialized_var (cap_size ); +ssize_t cap_size;ovl_path_upper (c->dentry, &upperpath);if (WARN_ON (upperpath.dentry ==NULL ))
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/dir.c +1 -1
@@ -1294,7 +1294,7 @@ static int do_rename(struct inode *old_dstruct ubifs_budget_req ino_req = { .dirtied_ino =1 , .dirtied_ino_d =ALIGN (old_inode_ui->data_len,8 ) };struct timespec64 time; -unsigned int uninitialized_var (saved_nlink ); +unsigned int saved_nlink;struct fscrypt_name old_nm, new_nm;/*
fs/ubifs/file.c +2 -2
@@ -234,7 +234,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",
@@ -438,7 +438,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
@@ -287,7 +287,7 @@ uint32_t ubifs_unpack_bits(const structconst 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 (c, nrbits >0 );
fs/ubifs/tnc.c +3 -3
@@ -936,7 +936,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 ))
@@ -1558,8 +1558,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
@@ -138,8 +138,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 (c, end > beg);
fs/udf/balloc.c +1 -1
@@ -555,7 +555,7 @@ static udf_pblk_t udf_table_new_block(studf_pblk_t newblock =0 ;uint32_t 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
@@ -130,7 +130,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
@@ -1796,7 +1796,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/dma/debug.c +1 -1
@@ -963,7 +963,7 @@ static int device_dma_allocations(structstatic int dma_debug_device_change (struct notifier_block *nb,unsigned long action,void *data) {struct device *dev = data; -struct dma_debug_entry *uninitialized_var (entry ); +struct dma_debug_entry *entry;int count;if (dma_debug_disabled ())
kernel/events/core.c +1 -1
@@ -10575,7 +10575,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
@@ -1887,7 +1887,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
@@ -140,7 +140,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
@@ -1398,7 +1398,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 ;
@@ -1569,7 +1569,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);
@@ -3083,7 +3083,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;
@@ -3558,7 +3558,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 */
@@ -3688,7 +3688,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;
@@ -3987,7 +3987,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
@@ -1246,7 +1246,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);
@@ -1274,7 +1274,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);
@@ -2662,7 +2662,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
@@ -561,7 +561,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
@@ -1498,7 +1498,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
@@ -2381,7 +2381,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
@@ -919,7 +919,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
@@ -1147,7 +1147,7 @@ int do_migrate_pages(struct mm_struct *mstatic struct page *new_page (struct page *page,unsigned long start) {struct vm_area_struct *vma; -unsigned long uninitialized_var (address ); +unsigned long address; vma =find_vma (current->mm, start);while (vma) {
@@ -1545,7 +1545,7 @@ static int kernel_get_mempolicy(int __us 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
@@ -2283,7 +2283,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
@@ -1179,7 +1179,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);
@@ -2826,7 +2826,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
@@ -721,8 +721,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
@@ -518,7 +518,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
@@ -637,7 +637,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
@@ -392,7 +392,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 ;
@@ -1191,7 +1191,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
@@ -229,7 +229,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_cake.c +1 -1
@@ -1649,7 +1649,7 @@ static s32 cake_enqueue(struct sk_buff * {struct cake_sched_data *q =qdisc_priv (sch);int len =qdisc_pkt_len (skb); -int uninitialized_var (ret ); +int ret;struct sk_buff *ack =NULL ;ktime_t now =ktime_get ();struct cake_tin_data *b;
net/sched/sch_cbq.c +1 -1
@@ -365,7 +365,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
@@ -192,7 +192,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
@@ -353,7 +353,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 ;int err, i;
Greg Kroah-Hartman
maintainerPATCH 9/323 md/raid10: check slab-out-of-bounds in md_bitmap_get_counter
In reply to Greg Kroah-HartmanFrom: Li Nan <[email protected]>
[ Upstream commit 301867b1c16805aebbc306aafa6ecdc68b73c7e5 ]
If we write a large number to md/bitmap_set_bits, md_bitmap_checkpage() will return -EINVAL because 'page >= bitmap->pages', but the return value was not checked immediately in md_bitmap_get_counter() in order to set *blocks value and slab-out-of-bounds occurs.
Move check of 'page >= bitmap->pages' to md_bitmap_get_counter() and return directly if true.
--- drivers/md/md-bitmap.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/md/md-bitmap.c +9 -8
@@ -53,14 +53,7 @@ __acquires(bitmap->lock) {unsigned char *mappage; -if (page >= bitmap->pages) { -/* This can happen if bitmap_start_sync goes beyond -* End-of-device while looking for a whole page. -* It is harmless. -*/ -return -EINVAL ; - } - +WARN_ON_ONCE (page >= bitmap->pages);if (bitmap->bp[page].hijacked)/* it's hijacked, don't try to alloc */ return 0 ;
@@ -1368,6 +1361,14 @@ __acquires(bitmap->lock)sector_t csize;int err; +if (page >= bitmap->pages) { +/* +* This can happen if bitmap_start_sync goes beyond +* End-of-device while looking for a whole page or +* user set a huge number to sysfs bitmap_set_bits. +*/ +return NULL ; + } err =md_bitmap_checkpage (bitmap, page, create,0 ); if (bitmap->bp[page].hijacked ||
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 10/323 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
@@ -3671,8 +3671,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)
@@ -3684,7 +3685,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 11/323 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
@@ -4337,6 +4337,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 12/323 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
@@ -781,8 +781,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 ;
@@ -1400,9 +1408,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 13/323 irqchip/jcore-aic: Kill use of irq_create_strict_mappings()
In reply to Greg Kroah-HartmanFrom: Marc Zyngier <[email protected]>
[ Upstream commit 5f8b938bd790cff6542c7fe3c1495c71f89fef1b ]
irq_create_strict_mappings() is a poor way to allow the use of a linear IRQ domain as a legacy one. Let's be upfront about it.
Stable-dep-of: 4848229494a3 ("irqchip/jcore-aic: Fix missing allocation of IRQ descriptors")
--- drivers/irqchip/irq-jcore-aic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/irqchip/irq-jcore-aic.c +2 -2
@@ -100,11 +100,11 @@ static int __init aic_irq_of_init(struct device_node *node, jcore_aic.irq_unmask = noop; jcore_aic.name ="AIC" ; - domain =irq_domain_add_linear (node, dom_sz, &jcore_aic_irqdomain_ops, + domain =irq_domain_add_legacy (node, dom_sz - min_irq, min_irq, min_irq, + &jcore_aic_irqdomain_ops, &jcore_aic);if (!domain)return -ENOMEM ; -irq_create_strict_mappings (domain, min_irq, min_irq, dom_sz - min_irq);return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 14/323 irqchip/jcore-aic: Fix missing allocation of IRQ descriptors
In reply to Greg Kroah-HartmanFrom: John Paul Adrian Glaubitz <[email protected]>
[ Upstream commit 4848229494a323eeaab62eee5574ef9f7de80374 ]
The initialization function for the J-Core AIC aic_irq_of_init() is currently missing the call to irq_alloc_descs() which allocates and initializes all the IRQ descriptors. Add missing function call and return the error code from irq_alloc_descs() in case the allocation fails.
--- drivers/irqchip/irq-jcore-aic.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/irqchip/irq-jcore-aic.c +7 -0
@@ -68,6 +68,7 @@ static int __init aic_irq_of_init(struct device_node *node,unsigned min_irq =JCORE_AIC2_MIN_HWIRQ ;unsigned dom_sz =JCORE_AIC_MAX_HWIRQ +1 ;struct irq_domain *domain; +int ret;pr_info ("Initializing J-Core AIC\n" );
@@ -100,6 +101,12 @@ static int __init aic_irq_of_init(struct device_node *node, jcore_aic.irq_unmask = noop; jcore_aic.name ="AIC" ; + ret =irq_alloc_descs (-1 , min_irq, dom_sz - min_irq, +of_node_to_nid (node)); + +if (ret <0 ) +return ret; + domain =irq_domain_add_legacy (node, dom_sz - min_irq, min_irq, min_irq, &jcore_aic_irqdomain_ops, &jcore_aic);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 15/323 clocksource/drivers: Unify the names to timer-* format
In reply to Greg Kroah-HartmanFrom: Daniel Lezcano <[email protected]>
[ Upstream commit 9d8d47ea6ec6048abc75ccc4486aff1a7db1ff4b ]
In order to make some housekeeping in the directory, this patch renames drivers to the timer-* format in order to unify their names.
There is no functional changes.
Stable-dep-of: 8b5bf64c89c7 ("clocksource/drivers/cadence-ttc: Fix memory leak in ttc_timer_probe")
---
MAINTAINERS | 10 +++----
drivers/clocksource/Makefile | 26 +++++++++----------
...-armada-370-xp.c => timer-armada-370-xp.c} | 0
...adence_ttc_timer.c => timer-cadence-ttc.c} | 0
.../{time-efm32.c => timer-efm32.c} | 0
.../{fsl_ftm_timer.c => timer-fsl-ftm.c} | 0
.../{time-lpc32xx.c => timer-lpc32xx.c} | 0
.../{time-orion.c => timer-orion.c} | 0
.../clocksource/{owl-timer.c => timer-owl.c} | 0
.../{time-pistachio.c => timer-pistachio.c} | 0
.../{qcom-timer.c => timer-qcom.c} | 0
.../{versatile.c => timer-versatile.c} | 0
.../{vf_pit_timer.c => timer-vf-pit.c} | 0
.../{vt8500_timer.c => timer-vt8500.c} | 0
.../{zevio-timer.c => timer-zevio.c} | 0
15 files changed, 18 insertions(+), 18 deletions(-)
rename drivers/clocksource/{time-armada-370-xp.c => timer-armada-370-xp.c} (100%)
rename drivers/clocksource/{cadence_ttc_timer.c => timer-cadence-ttc.c} (100%)
rename drivers/clocksource/{time-efm32.c => timer-efm32.c} (100%)
rename drivers/clocksource/{fsl_ftm_timer.c => timer-fsl-ftm.c} (100%)
rename drivers/clocksource/{time-lpc32xx.c => timer-lpc32xx.c} (100%)
rename drivers/clocksource/{time-orion.c => timer-orion.c} (100%)
rename drivers/clocksource/{owl-timer.c => timer-owl.c} (100%)
rename drivers/clocksource/{time-pistachio.c => timer-pistachio.c} (100%)
rename drivers/clocksource/{qcom-timer.c => timer-qcom.c} (100%)
rename drivers/clocksource/{versatile.c => timer-versatile.c} (100%)
rename drivers/clocksource/{vf_pit_timer.c => timer-vf-pit.c} (100%)
rename drivers/clocksource/{vt8500_timer.c => timer-vt8500.c} (100%)
rename drivers/clocksource/{zevio-timer.c => timer-zevio.c} (100%)MAINTAINERS +5 -5
@@ -1180,7 +1180,7 @@ N: owl F: arch/arm/mach-actions/ F: arch/arm/boot/dts/owl-* F: arch/arm64/boot/dts/actions/ -F: drivers/clocksource/owl-* +F: drivers/clocksource/timer-owl* F: drivers/pinctrl/actions/* F: drivers/soc/actions/ F: include/dt-bindings/power/owl-*
@@ -1603,7 +1603,7 @@ L: [email protected] (moderated for non-subscribers) S: Maintained F: arch/arm/boot/dts/lpc43* F: drivers/clk/nxp/clk-lpc18xx* -F: drivers/clocksource/time-lpc32xx.c +F: drivers/clocksource/timer-lpc32xx.c F: drivers/i2c/busses/i2c-lpc2k.c F: drivers/memory/pl172.c F: drivers/mtd/spi-nor/nxp-spifi.c
@@ -2219,7 +2219,7 @@ F: arch/arm/mach-vexpress/ F: */*/vexpress* F: */*/*/vexpress* F: drivers/clk/versatile/clk-vexpress-osc.c -F: drivers/clocksource/versatile.c +F: drivers/clocksource/timer-versatile.c N: mps2 ARM/VFP SUPPORT
@@ -2241,7 +2241,7 @@ M: Tony Prisk <[email protected]> L: [email protected] (moderated for non-subscribers) S: Maintained F: arch/arm/mach-vt8500/ -F: drivers/clocksource/vt8500_timer.c +F: drivers/clocksource/timer-vt8500.c F: drivers/i2c/busses/i2c-wmt.c F: drivers/mmc/host/wmt-sdmmc.c F: drivers/pwm/pwm-vt8500.c
@@ -2306,7 +2306,7 @@ F: drivers/cpuidle/cpuidle-zynq.c F: drivers/block/xsysace.c N: zynq N: xilinx -F: drivers/clocksource/cadence_ttc_timer.c +F: drivers/clocksource/timer-cadence-ttc.c F: drivers/i2c/busses/i2c-cadence.c F: drivers/mmc/host/sdhci-of-arasan.c F: drivers/edac/synopsys_edac.c
drivers/clocksource/Makefile +13 -13
@@ -23,8 +23,8 @@ obj-$(CONFIG_FTTMR010_TIMER) += timer-fttmr010.o obj-$(CONFIG_ROCKCHIP_TIMER) += rockchip_timer.o obj-$(CONFIG_CLKSRC_NOMADIK_MTU) += nomadik-mtu.o obj-$(CONFIG_CLKSRC_DBX500_PRCMU) += clksrc-dbx500-prcmu.o -obj-$(CONFIG_ARMADA_370_XP_TIMER) += time-armada-370-xp.o -obj-$(CONFIG_ORION_TIMER) += time-orion.o +obj-$(CONFIG_ARMADA_370_XP_TIMER) += timer-armada-370-xp.o +obj-$(CONFIG_ORION_TIMER) += timer-orion.o obj-$(CONFIG_BCM2835_TIMER) += bcm2835_timer.o obj-$(CONFIG_CLPS711X_TIMER) += clps711x-timer.o obj-$(CONFIG_ATLAS7_TIMER) += timer-atlas7.o
@@ -36,25 +36,25 @@ obj-$(CONFIG_SUN4I_TIMER) += sun4i_timer.o obj-$(CONFIG_SUN5I_HSTIMER) += timer-sun5i.o obj-$(CONFIG_MESON6_TIMER) += meson6_timer.o obj-$(CONFIG_TEGRA_TIMER) += tegra20_timer.o -obj-$(CONFIG_VT8500_TIMER) += vt8500_timer.o -obj-$(CONFIG_NSPIRE_TIMER) += zevio-timer.o +obj-$(CONFIG_VT8500_TIMER) += timer-vt8500.o +obj-$(CONFIG_NSPIRE_TIMER) += timer-zevio.o obj-$(CONFIG_BCM_KONA_TIMER) += bcm_kona_timer.o -obj-$(CONFIG_CADENCE_TTC_TIMER) += cadence_ttc_timer.o -obj-$(CONFIG_CLKSRC_EFM32) += time-efm32.o +obj-$(CONFIG_CADENCE_TTC_TIMER) += timer-cadence-ttc.o +obj-$(CONFIG_CLKSRC_EFM32) += timer-efm32.o obj-$(CONFIG_CLKSRC_STM32) += timer-stm32.o obj-$(CONFIG_CLKSRC_EXYNOS_MCT) += exynos_mct.o -obj-$(CONFIG_CLKSRC_LPC32XX) += time-lpc32xx.o +obj-$(CONFIG_CLKSRC_LPC32XX) += timer-lpc32xx.o obj-$(CONFIG_CLKSRC_MPS2) += mps2-timer.o obj-$(CONFIG_CLKSRC_SAMSUNG_PWM) += samsung_pwm_timer.o -obj-$(CONFIG_FSL_FTM_TIMER) += fsl_ftm_timer.o -obj-$(CONFIG_VF_PIT_TIMER) += vf_pit_timer.o -obj-$(CONFIG_CLKSRC_QCOM) += qcom-timer.o +obj-$(CONFIG_FSL_FTM_TIMER) += timer-fsl-ftm.o +obj-$(CONFIG_VF_PIT_TIMER) += timer-vf-pit.o +obj-$(CONFIG_CLKSRC_QCOM) += timer-qcom.o obj-$(CONFIG_MTK_TIMER) += timer-mediatek.o -obj-$(CONFIG_CLKSRC_PISTACHIO) += time-pistachio.o +obj-$(CONFIG_CLKSRC_PISTACHIO) += timer-pistachio.o obj-$(CONFIG_CLKSRC_TI_32K) += timer-ti-32k.o obj-$(CONFIG_CLKSRC_NPS) += timer-nps.o obj-$(CONFIG_OXNAS_RPS_TIMER) += timer-oxnas-rps.o -obj-$(CONFIG_OWL_TIMER) += owl-timer.o +obj-$(CONFIG_OWL_TIMER) += timer-owl.o obj-$(CONFIG_SPRD_TIMER) += timer-sprd.o obj-$(CONFIG_NPCM7XX_TIMER) += timer-npcm7xx.o
@@ -66,7 +66,7 @@ obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp804.o obj-$(CONFIG_ARCH_HAS_TICK_BROADCAST) += dummy_timer.o obj-$(CONFIG_KEYSTONE_TIMER) += timer-keystone.o obj-$(CONFIG_INTEGRATOR_AP_TIMER) += timer-integrator-ap.o -obj-$(CONFIG_CLKSRC_VERSATILE) += versatile.o +obj-$(CONFIG_CLKSRC_VERSATILE) += timer-versatile.o obj-$(CONFIG_CLKSRC_MIPS_GIC) += mips-gic-timer.o obj-$(CONFIG_CLKSRC_TANGO_XTAL) += tango_xtal.o obj-$(CONFIG_CLKSRC_IMX_GPT) += timer-imx-gpt.o
drivers/clocksource/timer-armada-370-xp.c renamed from drivers/clocksource/time-armada-370-xp.c +0 -0
drivers/clocksource/timer-cadence-ttc.c renamed from drivers/clocksource/cadence_ttc_timer.c +0 -0
drivers/clocksource/timer-efm32.c renamed from drivers/clocksource/time-efm32.c +0 -0
drivers/clocksource/timer-fsl-ftm.c renamed from drivers/clocksource/fsl_ftm_timer.c +0 -0
drivers/clocksource/timer-lpc32xx.c renamed from drivers/clocksource/time-lpc32xx.c +0 -0
drivers/clocksource/timer-orion.c renamed from drivers/clocksource/time-orion.c +0 -0
drivers/clocksource/timer-owl.c renamed from drivers/clocksource/owl-timer.c +0 -0
drivers/clocksource/timer-pistachio.c renamed from drivers/clocksource/time-pistachio.c +0 -0
drivers/clocksource/timer-qcom.c renamed from drivers/clocksource/qcom-timer.c +0 -0
drivers/clocksource/timer-versatile.c renamed from drivers/clocksource/versatile.c +0 -0
drivers/clocksource/timer-vf-pit.c renamed from drivers/clocksource/vf_pit_timer.c +0 -0
drivers/clocksource/timer-vt8500.c renamed from drivers/clocksource/vt8500_timer.c +0 -0
drivers/clocksource/timer-zevio.c renamed from drivers/clocksource/zevio-timer.c +0 -0
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 16/323 clocksource/drivers/cadence-ttc: Use ttc driver as platform driver
In reply to Greg Kroah-HartmanFrom: Rajan Vaja <[email protected]>
[ Upstream commit f5ac896b6a23eb46681cdbef440c1d991b04e519 ]
Currently TTC driver is TIMER_OF_DECLARE type driver. Because of that, TTC driver may be initialized before other clock drivers. If TTC driver is dependent on that clock driver then initialization of TTC driver will failed.
So use TTC driver as platform driver instead of using TIMER_OF_DECLARE.
Stable-dep-of: 8b5bf64c89c7 ("clocksource/drivers/cadence-ttc: Fix memory leak in ttc_timer_probe")
--- drivers/clocksource/timer-cadence-ttc.c | 26 +++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-)
drivers/clocksource/timer-cadence-ttc.c +18 -8
@@ -23,6 +23,8 @@#include <linux/of_irq.h> #include <linux/slab.h> #include <linux/sched_clock.h> +#include <linux/module.h> +#include <linux/of_platform.h> /* * This driver configures the 2 16/32-bit count-up timers as follows:
@@ -472,13 +474,7 @@ static int __init ttc_setup_clockevent(struct clk *clk,return err; } -/** -* ttc_timer_init - Initialize the timer -* -* Initializes the timer hardware and register the clock source and clock event -* timers with Linux kernal timer framework -*/ -static int __init ttc_timer_init (struct device_node *timer) +static int __init ttc_timer_probe (struct platform_device *pdev) {unsigned int irq;void __iomem *timer_baseaddr;
@@ -486,6 +482,7 @@ static int __init ttc_timer_init(struct device_node *timer)static int initialized;int clksel, ret;u32 timer_width =16 ; +struct device_node *timer = pdev->dev.of_node;if (initialized)return 0 ;
@@ -540,4 +537,17 @@ static int __init ttc_timer_init(struct device_node *timer)return 0 ; } -TIMER_OF_DECLARE (ttc,"cdns,ttc" , ttc_timer_init); +static const struct of_device_id ttc_timer_of_match[] = { + {.compatible ="cdns,ttc" }, + {}, +}; + +MODULE_DEVICE_TABLE (of, ttc_timer_of_match); + +static struct platform_driver ttc_timer_driver = { + .driver = { + .name ="cdns_ttc_timer" , + .of_match_table = ttc_timer_of_match, + }, +}; +builtin_platform_driver_probe (ttc_timer_driver, ttc_timer_probe);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 17/323 clocksource/drivers/cadence-ttc: Fix memory leak in ttc_timer_probe
In reply to Greg Kroah-HartmanFrom: Feng Mingxi <[email protected]>
[ Upstream commit 8b5bf64c89c7100c921bd807ba39b2eb003061ab ]
Smatch reports:drivers/clocksource/timer-cadence-ttc.c:529 ttc_timer_probe()
warn: 'timer_baseaddr' from of_iomap() not released on lines: 498,508,516.
timer_baseaddr may have the problem of not being released after use, I replaced it with the devm_of_iomap() function and added the clk_put() function to cleanup the "clk_ce" and "clk_cs".
--- drivers/clocksource/timer-cadence-ttc.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/clocksource/timer-cadence-ttc.c +13 -6
@@ -494,10 +494,10 @@ static int __init ttc_timer_probe(struct platform_device *pdev)* and use it. Note that the event timer uses the interrupt and it's the * 2nd TTC hence the irq_of_parse_and_map(,1) */ - timer_baseaddr =of_iomap (timer,0 ); -if (!timer_baseaddr) { + timer_baseaddr =devm_of_iomap (&pdev->dev, timer,0 ,NULL ); +if (IS_ERR (timer_baseaddr)) {pr_err ("ERROR: invalid timer base address\n" ); -return -ENXIO ; +return PTR_ERR (timer_baseaddr); } irq =irq_of_parse_and_map (timer,1 );
@@ -521,20 +521,27 @@ static int __init ttc_timer_probe(struct platform_device *pdev) clk_ce =of_clk_get (timer, clksel);if (IS_ERR (clk_ce)) {pr_err ("ERROR: timer input clock not found\n" ); -return PTR_ERR (clk_ce); + ret =PTR_ERR (clk_ce); + goto put_clk_cs; } ret =ttc_setup_clocksource (clk_cs, timer_baseaddr, timer_width);if (ret) -return ret; + goto put_clk_ce; ret =ttc_setup_clockevent (clk_ce, timer_baseaddr +4 , irq);if (ret) -return ret; + goto put_clk_ce;pr_info ("%s #0 at %p, irq=%d\n" , timer->name, timer_baseaddr, irq);return 0 ; + +put_clk_ce: +clk_put (clk_ce); +put_clk_cs: +clk_put (clk_cs); +return ret; }static const struct of_device_id ttc_timer_of_match[] = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 18/323 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
@@ -2433,10 +2433,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 19/323 ARM: 9303/1: kprobes: avoid missing-declaration warnings
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 1b9c3ddcec6a55e15d3e38e7405e2d078db02020 ]
checker_stack_use_t32strd() and kprobe_handler() can be made static since they are not used from other files, while coverage_start_registers() and __kprobes_test_case() are used from assembler code, and just need a declaration to avoid a warning with the global definition.
arch/arm/probes/kprobes/checkers-common.c:43:18: error: no previous prototype for 'checker_stack_use_t32strd' arch/arm/probes/kprobes/core.c:236:16: error: no previous prototype for 'kprobe_handler' arch/arm/probes/kprobes/test-core.c:723:10: error: no previous prototype for 'coverage_start_registers' arch/arm/probes/kprobes/test-core.c:918:14: error: no previous prototype for '__kprobes_test_case_start' arch/arm/probes/kprobes/test-core.c:952:14: error: no previous prototype for '__kprobes_test_case_end_16' arch/arm/probes/kprobes/test-core.c:967:14: error: no previous prototype for '__kprobes_test_case_end_32'
--- arch/arm/probes/kprobes/checkers-common.c | 2 +- arch/arm/probes/kprobes/core.c | 2 +- arch/arm/probes/kprobes/opt-arm.c | 2 -- arch/arm/probes/kprobes/test-core.c | 2 +- arch/arm/probes/kprobes/test-core.h | 4 ++++ 5 files changed, 7 insertions(+), 5 deletions(-)
arch/arm/probes/kprobes/checkers-common.c +1 -1
@@ -48,7 +48,7 @@ enum probes_insn checker_stack_use_imm_0xx(probes_opcode_t insn,* Different from other insn uses imm8, the real addressing offset of * STRD in T32 encoding should be imm8 * 4. See ARMARM description. */ -enum probes_insn checker_stack_use_t32strd (probes_opcode_t insn, +static enum probes_insn checker_stack_use_t32strd (probes_opcode_t insn,struct arch_probes_insn *asi,const struct decode_header *h) {
arch/arm/probes/kprobes/core.c +1 -1
@@ -239,7 +239,7 @@ singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb)* kprobe, and that level is reserved for user kprobe handlers, so we can't * risk encountering a new kprobe in an interrupt handler. */ -void __kprobes kprobe_handler (struct pt_regs *regs) +static void __kprobes kprobe_handler (struct pt_regs *regs) {struct kprobe *p, *cur;struct kprobe_ctlblk *kcb;
arch/arm/probes/kprobes/opt-arm.c +0 -2
@@ -158,8 +158,6 @@ __arch_remove_optimized_kprobe(struct optimized_kprobe *op, int dirty) } } -extern void kprobe_handler (struct pt_regs *regs); -static void optimized_callback (struct optimized_kprobe *op,struct pt_regs *regs) {
arch/arm/probes/kprobes/test-core.c +1 -1
@@ -723,7 +723,7 @@ static const char coverage_register_lookup[16] = { [REG_TYPE_NOSPPCX] = COVERAGE_ANY_REG | COVERAGE_SP, }; -unsigned coverage_start_registers (const struct decode_header *h) +static unsigned coverage_start_registers (const struct decode_header *h) {unsigned regs =0 ;int i;
arch/arm/probes/kprobes/test-core.h +4 -0
@@ -456,3 +456,7 @@ void kprobe_thumb32_test_cases(void);#else void kprobe_arm_test_cases (void );#endif + +void __kprobes_test_case_start (void ); +void __kprobes_test_case_end_16 (void ); +void __kprobes_test_case_end_32 (void );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 20/323 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
@@ -474,7 +474,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 21/323 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 22/323 wifi: ath9k: avoid referencing uninit memory in ath9k_wmi_ctrl_rx
In reply to Greg Kroah-HartmanFrom: Fedor Pchelkin <[email protected]>
[ Upstream commit f24292e827088bba8de7158501ac25a59b064953 ]
For the reasons also described in commit b383e8abed41 ("wifi: ath9k: avoid uninit memory read in ath9k_htc_rx_msg()"), ath9k_htc_rx_msg() should validate pkt_len before accessing the SKB.
For example, the obtained SKB may have been badly constructed with pkt_len = 8. In this case, the SKB can only contain a valid htc_frame_hdr but after being processed in ath9k_htc_rx_msg() and passed to ath9k_wmi_ctrl_rx() endpoint RX handler, it is expected to have a WMI command header which should be located inside its data payload.
Implement sanity checking inside ath9k_wmi_ctrl_rx(). Otherwise, uninit memory can be referenced.
Tested on Qualcomm Atheros Communications AR9271 802.11n .
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
--- drivers/net/wireless/ath/ath9k/wmi.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/ath/ath9k/wmi.c +4 -0
@@ -218,6 +218,10 @@ static void ath9k_wmi_ctrl_rx(void *priv, struct sk_buff *skb,if (unlikely (wmi->stopped)) goto free_skb; +/* Validate the obtained SKB. */ +if (unlikely (skb->len <sizeof (struct wmi_cmd_hdr ))) + goto free_skb; + hdr = (struct wmi_cmd_hdr *) skb->data; cmd_id =be16_to_cpu (hdr->command_id);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 23/323 samples/bpf: Fix buffer overflow in tcp_basertt
In reply to Greg Kroah-HartmanFrom: Pengcheng Yang <[email protected]>
[ Upstream commit f4dea9689c5fea3d07170c2cb0703e216f1a0922 ]
Using sizeof(nv) or strlen(nv)+1 is correct.
--- samples/bpf/tcp_basertt_kern.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
samples/bpf/tcp_basertt_kern.c +1 -1
@@ -54,7 +54,7 @@ int bpf_basertt(struct bpf_sock_ops *skops)case BPF_SOCK_OPS_BASE_RTT : n =bpf_getsockopt (skops,SOL_TCP ,TCP_CONGESTION , cong,sizeof (cong)); -if (!n && !__builtin_memcmp (cong, nv,sizeof (nv)+1 )) { +if (!n && !__builtin_memcmp (cong, nv,sizeof (nv))) {/* Set base_rtt to 80us */ rv =80 ; }else if (n) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 24/323 wifi: mwifiex: Fix the size of a memory allocation in mwifiex_ret_802_11_scan()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit d9aef04fcfa81ee4fb2804a21a3712b7bbd936af ]
The type of "mwifiex_adapter->nd_info" is "struct cfg80211_wowlan_nd_info", not "struct cfg80211_wowlan_nd_match".
Use struct_size() to ease the computation of the needed size.
The current code over-allocates some memory, so is safe. But it wastes 32 bytes.
--- drivers/net/wireless/marvell/mwifiex/scan.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/marvell/mwifiex/scan.c +3 -3
@@ -2208,9 +2208,9 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,if (nd_config) { adapter->nd_info = -kzalloc (sizeof (struct cfg80211_wowlan_nd_match ) + -sizeof (struct cfg80211_wowlan_nd_match *) * - scan_rsp->number_of_sets,GFP_ATOMIC ); +kzalloc (struct_size (adapter->nd_info, matches, + scan_rsp->number_of_sets), +GFP_ATOMIC );if (adapter->nd_info) adapter->nd_info->n_matches = scan_rsp->number_of_sets;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 25/323 nfc: constify several pointers to u8, char and sk_buff
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 3df40eb3a2ea58bf404a38f15a7a2768e4762cb0 ]
Several functions receive pointers to u8, char or sk_buff but do not modify the contents so make them const. This allows doing the same for local variables and in total makes the code a little bit safer.
Stable-dep-of: 0d9b41daa590 ("nfc: llcp: fix possible use of uninitialized variable in nfc_llcp_send_connect()")
--- include/net/nfc/nfc.h | 4 ++-- net/nfc/core.c | 4 ++-- net/nfc/hci/llc_shdlc.c | 10 ++++----- net/nfc/llcp.h | 8 +++---- net/nfc/llcp_commands.c | 46 ++++++++++++++++++++++------------------- net/nfc/llcp_core.c | 44 +++++++++++++++++++++------------------ net/nfc/nfc.h | 2 +- 7 files changed, 63 insertions(+), 55 deletions(-)
include/net/nfc/nfc.h +2 -2
@@ -278,7 +278,7 @@ struct sk_buff *nfc_alloc_send_skb(struct nfc_dev *dev, struct sock *sk,struct sk_buff *nfc_alloc_recv_skb (unsigned int size,gfp_t gfp);int nfc_set_remote_general_bytes (struct nfc_dev *dev, -u8 *gt,u8 gt_len); +const u8 *gt,u8 gt_len);u8 *nfc_get_local_general_bytes (struct nfc_dev *dev,size_t *gb_len); int nfc_fw_download_done(struct nfc_dev *dev, const char *firmware_name,
@@ -292,7 +292,7 @@ int nfc_dep_link_is_up(struct nfc_dev *dev, u32 target_idx, u8 comm_mode, u8 rf_mode);int nfc_tm_activated (struct nfc_dev *dev,u32 protocol,u8 comm_mode, -u8 *gb,size_t gb_len); +const u8 *gb,size_t gb_len);int nfc_tm_deactivated (struct nfc_dev *dev);int nfc_tm_data_received (struct nfc_dev *dev,struct sk_buff *skb);
net/nfc/core.c +2 -2
@@ -646,7 +646,7 @@ int nfc_disable_se(struct nfc_dev *dev, u32 se_idx)return rc; } -int nfc_set_remote_general_bytes (struct nfc_dev *dev,u8 *gb,u8 gb_len) +int nfc_set_remote_general_bytes (struct nfc_dev *dev,const u8 *gb,u8 gb_len) {pr_debug ("dev_name=%s gb_len=%d\n" ,dev_name (&dev->dev), gb_len);
@@ -675,7 +675,7 @@ int nfc_tm_data_received(struct nfc_dev *dev, struct sk_buff *skb)EXPORT_SYMBOL (nfc_tm_data_received);int nfc_tm_activated (struct nfc_dev *dev,u32 protocol,u8 comm_mode, -u8 *gb,size_t gb_len) +const u8 *gb,size_t gb_len) {int rc;
net/nfc/hci/llc_shdlc.c +5 -5
@@ -134,7 +134,7 @@ static bool llc_shdlc_x_lteq_y_lt_z(int x, int y, int z)return ((y >= x) || (y < z)) ? true : false; } -static struct sk_buff *llc_shdlc_alloc_skb (struct llc_shdlc *shdlc, +static struct sk_buff *llc_shdlc_alloc_skb (const struct llc_shdlc *shdlc,int payload_len) {struct sk_buff *skb;
@@ -148,7 +148,7 @@ static struct sk_buff *llc_shdlc_alloc_skb(struct llc_shdlc *shdlc, }/* immediately sends an S frame. */ -static int llc_shdlc_send_s_frame (struct llc_shdlc *shdlc, +static int llc_shdlc_send_s_frame (const struct llc_shdlc *shdlc,enum sframe_type sframe_type,int nr) {int r;
@@ -170,7 +170,7 @@ static int llc_shdlc_send_s_frame(struct llc_shdlc *shdlc, }/* immediately sends an U frame. skb may contain optional payload */ -static int llc_shdlc_send_u_frame (struct llc_shdlc *shdlc, +static int llc_shdlc_send_u_frame (const struct llc_shdlc *shdlc,struct sk_buff *skb,enum uframe_modifier uframe_modifier) {
@@ -372,7 +372,7 @@ static void llc_shdlc_connect_complete(struct llc_shdlc *shdlc, int r)wake_up (shdlc->connect_wq); } -static int llc_shdlc_connect_initiate (struct llc_shdlc *shdlc) +static int llc_shdlc_connect_initiate (const struct llc_shdlc *shdlc) {struct sk_buff *skb;
@@ -388,7 +388,7 @@ static int llc_shdlc_connect_initiate(struct llc_shdlc *shdlc)return llc_shdlc_send_u_frame (shdlc, skb,U_FRAME_RSET ); } -static int llc_shdlc_connect_send_ua (struct llc_shdlc *shdlc) +static int llc_shdlc_connect_send_ua (const struct llc_shdlc *shdlc) {struct sk_buff *skb;
net/nfc/llcp.h +4 -4
@@ -233,15 +233,15 @@ struct sock *nfc_llcp_accept_dequeue(struct sock *sk, struct socket *newsock);/* TLV API */ int nfc_llcp_parse_gb_tlv (struct nfc_llcp_local *local, -u8 *tlv_array,u16 tlv_array_len); +const u8 *tlv_array,u16 tlv_array_len);int nfc_llcp_parse_connection_tlv (struct nfc_llcp_sock *sock, -u8 *tlv_array,u16 tlv_array_len); +const u8 *tlv_array,u16 tlv_array_len);/* Commands API */ void nfc_llcp_recv (void *data,struct sk_buff *skb,int err); -u8 *nfc_llcp_build_tlv (u8 type,u8 *value,u8 value_length,u8 *tlv_length); +u8 *nfc_llcp_build_tlv (u8 type,const u8 *value,u8 value_length,u8 *tlv_length);struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdres_tlv (u8 tid,u8 sap); -struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdreq_tlv (u8 tid,char *uri, +struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdreq_tlv (u8 tid,const char *uri,size_t uri_len);void nfc_llcp_free_sdp_tlv (struct nfc_llcp_sdp_tlv *sdp);void nfc_llcp_free_sdp_tlv_list (struct hlist_head *sdp_head);
net/nfc/llcp_commands.c +25 -21
132 lines not on this page · raw message
net/nfc/llcp_core.c +24 -20
142 lines not on this page · raw message
net/nfc/nfc.h +1 -1
@@ -60,7 +60,7 @@ void nfc_llcp_mac_is_up(struct nfc_dev *dev, u32 target_idx, u8 comm_mode, u8 rf_mode);int nfc_llcp_register_device (struct nfc_dev *dev);void nfc_llcp_unregister_device (struct nfc_dev *dev); -int nfc_llcp_set_remote_gb (struct nfc_dev *dev,u8 *gb,u8 gb_len); +int nfc_llcp_set_remote_gb (struct nfc_dev *dev,const u8 *gb,u8 gb_len);u8 *nfc_llcp_general_bytes (struct nfc_dev *dev,size_t *general_bytes_len);int nfc_llcp_data_received (struct nfc_dev *dev,struct sk_buff *skb);struct nfc_llcp_local *nfc_llcp_find_local (struct nfc_dev *dev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 26/323 nfc: llcp: fix possible use of uninitialized variable in nfc_llcp_send_connect()
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 0d9b41daa5907756a31772d8af8ac5ff25cf17c1 ]
If sock->service_name is NULL, the local variable service_name_tlv_length will not be assigned by nfc_llcp_build_tlv(), later leading to using value frmo the stack. Smatch warning:
net/nfc/llcp_commands.c:442 nfc_llcp_send_connect() error: uninitialized symbol 'service_name_tlv_length'.
--- net/nfc/llcp_commands.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/nfc/llcp_commands.c +2 -1
@@ -406,7 +406,8 @@ int nfc_llcp_send_connect(struct nfc_llcp_sock *sock)const u8 *service_name_tlv =NULL ;const u8 *miux_tlv =NULL ;const u8 *rw_tlv =NULL ; -u8 service_name_tlv_length, miux_tlv_length, rw_tlv_length, rw; +u8 service_name_tlv_length =0 ; +u8 miux_tlv_length, rw_tlv_length, rw;int err;u16 size =0 ;__be16 miux;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 27/323 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 28/323 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 29/323 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 30/323 wl3501_cs: Fix a bunch of formatting issues related to function docs
In reply to Greg Kroah-HartmanFrom: Lee Jones <[email protected]>
[ Upstream commit 2307d0bc9d8b60299f255d1771ce0d997162a957 ]
Fixes the following W=1 kernel build warning(s):
In file included from drivers/net/wireless/wl3501_cs.c:57:
drivers/net/wireless/wl3501_cs.c:143: warning: Function parameter or member 'reg_domain' not described in 'iw_valid_channel' drivers/net/wireless/wl3501_cs.c:143: warning: Function parameter or member 'channel' not described in 'iw_valid_channel' drivers/net/wireless/wl3501_cs.c:162: warning: Function parameter or member 'reg_domain' not described in 'iw_default_channel' drivers/net/wireless/wl3501_cs.c:248: warning: Function parameter or member 'this' not described in 'wl3501_set_to_wla' drivers/net/wireless/wl3501_cs.c:270: warning: Function parameter or member 'this' not described in 'wl3501_get_from_wla' drivers/net/wireless/wl3501_cs.c:467: warning: Function parameter or member 'this' not described in 'wl3501_send_pkt' drivers/net/wireless/wl3501_cs.c:467: warning: Function parameter or member 'data' not described in 'wl3501_send_pkt' drivers/net/wireless/wl3501_cs.c:467: warning: Function parameter or member 'len' not described in 'wl3501_send_pkt' drivers/net/wireless/wl3501_cs.c:729: warning: Function parameter or member 'this' not described in 'wl3501_block_interrupt' drivers/net/wireless/wl3501_cs.c:746: warning: Function parameter or member 'this' not described in 'wl3501_unblock_interrupt' drivers/net/wireless/wl3501_cs.c:1124: warning: Function parameter or member 'irq' not described in 'wl3501_interrupt' drivers/net/wireless/wl3501_cs.c:1124: warning: Function parameter or member 'dev_id' not described in 'wl3501_interrupt' drivers/net/wireless/wl3501_cs.c:1257: warning: Function parameter or member 'dev' not described in 'wl3501_reset' drivers/net/wireless/wl3501_cs.c:1420: warning: Function parameter or member 'link' not described in 'wl3501_detach'
Stable-dep-of: 391af06a02e7 ("wifi: wl3501_cs: Fix an error handling path in wl3501_probe()")
--- drivers/net/wireless/wl3501_cs.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
drivers/net/wireless/wl3501_cs.c +12 -10
@@ -133,8 +133,8 @@ static const struct {/** * iw_valid_channel - validate channel in regulatory domain -* @reg_comain - regulatory domain -* @channel - channel to validate +* @reg_comain: regulatory domain +* @channel: channel to validate * * Returns 0 if invalid in the specified regulatory domain, non-zero if valid. */
@@ -153,7 +153,7 @@ static int iw_valid_channel(int reg_domain, int channel)/** * iw_default_channel - get default channel for a regulatory domain -* @reg_comain - regulatory domain +* @reg_domain: regulatory domain * * Returns the default channel for a regulatory domain */
@@ -236,6 +236,7 @@ static int wl3501_get_flash_mac_addr(struct wl3501_card *this)/** * wl3501_set_to_wla - Move 'size' bytes from PC to card +* @this: Card * @dest: Card addressing space * @src: PC addressing space * @size: Bytes to move
@@ -258,6 +259,7 @@ static void wl3501_set_to_wla(struct wl3501_card *this, u16 dest, void *src,/** * wl3501_get_from_wla - Move 'size' bytes from card to PC +* @this: Card * @src: Card addressing space * @dest: PC addressing space * @size: Bytes to move
@@ -454,7 +456,7 @@ static int wl3501_pwr_mgmt(struct wl3501_card *this, int suspend)/** * wl3501_send_pkt - Send a packet. -* @this - card +* @this: Card * * Send a packet. *
@@ -722,7 +724,7 @@ static void wl3501_mgmt_scan_confirm(struct wl3501_card *this, u16 addr)/** * wl3501_block_interrupt - Mask interrupt from SUTRO -* @this - card +* @this: Card * * Mask interrupt from SUTRO. (i.e. SUTRO cannot interrupt the HOST) * Return: 1 if interrupt is originally enabled
@@ -739,7 +741,7 @@ static int wl3501_block_interrupt(struct wl3501_card *this)/** * wl3501_unblock_interrupt - Enable interrupt from SUTRO -* @this - card +* @this: Card * * Enable interrupt from SUTRO. (i.e. SUTRO can interrupt the HOST) * Return: 1 if interrupt is originally enabled
@@ -1113,8 +1115,8 @@ static inline void wl3501_ack_interrupt(struct wl3501_card *this)/** * wl3501_interrupt - Hardware interrupt from card. -* @irq - Interrupt number -* @dev_id - net_device +* @irq: Interrupt number +* @dev_id: net_device * * We must acknowledge the interrupt as soon as possible, and block the * interrupt from the same card immediately to prevent re-entry.
@@ -1252,7 +1254,7 @@ static int wl3501_close(struct net_device *dev)/** * wl3501_reset - Reset the SUTRO. -* @dev - network device +* @dev: network device * * It is almost the same as wl3501_open(). In fact, we may just wl3501_close() * and wl3501_open() again, but I wouldn't like to free_irq() when the driver
@@ -1415,7 +1417,7 @@ static struct iw_statistics *wl3501_get_wireless_stats(struct net_device *dev)/** * wl3501_detach - deletes a driver "instance" -* @link - FILL_IN +* @link: FILL_IN * * This deletes a driver "instance". The device is de-registered with Card * Services. If it has been released, all local data structures are freed.
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 31/323 wl3501_cs: Remove unnecessary NULL check
In reply to Greg Kroah-HartmanFrom: Alex Dewar <[email protected]>
[ Upstream commit 1d2a85382282e7c77cbde5650335c3ffc6073fa1 ]
In wl3501_detach(), link->priv is checked for a NULL value before being passed to free_netdev(). However, it cannot be NULL at this point as it has already been passed to other functions, so just remove the check.
Addresses-Coverity: CID 710499: Null pointer dereferences (REVERSE_INULL)
Stable-dep-of: 391af06a02e7 ("wifi: wl3501_cs: Fix an error handling path in wl3501_probe()")
--- drivers/net/wireless/wl3501_cs.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/wireless/wl3501_cs.c +1 -3
@@ -1438,9 +1438,7 @@ static void wl3501_detach(struct pcmcia_device *link)wl3501_release (link);unregister_netdev (dev); - -if (link->priv) -free_netdev (link->priv); +free_netdev (dev); } static int wl3501_get_name(struct net_device *dev, struct iw_request_info *info,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 32/323 wl3501_cs: Fix misspelling and provide missing documentation
In reply to Greg Kroah-HartmanFrom: Lee Jones <[email protected]>
[ Upstream commit 8b8a6f8c3b50193d161c598a6784e721128d6dc3 ]
Fixes the following W=1 kernel build warning(s):
In file included from drivers/net/wireless/wl3501_cs.c:57:
drivers/net/wireless/wl3501_cs.c:143: warning: Function parameter or member 'reg_domain' not described in 'iw_valid_channel' drivers/net/wireless/wl3501_cs.c:143: warning: Excess function parameter 'reg_comain' description in 'iw_valid_channel' drivers/net/wireless/wl3501_cs.c:469: warning: Function parameter or member 'data' not described in 'wl3501_send_pkt' drivers/net/wireless/wl3501_cs.c:469: warning: Function parameter or member 'len' not described in 'wl3501_send_pkt'
Stable-dep-of: 391af06a02e7 ("wifi: wl3501_cs: Fix an error handling path in wl3501_probe()")
--- drivers/net/wireless/wl3501_cs.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/net/wireless/wl3501_cs.c +3 -5
@@ -133,7 +133,7 @@ static const struct {/** * iw_valid_channel - validate channel in regulatory domain -* @reg_comain: regulatory domain +* @reg_domain: regulatory domain * @channel: channel to validate * * Returns 0 if invalid in the specified regulatory domain, non-zero if valid.
@@ -457,11 +457,9 @@ static int wl3501_pwr_mgmt(struct wl3501_card *this, int suspend)/** * wl3501_send_pkt - Send a packet. * @this: Card -* -* Send a packet. -* -* data = Ethernet raw frame. (e.g. data[0] - data[5] is Dest MAC Addr, +* @data: Ethernet raw frame. (e.g. data[0] - data[5] is Dest MAC Addr, * data[6] - data[11] is Src MAC Addr) +* @len: Packet length * Ref: IEEE 802.11 */ static int wl3501_send_pkt (struct wl3501_card *this,u8 *data,u16 len)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 33/323 net: create netdev->dev_addr assignment helpers
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 48eab831ae8b9f7002a533fa4235eed63ea1f1a3 ]
Recent work on converting address list to a tree made it obvious we need an abstraction around writing netdev->dev_addr. Without such abstraction updating the main device address is invisible to the core.
Introduce a number of helpers which for now just wrap memcpy() but in the future can make necessary changes to the address tree.
Stable-dep-of: 391af06a02e7 ("wifi: wl3501_cs: Fix an error handling path in wl3501_probe()")
--- include/linux/etherdevice.h | 12 ++++++++++++ include/linux/netdevice.h | 18 ++++++++++++++++++ 2 files changed, 30 insertions(+)
include/linux/etherdevice.h +12 -0
@@ -291,6 +291,18 @@ static inline void ether_addr_copy(u8 *dst, const u8 *src)#endif } +/** +* eth_hw_addr_set - Assign Ethernet address to a net_device +* @dev: pointer to net_device structure +* @addr: address to assign +* +* Assign given address to the net_device, addr_assign_type is not changed. +*/ +static inline void eth_hw_addr_set (struct net_device *dev,const u8 *addr) +{ +ether_addr_copy (dev->dev_addr, addr); +} +/** * eth_hw_addr_inherit - Copy dev_addr from another net_device * @dst: pointer to net_device to copy dev_addr to
include/linux/netdevice.h +18 -0
@@ -4079,6 +4079,24 @@ void __hw_addr_unsync_dev(struct netdev_hw_addr_list *list,void __hw_addr_init (struct netdev_hw_addr_list *list);/* Functions used for device addresses handling */ +static inline void +__dev_addr_set (struct net_device *dev,const u8 *addr,size_t len) +{ +memcpy (dev->dev_addr, addr, len); +} + +static inline void dev_addr_set (struct net_device *dev,const u8 *addr) +{ +__dev_addr_set (dev, addr, dev->addr_len); +} + +static inline void +dev_addr_mod (struct net_device *dev,unsigned int offset, +const u8 *addr,size_t len) +{ +memcpy (&dev->dev_addr[offset], addr, len); +} +int dev_addr_add (struct net_device *dev,const unsigned char *addr,unsigned char addr_type); int dev_addr_del(struct net_device *dev, const unsigned char *addr,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 34/323 wl3501_cs: use eth_hw_addr_set()
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 18774612246d036c04ce9fee7f67192f96f48725 ]
Commit 406f42fa0d3c ("net-next: When a bond have a massive amount of VLANs...") introduced a rbtree for faster Ethernet address look up. To maintain netdev->dev_addr in this tree we need to make all the writes to it got through appropriate helpers.
Stable-dep-of: 391af06a02e7 ("wifi: wl3501_cs: Fix an error handling path in wl3501_probe()")
--- drivers/net/wireless/wl3501_cs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/wl3501_cs.c +1 -2
@@ -1946,8 +1946,7 @@ static int wl3501_config(struct pcmcia_device *link) goto failed; } -for (i =0 ; i <6 ; i++) - dev->dev_addr[i] = ((char *)&this->mac_addr)[i]; +eth_hw_addr_set (dev, this->mac_addr);/* print probe information */ printk(KERN_INFO "%s: wl3501 @ 0x%3.3x, IRQ %d, "
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 35/323 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
@@ -1863,6 +1863,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 ;
@@ -1874,8 +1875,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 ;
@@ -1888,9 +1888,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 36/323 wifi: ray_cs: Utilize strnlen() in parse_addr()
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 9e8e9187673cb24324f9165dd47b2b28f60b0b10 ]
Instead of doing simple operations and using an additional variable on stack, utilize strnlen() and reuse len variable.
Stable-dep-of: 4f8d66a9fb2e ("wifi: ray_cs: Fix an error handling path in ray_probe()")
--- drivers/net/wireless/ray_cs.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/net/wireless/ray_cs.c +7 -9
@@ -1651,31 +1651,29 @@ static void authenticate_timeout(struct timer_list *t)/*===========================================================================*/ static int parse_addr (char *in_str,UCHAR *out) { +int i, k;int len; -int i, j, k;int status;if (in_str ==NULL )return 0 ; -if ((len =strlen (in_str)) <2 ) + len =strnlen (in_str,ADDRLEN *2 +1 ) -1 ; +if (len <1 )return 0 ;memset (out,0 ,ADDRLEN ); status =1 ; - j = len -1 ; -if (j >12 ) - j =12 ; i =5 ; -while (j >0 ) { -if ((k =hex_to_bin (in_str[j--])) !=-1 ) +while (len >0 ) { +if ((k =hex_to_bin (in_str[len--])) !=-1 ) out[i] = k;else return 0 ; -if (j ==0 ) +if (len ==0 )break ; -if ((k =hex_to_bin (in_str[j--])) !=-1 ) +if ((k =hex_to_bin (in_str[len--])) !=-1 ) out[i] += k <<4 ;else return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 37/323 wifi: ray_cs: Drop useless status variable in parse_addr()
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 4dfc63c002a555a2c3c34d89009532ad803be876 ]
The status variable assigned only once and used also only once. Replace it's usage by actual value.
Stable-dep-of: 4f8d66a9fb2e ("wifi: ray_cs: Fix an error handling path in ray_probe()")
--- drivers/net/wireless/ray_cs.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/wireless/ray_cs.c +1 -3
@@ -1653,7 +1653,6 @@ static int parse_addr(char *in_str, UCHAR *out) {int i, k;int len; -int status;if (in_str ==NULL )return 0 ;
@@ -1662,7 +1661,6 @@ static int parse_addr(char *in_str, UCHAR *out)return 0 ;memset (out,0 ,ADDRLEN ); - status =1 ; i =5 ;while (len >0 ) {
@@ -1680,7 +1678,7 @@ static int parse_addr(char *in_str, UCHAR *out)if (!i--)break ; } -return status; +return 1 ; }/*===========================================================================*/
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 38/323 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
@@ -282,13 +282,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;
@@ -325,11 +326,16 @@ static int ray_probe(struct pcmcia_device *p_dev)timer_setup (&local->timer,NULL ,0 ); this_device = p_dev; -return ray_config (p_dev); + ret =ray_config (p_dev); +if (ret) + goto err_free_dev; + +return 0 ; -fail_alloc_dev: -return -ENOMEM ; -}/* ray_attach */ +err_free_dev: +free_netdev (dev); +return ret; +}static void ray_detach (struct pcmcia_device *link) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 39/323 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 40/323 wifi: rsi: Do not set MMC_PM_KEEP_POWER in shutdown
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit e74f562328b03fbe9cf438f958464dff3a644dfc ]
It makes no sense to set MMC_PM_KEEP_POWER in shutdown. The flag indicates to the MMC subsystem to keep the slot powered on during suspend, but in shutdown the slot should actually be powered off. Drop this call.
--- drivers/net/wireless/rsi/rsi_91x_sdio.c | 3 --- 1 file changed, 3 deletions(-)
drivers/net/wireless/rsi/rsi_91x_sdio.c +0 -3
@@ -1368,9 +1368,6 @@ static void rsi_shutdown(struct device *dev)if (sdev->write_fail)rsi_dbg (INFO_ZONE ,"###### Device is not ready #######\n" ); -if (rsi_set_sdio_pm_caps (adapter)) -rsi_dbg (INFO_ZONE ,"Setting power management caps failed\n" ); -rsi_dbg (INFO_ZONE ,"***** RSI module shut down *****\n" ); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 41/323 watchdog/perf: define dummy watchdog_update_hrtimer_threshold() on correct config
In reply to Greg Kroah-HartmanFrom: Douglas Anderson <[email protected]>
[ Upstream commit 5e008df11c55228a86a1bae692cc2002503572c9 ]
Patch series "watchdog/hardlockup: Add the buddy hardlockup detector", v5.
This patch series adds the "buddy" hardlockup detector. In brief, the buddy hardlockup detector can detect hardlockups without arch-level support by having CPUs checkup on a "buddy" CPU periodically.
Given the new design of this patch series, testing all combinations is fairly difficult. I've attempted to make sure that all combinations of CONFIG_ options are good, but it wouldn't surprise me if I missed something. I apologize in advance and I'll do my best to fix any problems that are found.
This patch (of 18):
The real watchdog_update_hrtimer_threshold() is defined in kernel/watchdog_hld.c. That file is included if CONFIG_HARDLOCKUP_DETECTOR_PERF and the function is defined in that file if CONFIG_HARDLOCKUP_CHECK_TIMESTAMP.
The dummy version of the function in "nmi.h" didn't get that quite right. While this doesn't appear to be a huge deal, it's nice to make it consistent.
It doesn't break builds because CHECK_TIMESTAMP is only defined by x86 so others don't get a double definition, and x86 uses perf lockup detector, so it gets the out of line version.
--- include/linux/nmi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/nmi.h +1 -1
@@ -197,7 +197,7 @@ u64 hw_nmi_get_sample_period(int watchdog_thresh);#endif #if defined(CONFIG_HARDLOCKUP_CHECK_TIMESTAMP ) && \ - defined(CONFIG_HARDLOCKUP_DETECTOR ) + defined(CONFIG_HARDLOCKUP_DETECTOR_PERF )void watchdog_update_hrtimer_threshold (u64 period);#else static inline void watchdog_update_hrtimer_threshold (u64 period) { }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 42/323 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 43/323 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
@@ -1020,6 +1020,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;
@@ -1031,9 +1032,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 44/323 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 45/323 wifi: ath9k: Fix possible stall on ath9k_txq_list_has_key()
In reply to Greg Kroah-HartmanFrom: Remi Pommarel <[email protected]>
[ Upstream commit 75086cc6dee046e3fbb3dba148b376d8802f83bc ]
On EDMA capable hardware, ath9k_txq_list_has_key() can enter infinite loop if it is called while all txq_fifos have packets that use different key that the one we are looking for. Fix it by exiting the loop if all txq_fifos have been checked already.
Because this loop is called under spin_lock_bh() (see ath_txq_lock) it causes the following rcu stall:
rcu: INFO: rcu_sched self-detected stall on CPU
ath10k_pci 0000:01:00.0: failed to read temperature -11
rcu: 1-....: (5254 ticks this GP) idle=189/1/0x4000000000000002 softirq=8442983/8442984 fqs=2579
(t=5257 jiffies g=17983297 q=334)
Task dump for CPU 1:
task:hostapd state:R running task stack: 0 pid: 297 ppid: 289 flags:0x0000000a
Call trace:
dump_backtrace+0x0/0x170
show_stack+0x1c/0x24
sched_show_task+0x140/0x170
dump_cpu_task+0x48/0x54
rcu_dump_cpu_stacks+0xf0/0x134
rcu_sched_clock_irq+0x8d8/0x9fc
update_process_times+0xa0/0xec
tick_sched_timer+0x5c/0xd0
__hrtimer_run_queues+0x154/0x320
hrtimer_interrupt+0x120/0x2f0
arch_timer_handler_virt+0x38/0x44
handle_percpu_devid_irq+0x9c/0x1e0
handle_domain_irq+0x64/0x90
gic_handle_irq+0x78/0xb0
call_on_irq_stack+0x28/0x38
do_interrupt_handler+0x54/0x5c
el1_interrupt+0x2c/0x4c
el1h_64_irq_handler+0x14/0x1c
el1h_64_irq+0x74/0x78
ath9k_txq_has_key+0x1bc/0x250 [ath9k]
ath9k_set_key+0x1cc/0x3dc [ath9k]
drv_set_key+0x78/0x170
ieee80211_key_replace+0x564/0x6cc
ieee80211_key_link+0x174/0x220
ieee80211_add_key+0x11c/0x300
nl80211_new_key+0x12c/0x330
genl_family_rcv_msg_doit+0xbc/0x11c
genl_rcv_msg+0xd8/0x1c4
netlink_rcv_skb+0x40/0x100
genl_rcv+0x3c/0x50
netlink_unicast+0x1ec/0x2c0
netlink_sendmsg+0x198/0x3c0
____sys_sendmsg+0x210/0x250
___sys_sendmsg+0x78/0xc4
__sys_sendmsg+0x4c/0x90
__arm64_sys_sendmsg+0x28/0x30
invoke_syscall.constprop.0+0x60/0x100
do_el0_svc+0x48/0xd0
el0_svc+0x14/0x50
el0t_64_sync_handler+0xa8/0xb0
el0t_64_sync+0x158/0x15cThis rcu stall is hard to reproduce as is, but changing ATH_TXFIFO_DEPTH from 8 to 2 makes it reasonably easy to reproduce.
--- drivers/net/wireless/ath/ath9k/main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath9k/main.c +4 -3
@@ -847,7 +847,7 @@ static bool ath9k_txq_list_has_key(struct list_head *txq_list, u32 keyix)static bool ath9k_txq_has_key (struct ath_softc *sc,u32 keyix) {struct ath_hw *ah = sc->sc_ah; -int i; +int i, j;struct ath_txq *txq;bool key_in_use = false;
@@ -865,8 +865,9 @@ static bool ath9k_txq_has_key(struct ath_softc *sc, u32 keyix)if (sc->sc_ah->caps.hw_caps &ATH9K_HW_CAP_EDMA ) {int idx = txq->txq_tailidx; -while (!key_in_use && - !list_empty (&txq->txq_fifo[idx])) { +for (j =0 ; !key_in_use && + !list_empty (&txq->txq_fifo[idx]) && + j <ATH_TXFIFO_DEPTH ; j++) { key_in_use =ath9k_txq_list_has_key ( &txq->txq_fifo[idx], keyix);INCR (idx,ATH_TXFIFO_DEPTH );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 46/323 wifi: ath9k: convert msecs to jiffies where needed
In reply to Greg Kroah-HartmanFrom: Dmitry Antipov <[email protected]>
[ Upstream commit 2aa083acea9f61be3280184384551178f510ff51 ]
Since 'ieee80211_queue_delayed_work()' expects timeout in jiffies and not milliseconds, 'msecs_to_jiffies()' should be used in 'ath_restart_work()' and '__ath9k_flush()'.
--- drivers/net/wireless/ath/ath9k/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath9k/main.c +2 -2
@@ -200,7 +200,7 @@ void ath_cancel_work(struct ath_softc *sc)void ath_restart_work (struct ath_softc *sc) {ieee80211_queue_delayed_work (sc->hw, &sc->hw_check_work, -ATH_HW_CHECK_POLL_INT ); +msecs_to_jiffies (ATH_HW_CHECK_POLL_INT ));if (AR_SREV_9340 (sc->sc_ah) ||AR_SREV_9330 (sc->sc_ah)) ieee80211_queue_delayed_work(sc->hw, &sc->hw_pll_work,
@@ -2228,7 +2228,7 @@ void __ath9k_flush(struct ieee80211_hw *hw, u32 queues, bool drop, }ieee80211_queue_delayed_work (hw, &sc->hw_check_work, -ATH_HW_CHECK_POLL_INT ); +msecs_to_jiffies (ATH_HW_CHECK_POLL_INT )); }static bool ath9k_tx_frames_pending (struct ieee80211_hw *hw)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 47/323 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
@@ -1603,6 +1603,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 ;
@@ -1612,12 +1613,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 ;
@@ -151,7 +152,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 ;
@@ -172,7 +173,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 48/323 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
@@ -3436,7 +3436,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))
@@ -3450,10 +3450,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 ; }
@@ -3465,7 +3465,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 49/323 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 50/323 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 51/323 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 52/323 ipvlan: Fix return value of ipvlan_queue_xmit()
In reply to Greg Kroah-HartmanFrom: Cambda Zhu <[email protected]>
[ Upstream commit 8a9922e7be6d042fa00f894c376473b17a162b66 ]
ipvlan_queue_xmit() should return NET_XMIT_XXX, but ipvlan_xmit_mode_l2/l3() returns rx_handler_result_t or NET_RX_XXX in some cases. ipvlan_rcv_frame() will only return RX_HANDLER_CONSUMED in ipvlan_xmit_mode_l2/l3() because 'local' is true. It's equal to NET_XMIT_SUCCESS. But dev_forward_skb() can return NET_RX_SUCCESS or NET_RX_DROP, and returning NET_RX_DROP(NET_XMIT_DROP) will increase both ipvlan and ipvlan->phy_dev drops counter.
The skb to forward can be treated as xmitted successfully. This patch makes ipvlan_queue_xmit() return NET_XMIT_SUCCESS for forward skb.
--- drivers/net/ipvlan/ipvlan_core.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/ipvlan/ipvlan_core.c +6 -3
@@ -592,7 +592,8 @@ static int ipvlan_xmit_mode_l3(struct sk_buff *skb, struct net_device *dev)consume_skb (skb);return NET_XMIT_DROP ; } -return ipvlan_rcv_frame (addr, &skb, true); +ipvlan_rcv_frame (addr, &skb, true); +return NET_XMIT_SUCCESS ; } } out:
@@ -618,7 +619,8 @@ static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev)consume_skb (skb);return NET_XMIT_DROP ; } -return ipvlan_rcv_frame (addr, &skb, true); +ipvlan_rcv_frame (addr, &skb, true); +return NET_XMIT_SUCCESS ; } } skb =skb_share_check (skb,GFP_ATOMIC );
@@ -630,7 +632,8 @@ static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev)* the skb for the main-dev. At the RX side we just return * RX_PASS for it to be processed further on the stack. */ -return dev_forward_skb (ipvlan->phy_dev, skb); +dev_forward_skb (ipvlan->phy_dev, skb); +return NET_XMIT_SUCCESS ; }else if (is_multicast_ether_addr (eth->h_dest)) {skb_reset_mac_header (skb);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 53/323 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
@@ -1840,6 +1840,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
@@ -1939,13 +1939,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
@@ -167,7 +167,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 54/323 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
@@ -5552,6 +5552,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))
@@ -5581,11 +5582,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,
@@ -5625,6 +5630,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,
@@ -5713,25 +5724,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 55/323 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 56/323 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
@@ -468,7 +468,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 57/323 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 58/323 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
@@ -405,8 +405,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 59/323 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 60/323 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 61/323 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 62/323 IB/hfi1: Fix sdma.h tx->num_descs off-by-one errors
In reply to Greg Kroah-HartmanFrom: Patrick Kelsey <[email protected]>
[ Upstream commit fd8958efe8779d3db19c9124fce593ce681ac709 ]
Fix three sources of error involving struct sdma_txreq.num_descs.
When _extend_sdma_tx_descs() extends the descriptor array, it uses the value of tx->num_descs to determine how many existing entries from the tx's original, internal descriptor array to copy to the newly allocated one. As this value was incremented before the call, the copy loop will access one entry past the internal descriptor array, copying its contents into the corresponding slot in the new array.
If the call to _extend_sdma_tx_descs() fails, _pad_smda_tx_descs() then invokes __sdma_tx_clean() which uses the value of tx->num_desc to drive a loop that unmaps all descriptor entries in use. As this value was incremented before the call, the unmap loop will invoke sdma_unmap_desc() on a descriptor entry whose contents consist of whatever random data was copied into it during (1), leading to cascading further calls into the kernel and driver using arbitrary data.
_sdma_close_tx() was using tx->num_descs instead of tx->num_descs - 1.
Fix all of the above by:
- Only increment .num_descs after .descp is extended.
- Use .num_descs - 1 instead of .num_descs for last .descp entry.
--- drivers/infiniband/hw/hfi1/sdma.c | 4 ++-- drivers/infiniband/hw/hfi1/sdma.h | 15 +++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-)
drivers/infiniband/hw/hfi1/sdma.c +2 -2
@@ -3202,8 +3202,7 @@ int _pad_sdma_tx_descs(struct hfi1_devdata *dd, struct sdma_txreq *tx) {int rval =0 ; - tx->num_desc++; -if ((unlikely (tx->num_desc == tx->desc_limit))) { +if ((unlikely (tx->num_desc +1 == tx->desc_limit))) { rval =_extend_sdma_tx_descs (dd, tx);if (rval) {__sdma_txclean (dd, tx);
@@ -3216,6 +3215,7 @@ int _pad_sdma_tx_descs(struct hfi1_devdata *dd, struct sdma_txreq *tx)SDMA_MAP_NONE , dd->sdma_pad_phys, sizeof(u32) - (tx->packet_len & (sizeof(u32) - 1))); + tx->num_desc++;_sdma_close_tx (dd, tx);return rval; }
drivers/infiniband/hw/hfi1/sdma.h +7 -8
@@ -680,14 +680,13 @@ static inline void sdma_txclean(struct hfi1_devdata *dd, struct sdma_txreq *tx)static inline void _sdma_close_tx (struct hfi1_devdata *dd,struct sdma_txreq *tx) { - tx->descp[tx->num_desc].qw[0 ] |= -SDMA_DESC0_LAST_DESC_FLAG ; - tx->descp[tx->num_desc].qw[1 ] |= - dd->default_desc1; +u16 last_desc = tx->num_desc -1 ; + + tx->descp[last_desc].qw[0 ] |=SDMA_DESC0_LAST_DESC_FLAG ; + tx->descp[last_desc].qw[1 ] |= dd->default_desc1;if (tx->flags &SDMA_TXREQ_F_URGENT ) - tx->descp[tx->num_desc].qw[1 ] |= - (SDMA_DESC1_HEAD_TO_HOST_FLAG | -SDMA_DESC1_INT_REQ_FLAG ); + tx->descp[last_desc].qw[1 ] |= (SDMA_DESC1_HEAD_TO_HOST_FLAG | +SDMA_DESC1_INT_REQ_FLAG ); } static inline int _sdma_txadd_daddr(
@@ -704,6 +703,7 @@ static inline int _sdma_txadd_daddr( type, addr, len);WARN_ON (len > tx->tlen); + tx->num_desc++; tx->tlen -= len;/* special cases for last */ if (!tx->tlen) {
@@ -715,7 +715,6 @@ static inline int _sdma_txadd_daddr(_sdma_close_tx (dd, tx); } } - tx->num_desc++;return rval; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 63/323 arm64: dts: renesas: ulcb-kf: Remove flow control for SCIF1
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
[ Upstream commit 1a2c4e5635177939a088d22fa35c6a7032725663 ]
The schematics are misleading, the flow control is for HSCIF1. We need SCIF1 for GNSS/GPS which does not use flow control.
--- arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm64/boot/dts/renesas/ulcb-kf.dtsi +1 -2
@@ -165,7 +165,7 @@ hscif0_pins: hscif0 { }; scif1_pins: scif1 { - groups = "scif1_data_b", "scif1_ctrl"; + groups = "scif1_data_b"; function = "scif1"; };
@@ -178,7 +178,6 @@ usb0_pins: usb0 { &scif1 { pinctrl-0 = <&scif1_pins>; pinctrl-names = "default"; - uart-has-rtscts; status = "okay"; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 64/323 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 65/323 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 66/323 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 67/323 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 68/323 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
@@ -1643,6 +1643,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 69/323 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
@@ -1032,11 +1032,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;
@@ -1046,6 +1041,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 70/323 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
@@ -1020,7 +1020,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 71/323 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
@@ -1024,6 +1024,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 72/323 hwrng: virtio - add an internal buffer
In reply to Greg Kroah-HartmanFrom: Laurent Vivier <[email protected]>
[ Upstream commit bf3175bc50a3754dc427e2f5046e17a9fafc8be7 ]
hwrng core uses two buffers that can be mixed in the virtio-rng queue.
If the buffer is provided with wait=0 it is enqueued in the virtio-rng queue but unused by the caller.
On the next call, core provides another buffer but the first one is filled instead and the new one queued. And the caller reads the data from the new one that is not updated, and the data in the first one are lost.
To avoid this mix, virtio-rng needs to use its own unique internal buffer at a cost of a data copy to the caller buffer.
Stable-dep-of: ac52578d6e8d ("hwrng: virtio - Fix race on data_avail and actual data")
--- drivers/char/hw_random/virtio-rng.c | 43 ++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 10 deletions(-)
drivers/char/hw_random/virtio-rng.c +33 -10
@@ -30,13 +30,20 @@ static DEFINE_IDA(rng_index_ida);struct virtrng_info {struct hwrng hwrng;struct virtqueue *vq; -struct completion have_data;char name[25 ]; -unsigned int data_avail;int index;bool busy;bool hwrng_register_done;bool hwrng_removed; +/* data transfer */ +struct completion have_data; +unsigned int data_avail; +/* minimal size returned by rng_buffer_size() */ +#if SMP_CACHE_BYTES <32 +u8 data[32 ]; +#else +u8 data[SMP_CACHE_BYTES ]; +#endif };static void random_recv_done (struct virtqueue *vq)
@@ -51,14 +58,14 @@ static void random_recv_done(struct virtqueue *vq) }/* The host will fill any buffer we give it with sweet, sweet randomness. */ -static void register_buffer (struct virtrng_info *vi,u8 *buf,size_t size) +static void register_buffer (struct virtrng_info *vi) {struct scatterlist sg; -sg_init_one (&sg, buf, size); +sg_init_one (&sg, vi->data,sizeof (vi->data));/* There should always be room for one buffer. */ -virtqueue_add_inbuf (vi->vq, &sg,1 , buf,GFP_KERNEL ); +virtqueue_add_inbuf (vi->vq, &sg,1 , vi->data,GFP_KERNEL );virtqueue_kick (vi->vq); }
@@ -67,6 +74,8 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait) {int ret;struct virtrng_info *vi = (struct virtrng_info *)rng->priv; +unsigned int chunk; +size_t read;if (vi->hwrng_removed)return -ENODEV ;
@@ -74,19 +83,33 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)if (!vi->busy) { vi->busy = true;reinit_completion (&vi->have_data); -register_buffer (vi, buf, size); +register_buffer (vi); }if (!wait)return 0 ; - ret =wait_for_completion_killable (&vi->have_data); -if (ret <0 ) -return ret; + read =0 ; +while (size !=0 ) { + ret =wait_for_completion_killable (&vi->have_data); +if (ret <0 ) +return ret; + + chunk = min_t(unsigned int, size, vi->data_avail); +memcpy (buf + read, vi->data, chunk); + read += chunk; + size -= chunk; + vi->data_avail =0 ; + +if (size !=0 ) { +reinit_completion (&vi->have_data); +register_buffer (vi); + } + } vi->busy = false; -return vi->data_avail; +return read; }static void virtio_cleanup (struct hwrng *rng)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 73/323 hwrng: virtio - dont wait on cleanup
In reply to Greg Kroah-HartmanFrom: Laurent Vivier <[email protected]>
[ Upstream commit 2bb31abdbe55742c89f4dc0cc26fcbc8467364f6 ]
When virtio-rng device was dropped by the hwrng core we were forced to wait the buffer to come back from the device to not have remaining ongoing operation that could spoil the buffer.
But now, as the buffer is internal to the virtio-rng we can release the waiting loop immediately, the buffer will be retrieve and use when the virtio-rng driver will be selected again.
This avoids to hang on an rng_current write command if the virtio-rng device is blocked by a lack of entropy. This allows to select another entropy source if the current one is empty.
Stable-dep-of: ac52578d6e8d ("hwrng: virtio - Fix race on data_avail and actual data")
--- drivers/char/hw_random/virtio-rng.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/char/hw_random/virtio-rng.c +6 -1
@@ -94,6 +94,11 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait) ret =wait_for_completion_killable (&vi->have_data);if (ret <0 )return ret; +/* if vi->data_avail is 0, we have been interrupted +* by a cleanup, but buffer stays in the queue +*/ +if (vi->data_avail ==0 ) +return read; chunk = min_t(unsigned int, size, vi->data_avail);memcpy (buf + read, vi->data, chunk);
@@ -117,7 +122,7 @@ static void virtio_cleanup(struct hwrng *rng)struct virtrng_info *vi = (struct virtrng_info *)rng->priv;if (vi->busy) -wait_for_completion (&vi->have_data); +complete (&vi->have_data); }static int probe_common (struct virtio_device *vdev)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 74/323 hwrng: virtio - dont waste entropy
In reply to Greg Kroah-HartmanFrom: Laurent Vivier <[email protected]>
[ Upstream commit 5c8e933050044d6dd2a000f9a5756ae73cbe7c44 ]
if we don't use all the entropy available in the buffer, keep it and use it later.
Stable-dep-of: ac52578d6e8d ("hwrng: virtio - Fix race on data_avail and actual data")
--- drivers/char/hw_random/virtio-rng.c | 52 +++++++++++++++++++---------- 1 file changed, 35 insertions(+), 17 deletions(-)
drivers/char/hw_random/virtio-rng.c +35 -17
@@ -38,6 +38,7 @@ struct virtrng_info {/* data transfer */ struct completion have_data;unsigned int data_avail; +unsigned int data_idx;/* minimal size returned by rng_buffer_size() */ #if SMP_CACHE_BYTES <32 u8 data[32 ];
@@ -54,6 +55,9 @@ static void random_recv_done(struct virtqueue *vq)if (!virtqueue_get_buf (vi->vq, &vi->data_avail))return ; + vi->data_idx =0 ; + vi->busy = false; +complete (&vi->have_data); }
@@ -70,6 +74,16 @@ static void register_buffer(struct virtrng_info *vi)virtqueue_kick (vi->vq); } +static unsigned int copy_data (struct virtrng_info *vi,void *buf, +unsigned int size) +{ + size = min_t(unsigned int, size, vi->data_avail); +memcpy (buf, vi->data + vi->data_idx, size); + vi->data_idx += size; + vi->data_avail -= size; +return size; +} +static int virtio_read (struct hwrng *rng,void *buf,size_t size,bool wait) {int ret;
@@ -80,17 +94,29 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)if (vi->hwrng_removed)return -ENODEV ; -if (!vi->busy) { - vi->busy = true; -reinit_completion (&vi->have_data); -register_buffer (vi); + read =0 ; + +/* copy available data */ +if (vi->data_avail) { + chunk =copy_data (vi, buf, size); + size -= chunk; + read += chunk; }if (!wait) -return 0 ; +return read; - read =0 ; +/* We have already copied available entropy, +* so either size is 0 or data_avail is 0 +*/ while (size !=0 ) { +/* data_avail is 0 */ +if (!vi->busy) { +/* no pending request, ask for more */ + vi->busy = true; +reinit_completion (&vi->have_data); +register_buffer (vi); + } ret =wait_for_completion_killable (&vi->have_data);if (ret <0 )return ret;
@@ -100,20 +126,11 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)if (vi->data_avail ==0 )return read; - chunk = min_t(unsigned int, size, vi->data_avail); -memcpy (buf + read, vi->data, chunk); - read += chunk; + chunk =copy_data (vi, buf + read, size); size -= chunk; - vi->data_avail =0 ; - -if (size !=0 ) { -reinit_completion (&vi->have_data); -register_buffer (vi); - } + read += chunk; } - vi->busy = false; -return read; }
@@ -173,6 +190,7 @@ static void remove_common(struct virtio_device *vdev) vi->hwrng_removed = true; vi->data_avail =0 ; + vi->data_idx =0 ;complete (&vi->have_data); vdev->config->reset (vdev); vi->busy = false;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 75/323 hwrng: virtio - always add a pending request
In reply to Greg Kroah-HartmanFrom: Laurent Vivier <[email protected]>
[ Upstream commit 9a4b612d675b03f7fc9fa1957ca399c8223f3954 ]
If we ensure we have already some data available by enqueuing again the buffer once data are exhausted, we can return what we have without waiting for the device answer.
Stable-dep-of: ac52578d6e8d ("hwrng: virtio - Fix race on data_avail and actual data")
--- drivers/char/hw_random/virtio-rng.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-)
drivers/char/hw_random/virtio-rng.c +12 -14
@@ -32,7 +32,6 @@ struct virtrng_info {struct virtqueue *vq;char name[25 ];int index; -bool busy;bool hwrng_register_done;bool hwrng_removed;/* data transfer */
@@ -56,16 +55,18 @@ static void random_recv_done(struct virtqueue *vq)return ; vi->data_idx =0 ; - vi->busy = false;complete (&vi->have_data); } -/* The host will fill any buffer we give it with sweet, sweet randomness. */ -static void register_buffer (struct virtrng_info *vi) +static void request_entropy (struct virtrng_info *vi) {struct scatterlist sg; +reinit_completion (&vi->have_data); + vi->data_avail =0 ; + vi->data_idx =0 ; +sg_init_one (&sg, vi->data,sizeof (vi->data));/* There should always be room for one buffer. */
@@ -81,6 +82,8 @@ static unsigned int copy_data(struct virtrng_info *vi, void *buf,memcpy (buf, vi->data + vi->data_idx, size); vi->data_idx += size; vi->data_avail -= size; +if (vi->data_avail ==0 ) +request_entropy (vi);return size; }
@@ -110,13 +113,7 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)* so either size is 0 or data_avail is 0 */ while (size !=0 ) { -/* data_avail is 0 */ -if (!vi->busy) { -/* no pending request, ask for more */ - vi->busy = true; -reinit_completion (&vi->have_data); -register_buffer (vi); - } +/* data_avail is 0 but a request is pending */ ret =wait_for_completion_killable (&vi->have_data);if (ret <0 )return ret;
@@ -138,8 +135,7 @@ static void virtio_cleanup(struct hwrng *rng) {struct virtrng_info *vi = (struct virtrng_info *)rng->priv; -if (vi->busy) -complete (&vi->have_data); +complete (&vi->have_data); }static int probe_common (struct virtio_device *vdev)
@@ -175,6 +171,9 @@ static int probe_common(struct virtio_device *vdev) goto err_find; } +/* we always have a pending entropy request */ +request_entropy (vi); +return 0 ; err_find:
@@ -193,7 +192,6 @@ static void remove_common(struct virtio_device *vdev) vi->data_idx =0 ;complete (&vi->have_data); vdev->config->reset (vdev); - vi->busy = false;if (vi->hwrng_register_done)hwrng_unregister (&vi->hwrng); vdev->config->del_vqs (vdev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 76/323 hwrng: virtio - Fix race on data_avail and actual data
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
[ Upstream commit ac52578d6e8d300dd50f790f29a24169b1edd26c ]
The virtio rng device kicks off a new entropy request whenever the data available reaches zero. When a new request occurs at the end of a read operation, that is, when the result of that request is only needed by the next reader, then there is a race between the writing of the new data and the next reader.
This is because there is no synchronisation whatsoever between the writer and the reader.
Fix this by writing data_avail with smp_store_release and reading it with smp_load_acquire when we first enter read. The subsequent reads are safe because they're either protected by the first load acquire, or by the completion mechanism.
Also remove the redundant zeroing of data_idx in random_recv_done (data_idx must already be zero at this point) and data_avail in request_entropy (ditto).
--- drivers/char/hw_random/virtio-rng.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/char/hw_random/virtio-rng.c +5 -5
@@ -17,6 +17,7 @@* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <asm/barrier.h> #include <linux/err.h> #include <linux/hw_random.h> #include <linux/scatterlist.h>
@@ -49,13 +50,13 @@ struct virtrng_info {static void random_recv_done (struct virtqueue *vq) {struct virtrng_info *vi = vq->vdev->priv; +unsigned int len;/* We can get spurious callbacks, e.g. shared IRQs + virtio_pci. */ -if (!virtqueue_get_buf (vi->vq, &vi->data_avail)) +if (!virtqueue_get_buf (vi->vq, &len))return ; - vi->data_idx =0 ; - +smp_store_release (&vi->data_avail, len);complete (&vi->have_data); }
@@ -64,7 +65,6 @@ static void request_entropy(struct virtrng_info *vi)struct scatterlist sg;reinit_completion (&vi->have_data); - vi->data_avail =0 ; vi->data_idx =0 ;sg_init_one (&sg, vi->data,sizeof (vi->data));
@@ -100,7 +100,7 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait) read =0 ;/* copy available data */ -if (vi->data_avail) { +if (smp_load_acquire (&vi->data_avail)) { chunk =copy_data (vi, buf, size); size -= chunk; read += chunk;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 77/323 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 78/323 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
@@ -1260,6 +1260,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)
@@ -1750,12 +1754,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 79/323 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
@@ -1751,12 +1751,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 :
@@ -1766,6 +1774,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 80/323 ARCv2: entry: comments about hardware auto-save on taken interrupts
In reply to Greg Kroah-HartmanFrom: Vineet Gupta <[email protected]>
[ Upstream commit 45869eb0c0afd72bd5ab2437d4b00915697c044a ]
Stable-dep-of: 92e2921eeafd ("ARC: define ASM_NL and __ALIGN(_STR) outside #ifdef __ASSEMBLY__ guard")
--- arch/arc/include/asm/entry-arcv2.h | 78 ++++++++++++++++++++++++------ 1 file changed, 62 insertions(+), 16 deletions(-)
arch/arc/include/asm/entry-arcv2.h +62 -16
@@ -7,15 +7,54 @@#include <asm/irqflags-arcv2.h> #include <asm/thread_info.h> /* For THREAD_SIZE */ +/* +* Interrupt/Exception stack layout (pt_regs) for ARCv2 +* (End of struct aligned to end of page [unless nested]) +* +* INTERRUPT EXCEPTION +* +* manual --------------------- manual +* | orig_r0 | +* | event/ECR | +* | bta | +* | user_r25 | +* | gp | +* | fp | +* | sp | +* | r12 | +* | r30 | +* | r58 | +* | r59 | +* hw autosave --------------------- +* optional | r0 | +* | r1 | +* ~ ~ +* | r9 | +* | r10 | +* | r11 | +* | blink | +* | lpe | +* | lps | +* | lpc | +* | ei base | +* | ldi base | +* | jli base | +* --------------------- +* hw autosave | pc / eret | +* mandatory | stat32 / erstatus | +* --------------------- +*/ +/*------------------------------------------------------------------------*/ .macro INTERRUPT_PROLOGUE called_from - - ; Before jumping to Interrupt Vector, hardware micro-ops did following: + ; (A) Before jumping to Interrupt Vector, hardware micro-ops did following: ; 1. SP auto-switched to kernel mode stack - ; 2. STATUS32.Z flag set to U mode at time of interrupt (U:1, K:0) - ; 3. Auto saved: r0-r11, blink, LPE,LPS,LPC, JLI,LDI,EI, PC, STAT32 + ; 2. STATUS32.Z flag set if in U mode at time of interrupt (U:1,K:0) + ; 3. Auto save: (mandatory) Push PC and STAT32 on stack + ; hardware does even if CONFIG_ARC_IRQ_NO_AUTOSAVE + ; 4. Auto save: (optional) r0-r11, blink, LPE,LPS,LPC, JLI,LDI,EI ; - ; Now manually save: r12, sp, fp, gp, r25 + ; (B) Manually saved some regs: r12,r25,r30, sp,fp,gp, ACCL pair #ifdef CONFIG_ARC_IRQ_NO_AUTOSAVE .ifnc \called_from, exception
@@ -57,14 +96,17 @@ ; - U mode: retrieve it from AUX_USER_SP ; - K mode: add the offset from current SP where H/w starts auto push ; - ; Utilize the fact that Z bit is set if Intr taken in U mode + ; 1. Utilize the fact that Z bit is set if Intr taken in U mode + ; 2. Upon entry SP is always saved (for any inspection, unwinding etc), + ; but on return, restored only if U mode + mov.nz r9, sp - add.nz r9, r9, SZ_PT_REGS - PT_sp - 4 + add.nz r9, r9, SZ_PT_REGS - PT_sp - 4 ; K mode SP bnz 1f - lr r9, [AUX_USER_SP] + lr r9, [AUX_USER_SP] ; U mode SP 1: - PUSH r9 ; SP + PUSH r9 ; SP (pt_regs->sp) PUSH fp PUSH gp
@@ -85,6 +127,8 @@/*------------------------------------------------------------------------*/ .macro INTERRUPT_EPILOGUE called_from + ; INPUT: r0 has STAT32 of calling context + ; INPUT: Z flag set if returning to K mode .ifnc \called_from, exception add sp, sp, 12 ; skip BTA/ECR/orig_r0 placeholderss .endif
@@ -98,9 +142,10 @@ POP gpPOP fp - ; Don't touch AUX_USER_SP if returning to K mode (Z bit set) - ; (Z bit set on K mode is inverse of INTERRUPT_PROLOGUE) - add.z sp, sp, 4 + ; Restore SP (into AUX_USER_SP) only if returning to U mode + ; - for K mode, it will be implicitly restored as stack is unwound + ; - Z flag set on K is inverse of what hardware does on interrupt entry + ; but that doesn't really matter bz 1fPOPAX AUX_USER_SP
@@ -145,11 +190,11 @@/*------------------------------------------------------------------------*/ .macro EXCEPTION_PROLOGUE - ; Before jumping to Exception Vector, hardware micro-ops did following: + ; (A) Before jumping to Exception Vector, hardware micro-ops did following: ; 1. SP auto-switched to kernel mode stack - ; 2. STATUS32.Z flag set to U mode at time of interrupt (U:1,K:0) + ; 2. STATUS32.Z flag set if in U mode at time of exception (U:1,K:0) ; - ; Now manually save the complete reg file + ; (B) Manually save the complete reg file below PUSH r9 ; freeup a register: slot of erstatus
@@ -195,12 +240,13 @@ PUSHAX ecr ; r9 contains ECR, expected by EV_Trap PUSH r0 ; orig_r0 + ; OUTPUT: r9 has ECR .endm/*------------------------------------------------------------------------*/ .macro EXCEPTION_EPILOGUE - ; Assumes r0 has PT_status32 + ; INPUT: r0 has STAT32 of calling context btst r0, STATUS_U_BIT ; Z flag set if K, used in INTERRUPT_EPILOGUE add sp, sp, 8 ; orig_r0/ECR don't need restoring
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 81/323 ARCv2: entry: push out the Z flag unclobber from common EXCEPTION_PROLOGUE
In reply to Greg Kroah-HartmanFrom: Vineet Gupta <[email protected]>
[ Upstream commit 23c0cbd0c75c3b564850294427fd2be2bc2a015b ]
Upon a taken interrupt/exception from User mode, HS hardware auto sets Z flag. This helps shave a few instructions from EXCEPTION_PROLOGUE by eliding re-reading ERSTATUS and some bit fiddling.
However TLB Miss Exception handler can clobber the CPU flags and still end up in EXCEPTION_PROLOGUE in the slow path handling TLB handling case:
EV_TLBMissD
do_slow_path_pf
EV_TLBProtV (aliased to call_do_page_fault)
EXCEPTION_PROLOGUE
As a result, EXCEPTION_PROLOGUE need to "unclobber" the Z flag which this patch changes. It is now pushed out to TLB Miss Exception handler. The reasons beings:
- The flag restoration is only needed for slowpath TLB Miss Exception handling, but currently being in EXCEPTION_PROLOGUE penalizes all exceptions such as ProtV and syscall Trap, where Z flag is already as expected.
- Pushing unclobber out to where it was clobbered is much cleaner and also serves to document the fact.
- Makes EXCEPTION_PROLGUE similar to INTERRUPT_PROLOGUE so easier to refactor the common parts which is what this series aims to do
Stable-dep-of: 92e2921eeafd ("ARC: define ASM_NL and __ALIGN(_STR) outside #ifdef __ASSEMBLY__ guard")
--- arch/arc/include/asm/entry-arcv2.h | 8 -------- arch/arc/mm/tlbex.S | 11 +++++++++++ 2 files changed, 11 insertions(+), 8 deletions(-)
arch/arc/include/asm/entry-arcv2.h +0 -8
@@ -225,14 +225,6 @@ ; -- for interrupts, regs above are auto-saved by h/w in that order -- ; Now do what ISR prologue does (manually save r12, sp, fp, gp, r25) - ; - ; Set Z flag if this was from U mode (expected by INTERRUPT_PROLOGUE) - ; Although H/w exception micro-ops do set Z flag for U mode (just like - ; for interrupts), it could get clobbered in case we soft land here from - ; a TLB Miss exception handler (tlbex.S) - -and r10, r10,STATUS_U_MASK - xor.f 0, r10, STATUS_U_MASK INTERRUPT_PROLOGUE exception
arch/arc/mm/tlbex.S +11 -0
@@ -396,6 +396,17 @@ EV_TLBMissD_fast_ret: ; additional label for VDK OS-kit instrumentation ;-------- Common routine to call Linux Page Fault Handler ----------- do_slow_path_pf: +#ifdef CONFIG_ISA_ARCV2 + ; Set Z flag if exception in U mode. Hardware micro-ops do this on any + ; taken interrupt/exception, and thus is already the case at the entry + ; above, but ensuing code would have already clobbered. + ; EXCEPTION_PROLOGUE called in slow path, relies on correct Z flag set + + lr r2, [erstatus] + and r2, r2, STATUS_U_MASK + bxor.f 0, r2, STATUS_U_BIT +#endif + ; Restore the 4-scratch regs saved by fast path miss handler TLBMISS_RESTORE_REGS
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 82/323 ARCv2: entry: avoid a branch
In reply to Greg Kroah-HartmanFrom: Vineet Gupta <[email protected]>
[ Upstream commit ab854bfcd310b5872fe12eb8d3f2c30fe427f8f7 ]
Stable-dep-of: 92e2921eeafd ("ARC: define ASM_NL and __ALIGN(_STR) outside #ifdef __ASSEMBLY__ guard")
--- arch/arc/include/asm/entry-arcv2.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/arc/include/asm/entry-arcv2.h +2 -3
@@ -100,12 +100,11 @@ ; 2. Upon entry SP is always saved (for any inspection, unwinding etc), ; but on return, restored only if U mode + lr r9, [AUX_USER_SP] ; U mode SP + mov.nz r9, sp add.nz r9, r9, SZ_PT_REGS - PT_sp - 4 ; K mode SP - bnz 1f - lr r9, [AUX_USER_SP] ; U mode SP -1: PUSH r9 ; SP (pt_regs->sp)PUSH fp
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 83/323 ARCv2: entry: rewrite to enable use of double load/stores LDD/STD
In reply to Greg Kroah-HartmanFrom: Vineet Gupta <[email protected]>
[ Upstream commit a4880801a72ecc2dcdfa432f81a754f3e7438567 ]
- the motivation was to be remove blatent copy-paste due to hasty support of CONFIG_ARC_IRQ_NO_AUTOSAVE support
- but with refactoring we could use LDD/STD to greatly optimize the code
Stable-dep-of: 92e2921eeafd ("ARC: define ASM_NL and __ALIGN(_STR) outside #ifdef __ASSEMBLY__ guard")
--- arch/arc/include/asm/entry-arcv2.h | 297 ++++++++++++++--------------- arch/arc/include/asm/linkage.h | 18 ++ arch/arc/kernel/asm-offsets.c | 7 + arch/arc/kernel/entry-arcv2.S | 4 +- 4 files changed, 167 insertions(+), 159 deletions(-)
arch/arc/include/asm/entry-arcv2.h +140 -157
@@ -46,7 +46,8 @@*/ /*------------------------------------------------------------------------*/ -.macro INTERRUPT_PROLOGUE called_from +.macro INTERRUPT_PROLOGUE + ; (A) Before jumping to Interrupt Vector, hardware micro-ops did following: ; 1. SP auto-switched to kernel mode stack ; 2. STATUS32.Z flag set if in U mode at time of interrupt (U:1,K:0)
@@ -57,39 +58,87 @@ ; (B) Manually saved some regs: r12,r25,r30, sp,fp,gp, ACCL pair #ifdef CONFIG_ARC_IRQ_NO_AUTOSAVE -.ifnc \called_from, exception - st.as r9, [sp, -10] ; save r9 in it's final stack slot - sub sp, sp, 12 ; skip JLI, LDI, EI - - PUSH lp_count - PUSHAX lp_start - PUSHAX lp_end - PUSH blink - - PUSH r11 - PUSH r10 - - sub sp, sp, 4 ; skip r9 - - PUSH r8 - PUSH r7 - PUSH r6 - PUSH r5 - PUSH r4 - PUSH r3 - PUSH r2 - PUSH r1 - PUSH r0 -.endif -#endif + ; carve pt_regs on stack (case #3), PC/STAT32 already on stack + sub sp, sp, SZ_PT_REGS - 8 -#ifdef CONFIG_ARC_HAS_ACCL_REGS - PUSH r59 - PUSH r58 + __SAVE_REGFILE_HARD +#else + ; carve pt_regs on stack (case #4), which grew partially already + sub sp, sp, PT_r0 #endif - PUSH r30 - PUSH r12 + __SAVE_REGFILE_SOFT +.endm + +/*------------------------------------------------------------------------*/ +.macro EXCEPTION_PROLOGUE + + ; (A) Before jumping to Exception Vector, hardware micro-ops did following: + ; 1. SP auto-switched to kernel mode stack + ; 2. STATUS32.Z flag set if in U mode at time of exception (U:1,K:0) + ; + ; (B) Manually save the complete reg file below + +sub sp, sp,SZ_PT_REGS ;carve pt_regs + + ; _HARD saves r10 clobbered by _SOFT as scratch hence comes first + + __SAVE_REGFILE_HARD +__SAVE_REGFILE_SOFT + + st r0, [sp] ; orig_r0 + + lr r10, [eret] + lr r11, [erstatus] + ST2 r10, r11, PT_ret + + lr r10, [ecr] + lr r11, [erbta] + ST2 r10, r11, PT_event + mov r9, r10 + + ; OUTPUT: r9 has ECR +.endm + +/*------------------------------------------------------------------------ +* This macro saves the registers manually which would normally be autosaved +* by hardware on taken interrupts. It is used by +* - exception handlers (which don't have autosave) +* - interrupt autosave disabled due to CONFIG_ARC_IRQ_NO_AUTOSAVE +*/ +.macro __SAVE_REGFILE_HARD + + ST2 r0, r1, PT_r0 + ST2 r2, r3, PT_r2 + ST2 r4, r5, PT_r4 + ST2 r6, r7, PT_r6 + ST2 r8, r9, PT_r8 + ST2 r10, r11, PT_r10 + + st blink, [sp, PT_blink] + + lr r10, [lp_end] + lr r11, [lp_start] + ST2 r10, r11, PT_lpe + + st lp_count, [sp, PT_lpc] + + ; skip JLI, LDI, EI for now +.endm + +/*------------------------------------------------------------------------ +* This macros saves a bunch of other registers which can't be autosaved for +* various reasons: +* - r12: the last caller saved scratch reg since hardware saves in pairs so r0-r11 +* - r30: free reg, used by gcc as scratch +* - ACCL/ACCH pair when they exist +*/ +.macro __SAVE_REGFILE_SOFT + + ST2 gp, fp, PT_r26 ; gp (r26), fp (r27) + + st r12, [sp, PT_sp + 4] + st r30, [sp, PT_sp + 8] ; Saving pt_regs->sp correctly requires some extra work due to the way ; Auto stack switch works
@@ -100,46 +149,32 @@ ; 2. Upon entry SP is always saved (for any inspection, unwinding etc), ; but on return, restored only if U mode - lr r9, [AUX_USER_SP] ; U mode SP + lr r10, [AUX_USER_SP] ; U mode SP - mov.nz r9, sp - add.nz r9, r9, SZ_PT_REGS - PT_sp - 4 ; K mode SP + ; ISA requires ADD.nz to have same dest and src reg operands + mov.nz r10, sp + add.nz r10, r10, SZ_PT_REGS ; K mode SP - PUSH r9 ; SP (pt_regs->sp) - - PUSH fp - PUSH gp + st r10, [sp, PT_sp] ; SP (pt_regs->sp)#ifdef CONFIG_ARC_CURR_IN_REG - PUSH r25 ; user_r25 + st r25, [sp, PT_user_r25] GET_CURR_TASK_ON_CPU r25 -#else - sub sp, sp, 4 #endif -.ifnc \called_from, exception - sub sp, sp, 12 ; BTA/ECR/orig_r0 placeholder per pt_regs -.endif +#ifdef CONFIG_ARC_HAS_ACCL_REGS + ST2 r58, r59, PT_sp + 12 +#endif .endm /*------------------------------------------------------------------------*/ -.macro INTERRUPT_EPILOGUE called_from +.macro __RESTORE_REGFILE_SOFT - ; INPUT: r0 has STAT32 of calling context - ; INPUT: Z flag set if returning to K mode -.ifnc \called_from, exception - add sp, sp, 12 ; skip BTA/ECR/orig_r0 placeholderss -.endif - -#ifdef CONFIG_ARC_CURR_IN_REG - POP r25 -#else - add sp, sp, 4 -#endif + LD2 gp, fp, PT_r26 ; gp (r26), fp (r27) - POP gp - POP fp + ld r12, [sp, PT_sp + 4] + ld r30, [sp, PT_sp + 8] ; Restore SP (into AUX_USER_SP) only if returning to U mode ; - for K mode, it will be implicitly restored as stack is unwound
@@ -147,129 +182,77 @@ ; but that doesn't really matter bz 1f - POPAX AUX_USER_SP + ld r10, [sp, PT_sp] ; SP (pt_regs->sp) + sr r10, [AUX_USER_SP] 1: - POP r12 - POP r30 -#ifdef CONFIG_ARC_HAS_ACCL_REGS - POP r58 - POP r59 +#ifdef CONFIG_ARC_CURR_IN_REG + ld r25, [sp, PT_user_r25] #endif -#ifdef CONFIG_ARC_IRQ_NO_AUTOSAVE -.ifnc \called_from, exception - POP r0 - POP r1 - POP r2 - POP r3 - POP r4 - POP r5 - POP r6 - POP r7 - POP r8 - POP r9 - POP r10 - POP r11 - - POP blink - POPAX lp_end - POPAX lp_start - - POP r9 - mov lp_count, r9 - - add sp, sp, 12 ; skip JLI, LDI, EI - ld.as r9, [sp, -10] ; reload r9 which got clobbered -.endif +#ifdef CONFIG_ARC_HAS_ACCL_REGS + LD2 r58, r59, PT_sp + 12 #endif - .endm /*------------------------------------------------------------------------*/ -.macro EXCEPTION_PROLOGUE +.macro __RESTORE_REGFILE_HARD - ; (A) Before jumping to Exception Vector, hardware micro-ops did following: - ; 1. SP auto-switched to kernel mode stack - ; 2. STATUS32.Z flag set if in U mode at time of exception (U:1,K:0) - ; - ; (B) Manually save the complete reg file below + ld blink, [sp, PT_blink] - PUSH r9 ; freeup a register: slot of erstatus + LD2 r10, r11, PT_lpe + sr r10, [lp_end] + sr r11, [lp_start] - PUSHAX eret - sub sp, sp, 12 ; skip JLI, LDI, EI - PUSH lp_count - PUSHAX lp_start - PUSHAX lp_end - PUSH blink + ld r10, [sp, PT_lpc] ; lp_count can't be target of LD + mov lp_count, r10 - PUSH r11 - PUSH r10 + LD2 r0, r1, PT_r0 + LD2 r2, r3, PT_r2 + LD2 r4, r5, PT_r4 + LD2 r6, r7, PT_r6 + LD2 r8, r9, PT_r8 + LD2 r10, r11, PT_r10 +.endm - ld.as r9, [sp, 10] ; load stashed r9 (status32 stack slot) - lr r10, [erstatus] - st.as r10, [sp, 10] ; save status32 at it's right stack slot - PUSH r9 - PUSH r8 - PUSH r7 - PUSH r6 - PUSH r5 - PUSH r4 - PUSH r3 - PUSH r2 - PUSH r1 - PUSH r0 +/*------------------------------------------------------------------------*/ +.macro INTERRUPT_EPILOGUE - ; -- for interrupts, regs above are auto-saved by h/w in that order -- - ; Now do what ISR prologue does (manually save r12, sp, fp, gp, r25) + ; INPUT: r0 has STAT32 of calling context + ; INPUT: Z flag set if returning to K mode - INTERRUPT_PROLOGUE exception + ; _SOFT clobbers r10 restored by _HARD hence the order - PUSHAX erbta - PUSHAX ecr ; r9 contains ECR, expected by EV_Trap + __RESTORE_REGFILE_SOFT + +#ifdef CONFIG_ARC_IRQ_NO_AUTOSAVE + __RESTORE_REGFILE_HARD + add sp, sp, SZ_PT_REGS - 8 +#else + add sp, sp, PT_r0 +#endif - PUSH r0 ; orig_r0 - ; OUTPUT: r9 has ECR .endm /*------------------------------------------------------------------------*/ .macro EXCEPTION_EPILOGUE ; INPUT: r0 has STAT32 of calling context - btst r0, STATUS_U_BIT ; Z flag set if K, used in INTERRUPT_EPILOGUE - - add sp, sp, 8 ; orig_r0/ECR don't need restoring - POPAX erbta - - INTERRUPT_EPILOGUE exception - - POP r0 - POP r1 - POP r2 - POP r3 - POP r4 - POP r5 - POP r6 - POP r7 - POP r8 - POP r9 - POP r10 - POP r11 - - POP blink - POPAX lp_end - POPAX lp_start - - POP r9 - mov lp_count, r9 - - add sp, sp, 12 ; skip JLI, LDI, EI - POPAX eret - POPAX erstatus - - ld.as r9, [sp, -12] ; reload r9 which got clobbered + + btst r0, STATUS_U_BIT ; Z flag set if K, used in restoring SP + + ld r10, [sp, PT_event + 4] + sr r10, [erbta] + + LD2 r10, r11, PT_ret + sr r10, [eret] + sr r11, [erstatus] + + __RESTORE_REGFILE_SOFT + __RESTORE_REGFILE_HARD + + add sp, sp, SZ_PT_REGS .endm .macro FAKE_RET_FROM_EXCPN
arch/arc/include/asm/linkage.h +18 -0
@@ -13,6 +13,24 @@#ifdef __ASSEMBLY__ +.macro ST2 e, o, off +#ifdef CONFIG_ARC_HAS_LL64 + std \e, [sp, \off] +#else + st \e, [sp, \off] + st \o, [sp, \off+4] +#endif +.endm + +.macro LD2 e, o, off +#ifdef CONFIG_ARC_HAS_LL64 + ldd \e, [sp, \off] +#else + ld \e, [sp, \off] + ld \o, [sp, \off+4] +#endif +.endm + #define ASM_NL ` /* use '`' to mark new line in macro */ #define __ALIGN .align 4 #define __ALIGN_STR __stringify(__ALIGN)
arch/arc/kernel/asm-offsets.c +7 -0
@@ -58,7 +58,14 @@ int main(void)DEFINE (PT_r5, offsetof(struct pt_regs , r5));DEFINE (PT_r6, offsetof(struct pt_regs , r6));DEFINE (PT_r7, offsetof(struct pt_regs , r7)); +DEFINE (PT_r8, offsetof(struct pt_regs , r8)); +DEFINE (PT_r10, offsetof(struct pt_regs , r10)); +DEFINE (PT_r26, offsetof(struct pt_regs , r26));DEFINE (PT_ret, offsetof(struct pt_regs , ret)); +DEFINE (PT_blink, offsetof(struct pt_regs , blink)); +DEFINE (PT_lpe, offsetof(struct pt_regs , lp_end)); +DEFINE (PT_lpc, offsetof(struct pt_regs , lp_count)); +DEFINE (PT_user_r25, offsetof(struct pt_regs , user_r25));DEFINE (SZ_CALLEE_REGS ,sizeof (struct callee_regs ));DEFINE (SZ_PT_REGS ,sizeof (struct pt_regs ));
arch/arc/kernel/entry-arcv2.S +2 -2
@@ -70,7 +70,7 @@ reserved: ENTRY(handle_interrupt) - INTERRUPT_PROLOGUE irq + INTERRUPT_PROLOGUE # irq control APIs local_irq_save/restore/disable/enable fiddle with # global interrupt enable bits in STATUS32 (.IE for 1 prio, .E[] for 2 prio)
@@ -226,7 +226,7 @@ debug_marker_l1: bset.nz r11, r11, AUX_IRQ_ACT_BIT_U ; NZ means U sr r11, [AUX_IRQ_ACT] - INTERRUPT_EPILOGUE irq + INTERRUPT_EPILOGUE rtie ;####### Return from Exception / pure kernel mode #######
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 84/323 ARC: define ASM_NL and __ALIGN(_STR) outside #ifdef __ASSEMBLY__ guard
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit 92e2921eeafdfca9acd9b83f07d2b7ca099bac24 ]
ASM_NL is useful not only in *.S files but also in .c files for using inline assembler in C code.
On ARC, however, ASM_NL is evaluated inconsistently. It is expanded to a backquote (`) in *.S files, but a semicolon (;) in *.c files because arch/arc/include/asm/linkage.h defines it inside #ifdef __ASSEMBLY__, so the definition for C code falls back to the default value defined in include/linux/linkage.h.
If ASM_NL is used in inline assembler in .c files, it will result in wrong assembly code because a semicolon is not an instruction separator, but the start of a comment for ARC.
Move ASM_NL (also __ALIGN and __ALIGN_STR) out of the #ifdef.
--- arch/arc/include/asm/linkage.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arc/include/asm/linkage.h +4 -4
@@ -11,6 +11,10 @@#include <asm/dwarf.h> +#define ASM_NL `/* use '`' to mark new line in macro */ +#define __ALIGN .align 4 +#define __ALIGN_STR __stringify(__ALIGN) +#ifdef __ASSEMBLY__ .macro ST2 e, o, off
@@ -31,10 +35,6 @@#endif .endm -#define ASM_NL `/* use '`' to mark new line in macro */ -#define __ALIGN .align 4 -#define __ALIGN_STR __stringify(__ALIGN) - /* annotation for data we want in DCCM - if enabled in .config */ .macro ARCFP_DATA nm #ifdef CONFIG_ARC_HAS_DCCM
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 85/323 USB: serial: option: add LARA-R6 01B PIDs
In reply to Greg Kroah-HartmanFrom: Davide Tronchin <[email protected]>
commit ffa5f7a3bf28c1306eef85d4056539c2d4b8eb09 upstream.
The new LARA-R6 product variant identified by the "01B" string can be configured (by AT interface) in three different USB modes:
* Default mode (Vendor ID: 0x1546 Product ID: 0x1311) with 4 serial interfaces
* RmNet mode (Vendor ID: 0x1546 Product ID: 0x1312) with 4 serial interfaces and 1 RmNet virtual network interface
* CDC-ECM mode (Vendor ID: 0x1546 Product ID: 0x1313) with 4 serial interface and 1 CDC-ECM virtual network interface
The first 4 interfaces of all the 3 USB configurations (default, RmNet, CDC-ECM) are the same.
In default mode LARA-R6 01B exposes the following interfaces:
If 0: Diagnostic
If 1: AT parser
If 2: AT parser
If 3: AT parser/alternative functions
In RmNet mode LARA-R6 01B exposes the following interfaces:
If 0: Diagnostic
If 1: AT parser
If 2: AT parser
If 3: AT parser/alternative functions
If 4: RMNET interface
In CDC-ECM mode LARA-R6 01B exposes the following interfaces:
If 0: Diagnostic
If 1: AT parser
If 2: AT parser
If 3: AT parser/alternative functions
If 4: CDC-ECM interface
--- drivers/usb/serial/option.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/serial/option.c +4 -0
@@ -1151,6 +1151,10 @@ static const struct usb_device_id option { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x90fa), .driver_info = RSVD(3) },/* u-blox products */ + { USB_DEVICE(UBLOX_VENDOR_ID, 0x1311) }, /* u-blox LARA-R6 01B */ + { USB_DEVICE(UBLOX_VENDOR_ID, 0x1312), /* u-blox LARA-R6 01B (RMNET) */ + .driver_info = RSVD(4) }, + { USB_DEVICE_INTERFACE_CLASS(UBLOX_VENDOR_ID, 0x1313, 0xff) }, /* u-blox LARA-R6 01B (ECM) */ { USB_DEVICE(UBLOX_VENDOR_ID, 0x1341) }, /* u-blox LARA-L6 */ { USB_DEVICE(UBLOX_VENDOR_ID, 0x1342), /* u-blox LARA-L6 (RMNET) */ .driver_info = RSVD(4) },
Greg Kroah-Hartman
maintainerPATCH 86/323 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 87/323 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
@@ -1237,10 +1237,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 88/323 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 89/323 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 90/323 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
@@ -1510,7 +1510,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 91/323 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
@@ -190,7 +190,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 92/323 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 @@ static const struct __extcon_info {* @attr_name: "name" sysfs entry * @attr_state: "state" sysfs entry * @attrs: the array pointing to attr_name and attr_state for attr_g +* @usb_propval: the array of USB connector properties +* @chg_propval: the array of charger connector properties +* @jack_propval: the array of jack connector properties +* @disp_propval: the array of display connector properties */ struct extcon_cable {struct extcon_dev *edev;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 93/323 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 @@ static const struct __extcon_info {* @chg_propval: the array of charger connector properties * @jack_propval: the array of jack connector properties * @disp_propval: the array of display connector properties +* @usb_bits: the bit array of the USB connector property capabilities +* @chg_bits: the bit array of the charger connector property capabilities +* @jack_bits: the bit array of the jack connector property capabilities +* @disp_bits: the bit array of the display connector property capabilities */ struct extcon_cable {struct extcon_dev *edev;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 94/323 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
@@ -398,7 +398,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 95/323 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 96/323 KVM: s390: fix KVM_S390_GET_CMMA_BITS for GFNs in memslot holes
In reply to Greg Kroah-HartmanFrom: Nico Boehr <[email protected]>
[ Upstream commit 285cff4c0454340a4dc53f46e67f2cb1c293bd74 ]
The KVM_S390_GET_CMMA_BITS ioctl may return incorrect values when userspace specifies a start_gfn outside of memslots.
This can occur when a VM has multiple memslots with a hole in between:
+-----+----------+--------+--------+
| ... | Slot N-1 | <hole> | Slot N |
+-----+----------+--------+--------+
^ ^ ^ ^
| | | |
GFN A A+B | |
A+B+C |
A+B+C+DWhen userspace specifies a GFN in [A+B, A+B+C), it would expect to get the CMMA values of the first dirty page in Slot N. However, userspace may get a start_gfn of A+B+C+D with a count of 0, hence completely skipping over any dirty pages in slot N.
The error is in kvm_s390_next_dirty_cmma(), which assumes gfn_to_memslot_approx() will return the memslot _below_ the specified GFN when the specified GFN lies outside a memslot. In reality it may return either the memslot below or above the specified GFN.
When a memslot above the specified GFN is returned this happens:
- ofs is calculated, but since the memslot's base_gfn is larger than the specified cur_gfn, ofs will underflow to a huge number.
- ofs is passed to find_next_bit(). Since ofs will exceed the memslot's number of pages, the number of pages in the memslot is returned, completely skipping over all bits in the memslot userspace would be interested in.
Fix this by resetting ofs to zero when a memslot _above_ cur_gfn is returned (cur_gfn < ms->base_gfn).
Message-Id: <[email protected]>
--- arch/s390/kvm/kvm-s390.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/s390/kvm/kvm-s390.c +4 -0
@@ -1716,6 +1716,10 @@ static unsigned long kvm_s390_next_dirty_cmma(struct kvm_memslots *slots, ms = slots->memslots + slotidx; ofs =0 ; } + +if (cur_gfn < ms->base_gfn) + ofs =0 ; + ofs =find_next_bit (kvm_second_dirty_bitmap (ms), ms->npages, ofs);while ((slotidx >0 ) && (ofs >= ms->npages)) { slotidx--;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 97/323 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 98/323 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 99/323 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
@@ -239,7 +239,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 100/323 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
@@ -380,9 +380,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 101/323 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
@@ -235,6 +235,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 102/323 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
@@ -1255,13 +1255,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 103/323 mailbox: ti-msgmgr: Fill non-message tx data fields with 0x0
In reply to Greg Kroah-HartmanFrom: Nishanth Menon <[email protected]>
[ Upstream commit 1b712f18c461bd75f018033a15cf381e712806b5 ]
Sec proxy/message manager data buffer is 60 bytes with the last of the registers indicating transmission completion. This however poses a bit of a challenge.
The backing memory for sec_proxy / message manager is regular memory, and all sec proxy does is to trigger a burst of all 60 bytes of data over to the target thread backing ring accelerator. It doesn't do a memory scrub when it moves data out in the burst. When we transmit multiple messages, remnants of previous message is also transmitted which results in some random data being set in TISCI fields of messages that have been expanded forward.
The entire concept of backward compatibility hinges on the fact that the unused message fields remain 0x0 allowing for 0x0 value to be specially considered when backward compatibility of message extension is done.
So, instead of just writing the completion register, we continue to fill the message buffer up with 0x0 (note: for partial message involving completion, we already do this).
This allows us to scale and introduce ABI changes back also work with other boot stages that may have left data in the internal memory.
While at this, be consistent and explicit with the data_reg pointer increment.
--- drivers/mailbox/ti-msgmgr.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/mailbox/ti-msgmgr.c +9 -3
@@ -385,14 +385,20 @@ static int ti_msgmgr_send_data(struct mbox_chan *chan, void *data)/* Ensure all unused data is 0 */ data_trail &=0xFFFFFFFF >> (8 * (sizeof (u32) - trail_bytes));writel (data_trail, data_reg); - data_reg++; + data_reg +=sizeof (u32); } +/* * 'data_reg' indicates next register to write. If we did not already * write on tx complete reg(last reg), we must do so for transmit +* In addition, we also need to make sure all intermediate data +* registers(if any required), are reset to 0 for TISCI backward +* compatibility to be maintained. */ -if (data_reg <= qinst->queue_buff_end) -writel (0 , qinst->queue_buff_end); +while (data_reg <= qinst->queue_buff_end) { +writel (0 , data_reg); + data_reg +=sizeof (u32); + }return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 104/323 f2fs: fix error path handling in truncate_dnode()
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit 0135c482fa97e2fd8245cb462784112a00ed1211 ]
If truncate_node() fails in truncate_dnode(), it missed to call f2fs_put_page(), fix it.
--- fs/f2fs/node.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/f2fs/node.c +3 -1
@@ -879,8 +879,10 @@ static int truncate_dnode(struct dnode_of_data *dn) dn->ofs_in_node =0 ;f2fs_truncate_data_blocks (dn); err =truncate_node (dn); -if (err) +if (err) { +f2fs_put_page (page,1 );return err; + }return 1 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 105/323 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
@@ -232,7 +232,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 106/323 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
@@ -161,8 +161,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 107/323 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
@@ -3429,8 +3429,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 <READ_ONCE (net->ipv4.sysctl_tcp_invalid_ratelimit)) {
@@ -3439,7 +3442,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 108/323 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 109/323 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 110/323 i2c: xiic: Defer xiic_wakeup() and __xiic_start_xfer() in xiic_process()
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit 743e227a895923c37a333eb2ebf3e391f00c406d ]
The __xiic_start_xfer() manipulates the interrupt flags, xiic_wakeup() may result in return from xiic_xfer() early. Defer both to the end of the xiic_process() interrupt thread, so that they are executed after all the other interrupt bits handling completed and once it completely safe to perform changes to the interrupt bits in the hardware.
Stable-dep-of: cb6e45c9a0ad ("i2c: xiic: Don't try to handle more interrupt events after error")
--- drivers/i2c/busses/i2c-xiic.c | 37 ++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-)
drivers/i2c/busses/i2c-xiic.c +26 -11
@@ -362,6 +362,9 @@ static irqreturn_t xiic_process(int irq, void *dev_id)struct xiic_i2c *i2c = dev_id;u32 pend, isr, ier;u32 clr =0 ; +int xfer_more =0 ; +int wakeup_req =0 ; +int wakeup_code =0 ;/* Get the interrupt Status from the IPIF. There is no clearing of * interrupts in the IPIF. Interrupts must be cleared at the source.
@@ -398,10 +401,14 @@ static irqreturn_t xiic_process(int irq, void *dev_id)*/ xiic_reinit (i2c); -if (i2c->rx_msg) -xiic_wakeup (i2c,STATE_ERROR ); -if (i2c->tx_msg) -xiic_wakeup (i2c,STATE_ERROR ); +if (i2c->rx_msg) { + wakeup_req =1 ; + wakeup_code =STATE_ERROR ; + } +if (i2c->tx_msg) { + wakeup_req =1 ; + wakeup_code =STATE_ERROR ; + } }if (pend &XIIC_INTR_RX_FULL_MASK ) {/* Receive register/FIFO is full */
@@ -435,8 +442,7 @@ static irqreturn_t xiic_process(int irq, void *dev_id) i2c->tx_msg++;dev_dbg (i2c->adap.dev.parent,"%s will start next...\n" , __func__); - -__xiic_start_xfer (i2c); + xfer_more =1 ; } } }
@@ -450,11 +456,13 @@ static irqreturn_t xiic_process(int irq, void *dev_id)if (!i2c->tx_msg) goto out; -if ((i2c->nmsgs ==1 ) && !i2c->rx_msg && -xiic_tx_space (i2c) ==0 ) -xiic_wakeup (i2c,STATE_DONE ); + wakeup_req =1 ; + +if (i2c->nmsgs ==1 && !i2c->rx_msg && +xiic_tx_space (i2c) ==0 ) + wakeup_code =STATE_DONE ;else -xiic_wakeup (i2c,STATE_ERROR ); + wakeup_code =STATE_ERROR ; }if (pend & (XIIC_INTR_TX_EMPTY_MASK |XIIC_INTR_TX_HALF_MASK )) {/* Transmit register/FIFO is empty or ½ empty */
@@ -478,7 +486,7 @@ static irqreturn_t xiic_process(int irq, void *dev_id)if (i2c->nmsgs >1 ) { i2c->nmsgs--; i2c->tx_msg++; -__xiic_start_xfer (i2c); + xfer_more =1 ; }else {xiic_irq_dis (i2c,XIIC_INTR_TX_HALF_MASK );
@@ -496,6 +504,13 @@ static irqreturn_t xiic_process(int irq, void *dev_id)dev_dbg (i2c->adap.dev.parent,"%s clr: 0x%x\n" , __func__, clr);xiic_setreg32 (i2c,XIIC_IISR_OFFSET , clr); +if (xfer_more) +__xiic_start_xfer (i2c); +if (wakeup_req) +xiic_wakeup (i2c, wakeup_code); + +WARN_ON (xfer_more && wakeup_req); +mutex_unlock (&i2c->lock);return IRQ_HANDLED ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 111/323 i2c: xiic: Dont try to handle more interrupt events after error
In reply to Greg Kroah-HartmanFrom: Robert Hancock <[email protected]>
[ Upstream commit cb6e45c9a0ad9e0f8664fd06db0227d185dc76ab ]
In xiic_process, it is possible that error events such as arbitration lost or TX error can be raised in conjunction with other interrupt flags such as TX FIFO empty or bus not busy. Error events result in the controller being reset and the error returned to the calling request, but the function could potentially try to keep handling the other events, such as by writing more messages into the TX FIFO. Since the transaction has already failed, this is not helpful and will just cause issues.
This problem has been present ever since:
commit 7f9906bd7f72 ("i2c: xiic: Service all interrupts in isr")
which allowed non-error events to be handled after errors, but became more obvious after:
commit 743e227a8959 ("i2c: xiic: Defer xiic_wakeup() and __xiic_start_xfer() in xiic_process()")
which reworked the code to add a WARN_ON which triggers if both the xfer_more and wakeup_req flags were set, since this combination is not supposed to happen, but was occurring in this scenario.
Skip further interrupt handling after error flags are detected to avoid this problem.
--- drivers/i2c/busses/i2c-xiic.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/i2c/busses/i2c-xiic.c +2 -0
@@ -409,6 +409,8 @@ static irqreturn_t xiic_process(int irq, void *dev_id) wakeup_req =1 ; wakeup_code =STATE_ERROR ; } +/* don't try to handle other events */ + goto out; }if (pend &XIIC_INTR_RX_FULL_MASK ) {/* Receive register/FIFO is full */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 112/323 ALSA: jack: Fix mutex call in snd_jack_report()
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit 89dbb335cb6a627a4067bc42caa09c8bc3326d40 ]
snd_jack_report() is supposed to be callable from an IRQ context, too, and it's indeed used in that way from virtsnd driver. The fix for input_dev race in commit 1b6a6fc5280e ("ALSA: jack: Access input_dev under mutex"), however, introduced a mutex lock in snd_jack_report(), and this resulted in a potential sleep-in-atomic.
For addressing that problem, this patch changes the relevant code to use the object get/put and removes the mutex usage. That is, snd_jack_report(), it takes input_get_device() and leaves with input_put_device() for assuring the input_dev being assigned.
Although the whole mutex could be reduced, we keep it because it can be still a protection for potential races between creation and deletion.
--- sound/core/jack.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
sound/core/jack.c +7 -8
@@ -378,6 +378,7 @@ void snd_jack_report(struct snd_jack *jack, int status) {struct snd_jack_kctl *jack_kctl;#ifdef CONFIG_SND_JACK_INPUT_DEV +struct input_dev *idev;int i;#endif
@@ -389,30 +390,28 @@ void snd_jack_report(struct snd_jack *jack, int status) status & jack_kctl->mask_bits);#ifdef CONFIG_SND_JACK_INPUT_DEV -mutex_lock (&jack->input_dev_lock); -if (!jack->input_dev) { -mutex_unlock (&jack->input_dev_lock); + idev =input_get_device (jack->input_dev); +if (!idev)return ; - }for (i =0 ; i <ARRAY_SIZE (jack->key); i++) {int testbit =SND_JACK_BTN_0 >> i;if (jack->type & testbit) -input_report_key (jack->input_dev, jack->key[i], +input_report_key (idev, jack->key[i], status & testbit); }for (i =0 ; i <ARRAY_SIZE (jack_switch_types); i++) {int testbit =1 << i;if (jack->type & testbit) -input_report_switch (jack->input_dev, +input_report_switch (idev, jack_switch_types[i], status & testbit); } -input_sync (jack->input_dev); -mutex_unlock (&jack->input_dev_lock); +input_sync (idev); +input_put_device (idev);#endif /* CONFIG_SND_JACK_INPUT_DEV */ }EXPORT_SYMBOL (snd_jack_report);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 113/323 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
@@ -3403,7 +3403,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 114/323 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 115/323 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 116/323 bcache: Remove unnecessary NULL point check in node allocations
In reply to Greg Kroah-HartmanFrom: Zheng Wang <[email protected]>
commit 028ddcac477b691dd9205c92f991cc15259d033e upstream.
Due to the previous fix of __bch_btree_node_alloc, the return value will never be a NULL pointer. So IS_ERR is enough to handle the failure situation. Fix it by replacing IS_ERR_OR_NULL check by an IS_ERR check.
--- drivers/md/bcache/btree.c | 10 +++++----- drivers/md/bcache/super.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/md/bcache/btree.c +5 -5
@@ -1174,7 +1174,7 @@ static struct btree *btree_node_alloc_re {struct btree *n =bch_btree_node_alloc (b->c, op, b->level, b->parent); -if (!IS_ERR_OR_NULL (n)) { +if (!IS_ERR (n)) {mutex_lock (&n->write_lock);bch_btree_sort_into (&b->keys, &n->keys, &b->c->sort);bkey_copy_key (&n->key, &b->key);
@@ -1377,7 +1377,7 @@ static int btree_gc_coalesce(struct btrememset (new_nodes,0 ,sizeof (new_nodes));closure_init_stack (&cl); -while (nodes <GC_MERGE_NODES && !IS_ERR_OR_NULL (r[nodes].b)) +while (nodes <GC_MERGE_NODES && !IS_ERR (r[nodes].b)) keys += r[nodes++].keys; blocks =btree_default_blocks (b->c) *2 /3 ;
@@ -1389,7 +1389,7 @@ static int btree_gc_coalesce(struct btrefor (i =0 ; i < nodes; i++) { new_nodes[i] =btree_node_alloc_replacement (r[i].b,NULL ); -if (IS_ERR_OR_NULL (new_nodes[i])) +if (IS_ERR (new_nodes[i])) goto out_nocoalesce; }
@@ -1524,7 +1524,7 @@ out_nocoalesce:atomic_dec (&b->c->prio_blocked);for (i =0 ; i < nodes; i++) -if (!IS_ERR_OR_NULL (new_nodes[i])) { +if (!IS_ERR (new_nodes[i])) {btree_node_free (new_nodes[i]);rw_unlock (true, new_nodes[i]); }
@@ -1706,7 +1706,7 @@ static int bch_btree_gc_root(struct btreif (should_rewrite) { n =btree_node_alloc_replacement (b,NULL ); -if (!IS_ERR_OR_NULL (n)) { +if (!IS_ERR (n)) {bch_btree_node_write_sync (n);bch_btree_set_root (n);
drivers/md/bcache/super.c +2 -2
@@ -1576,7 +1576,7 @@ static void cache_set_flush(struct closuif (!IS_ERR_OR_NULL (c->gc_thread))kthread_stop (c->gc_thread); -if (!IS_ERR_OR_NULL (c->root)) +if (!IS_ERR (c->root))list_add (&c->root->list, &c->btree_cache);/* Should skip this if we're unregistering because of an error */
@@ -1921,7 +1921,7 @@ static int run_cache_set(struct cache_se err ="cannot allocate new btree root" ; c->root =__bch_btree_node_alloc (c,NULL ,0 , true,NULL ); -if (IS_ERR_OR_NULL (c->root)) +if (IS_ERR (c->root)) goto err;mutex_lock (&c->root->write_lock);
Greg Kroah-Hartman
maintainerPATCH 117/323 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
@@ -46,12 +46,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 ; }/*
@@ -116,10 +114,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 118/323 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 119/323 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
@@ -1115,7 +1115,9 @@ int btrfs_quota_disable(struct btrfs_fs_ goto end_trans; } +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 120/323 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 ****************************************************************************/