Linux 7.0.1
Greg Kroah-Hartman
maintainerI'm announcing the release of the 7.0.1 kernel.
All users of the 7.0 kernel series must upgrade.
The updated 7.0.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-7.0.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/admin-guide/mm/damon/lru_sort.rst | 4 Documentation/admin-guide/mm/damon/reclaim.rst | 4 Makefile | 2 arch/arm64/include/asm/pgtable-prot.h | 2 arch/arm64/include/asm/pgtable.h | 9 - arch/arm64/include/asm/uaccess.h | 2 arch/arm64/mm/mmu.c | 4 arch/arm64/mm/pageattr.c | 50 +++--- arch/arm64/mm/trans_pgd.c | 42 ----- arch/powerpc/include/asm/uaccess.h | 3 arch/powerpc/lib/pmem.c | 11 - arch/x86/include/asm/msr-index.h | 3 arch/x86/include/asm/uaccess.h | 2 arch/x86/include/asm/uaccess_32.h | 8 arch/x86/include/asm/uaccess_64.h | 16 + arch/x86/kernel/cpu/amd.c | 3 arch/x86/kvm/svm/sev.c | 46 +++-- arch/x86/kvm/x86.c | 14 + arch/x86/lib/copy_user_uncached_64.S | 6 arch/x86/lib/usercopy_32.c | 9 - arch/x86/lib/usercopy_64.c | 12 - drivers/gpu/drm/i915/i915_gem.c | 2 drivers/gpu/drm/qxl/qxl_ioctl.c | 2 drivers/gpu/drm/vc4/vc4_hdmi.c | 14 + drivers/hid/hid-alps.c | 3 drivers/hid/hid-core.c | 3 drivers/hwmon/powerz.c | 8 drivers/i2c/busses/i2c-s3c2410.c | 7 drivers/infiniband/sw/rdmavt/qp.c | 8 drivers/md/bcache/super.c | 7 drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.c | 9 + drivers/media/test-drivers/vidtv/vidtv_bridge.c | 4 drivers/media/test-drivers/vidtv/vidtv_channel.c | 4 drivers/media/test-drivers/vidtv/vidtv_mux.c | 4 drivers/media/test-drivers/vidtv/vidtv_ts.c | 48 ++--- drivers/media/test-drivers/vidtv/vidtv_ts.h | 4 drivers/media/usb/as102/as102_usb_drv.c | 2 drivers/media/usb/em28xx/em28xx-video.c | 14 + drivers/media/usb/hackrf/hackrf.c | 7 drivers/net/ethernet/broadcom/bnge/bnge_auxr.c | 1 drivers/net/usb/cdc-phonet.c | 7 drivers/net/wireguard/device.c | 8 drivers/net/wireless/realtek/rtw88/usb.c | 3 drivers/ntb/ntb_transport.c | 7 drivers/pci/endpoint/functions/pci-epf-vntb.c | 20 -- drivers/staging/rtl8723bs/core/rtw_security.c | 2 drivers/staging/sm750fb/sm750.c | 3 drivers/usb/class/cdc-acm.c | 53 +++++- drivers/usb/core/port.c | 1 drivers/usb/gadget/function/f_hid.c | 15 + drivers/usb/gadget/function/f_ncm.c | 4 drivers/usb/gadget/function/f_phonet.c | 9 + drivers/usb/gadget/udc/renesas_usb3.c | 7 drivers/usb/serial/option.c | 2 drivers/usb/storage/unusual_devs.h | 7 drivers/usb/typec/tcpm/fusb302.c | 5 drivers/usb/usbip/usbip_common.c | 12 + drivers/vfio/pci/xe/main.c | 43 +++-- drivers/video/fbdev/tdfxfb.c | 3 drivers/video/fbdev/udlfb.c | 3 fs/dcache.c | 4 fs/nilfs2/dat.c | 3 fs/ocfs2/aops.c | 3 fs/ocfs2/mmap.c | 7 fs/ocfs2/ocfs2_trace.h | 10 - fs/ocfs2/resize.c | 10 - fs/smb/client/smb2file.c | 20 +- fs/smb/client/smb2inode.c | 2 fs/smb/client/smbdirect.c | 8 fs/smb/server/connection.c | 1 fs/smb/server/smb2pdu.c | 7 fs/smb/server/smbacl.c | 3 fs/smb/server/transport_rdma.c | 8 include/linux/hugetlb.h | 17 ++ include/linux/kvm_host.h | 10 + include/linux/uaccess.h | 11 - kernel/time/clockevents.c | 7 kernel/time/tick-broadcast.c | 1 lib/iov_iter.c | 4 mm/backing-dev.c | 5 mm/filemap.c | 3 mm/internal.h | 1 mm/kasan/init.c | 8 mm/truncate.c | 6 mm/userfaultfd.c | 2 net/can/raw.c | 11 + net/nfc/digital_technology.c | 6 net/nfc/llcp_core.c | 2 scripts/checkpatch.pl | 10 + scripts/gdb/linux/symbols.py | 2 scripts/generate_rust_analyzer.py | 3 sound/firewire/fireworks/fireworks_command.c | 5 sound/pci/ctxfi/ctvmem.h | 2 sound/soc/qcom/qdsp6/q6apm.c | 14 + sound/usb/6fire/chip.c | 17 +- sound/usb/usx2y/us144mkii.c | 6 tools/objtool/check.c | 2 tools/testing/selftests/kvm/x86/sev_migrate_tests.c | 2 tools/testing/selftests/mm/hmm-tests.c | 83 +--------- 99 files changed, 585 insertions(+), 358 deletions(-)
Abd-Alrhman Masalkhi (1):
media: vidtv: fix pass-by-value structs causing MSAN warnings
Abhishek Kumar (1):
media: em28xx: fix use-after-free in em28xx_v4l2_open()
Alexey Charkov (1):
usb: typec: fusb302: Switch to threaded IRQ handler
Alistair Popple (1):
selftests/mm: hmm-tests: don't hardcode THP size to 2MB
Benjamin Berg (1):
scripts/gdb/symbols: handle module path parameters
Berk Cem Goksel (1):
ALSA: 6fire: fix use-after-free on disconnect
Borislav Petkov (AMD) (1):
x86/CPU: Fix FPDSS on Zen1
Breno Leitao (1):
mm: blk-cgroup: fix use-after-free in cgwb_release_workfn()
Daniel Brát (1):
usb: storage: Expand range of matched versions for VL817 quirks entry
Dave Carey (1):
USB: cdc-acm: Add quirks for Yoga Book 9 14IAH10 INGENIC touchscreen
Deepanshu Kartikey (1):
nilfs2: fix NULL i_assoc_inode dereference in nilfs_mdt_save_to_shadow_map
Fabio Porcedda (1):
USB: serial: option: add Telit Cinterion FN990A MBIM composition
Fan Wu (1):
media: mediatek: vcodec: fix use-after-free in encoder release path
Greg Kroah-Hartman (20):
i2c: s3c24xx: check the size of the SMBUS message before using it
HID: alps: fix NULL pointer dereference in alps_raw_event()
HID: core: clamp report_size in s32ton() to avoid undefined shift
net: usb: cdc-phonet: fix skb frags[] overflow in rx_complete()
NFC: digital: Bounds check NFC-A cascade depth in SDD response handler drm/vc4: platform_get_irq_byname() returns an int
bnge: return after auxiliary_device_uninit() in error path
ALSA: usx2y: us144mkii: fix NULL deref on missing interface 0
ALSA: fireworks: bound device-supplied status before string array lookup
fbdev: tdfxfb: avoid divide-by-zero on FBIOPUT_VSCREENINFO
usb: gadget: f_ncm: validate minimum block_len in ncm_unwrap_ntb()
usb: gadget: f_phonet: fix skb frags[] overflow in pn_rx_complete()
usb: gadget: renesas_usb3: validate endpoint index in standard request handlers
smb: client: fix off-by-8 bounds check in check_wsl_eas()
smb: client: fix OOB reads parsing symlink error response
ksmbd: validate EaNameLength in smb2_get_ea()
ksmbd: require 3 sub-authorities before reading sub_auth[2]
ksmbd: fix mechToken leak when SPNEGO decode fails after token alloc
fbdev: udlfb: avoid divide-by-zero on FBIOPUT_VSCREENINFO
Linux 7.0.1
Harin Lee (1):
ALSA: ctxfi: Limit PTP to a single page
Jeongjun Park (2):
media: as102: fix to not free memory after the device is registered in as102_usb_probe()
media: hackrf: fix to not free memory after the device is registered in hackrf_probe()
Jianhui Zhou (1):
mm/userfaultfd: fix hugetlb fault mutex hash calculation
Johan Hovold (1):
wifi: rtw88: fix device leak on probe failure
Joseph Qi (1):
ocfs2: fix possible deadlock between unlink and dio_end_io_write
Junrui Luo (1):
staging: sm750fb: fix division by zero in ps_to_hz()
Junxi Qian (1):
nfc: llcp: add missing return after LLCP_CLOSED checks
Koichiro Den (2):
PCI: endpoint: pci-epf-vntb: Stop cmd_handler work in epf_ntb_epc_cleanup
PCI: endpoint: pci-epf-vntb: Remove duplicate resource teardown
Lin YuChen (1):
staging: rtl8723bs: initialize le_tmp64 in rtw_BIP_verify()
Linus Torvalds (3):
x86-64: rename misleadingly named '__copy_user_nocache()' function
x86: rename and clean up __copy_from_user_inatomic_nocache() x86-64/arm64/powerpc: clean up and rename __copy_from_user_flushcache
Matthew Wilcox (Oracle) (1):
mm: call ->free_folio() directly in folio_unmap_invalidate()
Michael Zimmermann (1):
usb: gadget: f_hid: don't call cdev_init while cdev in use
Michał Winiarski (1):
vfio/xe: Reorganize the init to decouple migration from reset
Mingzhe Zou (1):
bcache: fix cached_dev.sb_bio use-after-free and crash
Nathan Rebello (1):
usbip: validate number_of_packets in usbip_pack_ret_submit()
Ritesh Harjani (IBM) (1):
mm/kasan: fix double free for kasan pXds
Ruslan Valiyev (2):
media: vidtv: fix NULL pointer dereference in vidtv_channel_pmt_match_sections
media: vidtv: fix nfeeds state corruption on start_streaming failure
Ryan Roberts (1):
arm64: mm: Handle invalid large leaf mappings correctly
Samuel Page (1):
can: raw: fix ro->uniq use-after-free in raw_rcv()
Sanman Pradhan (1):
hwmon: (powerz) Fix use-after-free on USB disconnect
Sasha Levin (1):
checkpatch: add support for Assisted-by tag
Sean Christopherson (7):
KVM: selftests: Remove duplicate LAUNCH_UPDATE_VMSA call in SEV-ES migrate test
KVM: SEV: Reject attempts to sync VMSA of an already-launched/encrypted vCPU
KVM: SEV: Protect *all* of sev_mem_enc_register_region() with kvm->lock
KVM: SEV: Disallow LAUNCH_FINISH if vCPUs are actively being created
KVM: SEV: Lock all vCPUs when synchronzing VMSAs for SNP launch finish
KVM: SEV: Drop WARN on large size for KVM_MEMORY_ENCRYPT_REG_REGION
KVM: x86: Use scratch field in MMIO fragment to hold small write values
SeongJae Park (2):
Docs/admin-guide/mm/damon/reclaim: warn commit_inputs vs param updates race Docs/admin-guide/mm/damon/lru_sort: warn commit_inputs vs param updates race
Shardul Bankar (1):
wireguard: device: use exit_rtnl callback instead of manual rtnl_lock in pre_exit
Srinivas Kandagatla (1):
ASoC: qcom: q6apm: move component registration to unmanaged version
Stefan Metzmacher (2):
smb: client: avoid double-free in smbd_free_send_io() after smbd_send_batch_flush()
smb: server: avoid double-free in smb_direct_free_sendmsg after smb_direct_flush_send_list()
Tamir Duberstein (1):
scripts: generate_rust_analyzer.py: avoid FD leak
Tejas Bharambe (1):
ocfs2: fix use-after-free in ocfs2_fault() when VM_FAULT_RETRY
Thomas Gleixner (1):
clockevents: Add missing resets of the next_event_forced flag
Xu Yang (1):
usb: port: add delay after usb_hub_set_port_power()
ZhengYuan Huang (1):
ocfs2: handle invalid dinode in ocfs2_group_extend
Zhihao Cheng (1):
dcache: Limit the minimal number of bucket to two
Greg Kroah-Hartman
maintainerDocumentation/admin-guide/mm/damon/lru_sort.rst +4 -0
@@ -79,6 +79,10 @@ of parametrs except ``enabled`` again. Once the re-reading is done, this parameter is set as ``N``. If invalid parameters are found while the re-reading, DAMON_LRU_SORT will be disabled. +Once ``Y`` is written to this parameter, the user must not write to any +parameters until reading ``commit_inputs`` again returns ``N``. If users +violate this rule, the kernel may exhibit undefined behavior. + active_mem_bp -------------
Documentation/admin-guide/mm/damon/reclaim.rst +4 -0
@@ -71,6 +71,10 @@ of parametrs except ``enabled`` again. Once the re-reading is done, this parameter is set as ``N``. If invalid parameters are found while the re-reading, DAMON_RECLAIM will be disabled. +Once ``Y`` is written to this parameter, the user must not write to any +parameters until reading ``commit_inputs`` again returns ``N``. If users +violate this rule, the kernel may exhibit undefined behavior. + min_age -------
Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 7 PATCHLEVEL = 0 -SUBLEVEL = 0 +SUBLEVEL = 1 EXTRAVERSION = NAME = Baby Opossum Posse
arch/arm64/include/asm/pgtable-prot.h +2 -0
@@ -25,6 +25,8 @@*/ #define PTE_PRESENT_INVALID (PTE_NG)/* only when !PTE_VALID */ +#define PTE_PRESENT_VALID_KERNEL (PTE_VALID | PTE_MAYBE_NG) +#ifdef CONFIG_HAVE_ARCH_USERFAULTFD_WP #define PTE_UFFD_WP (_AT(pteval_t, 1) << 58)/* uffd-wp tracking */ #define PTE_SWP_UFFD_WP (_AT(pteval_t, 1) << 3)/* only for swp ptes */
arch/arm64/include/asm/pgtable.h +7 -2
@@ -322,9 +322,11 @@ static inline pte_t pte_mknoncont(pte_t pte)return clear_pte_bit (pte,__pgprot (PTE_CONT )); } -static inline pte_t pte_mkvalid (pte_t pte) +static inline pte_t pte_mkvalid_k (pte_t pte) { -return set_pte_bit (pte,__pgprot (PTE_VALID )); + pte =clear_pte_bit (pte,__pgprot (PTE_PRESENT_INVALID )); + pte =set_pte_bit (pte,__pgprot (PTE_PRESENT_VALID_KERNEL )); +return pte; }static inline pte_t pte_mkinvalid (pte_t pte)
@@ -594,6 +596,7 @@ static inline int pmd_protnone(pmd_t pmd)#define pmd_mkclean (pmd) pte_pmd(pte_mkclean(pmd_pte(pmd)))#define pmd_mkdirty (pmd) pte_pmd(pte_mkdirty(pmd_pte(pmd)))#define pmd_mkyoung (pmd) pte_pmd(pte_mkyoung(pmd_pte(pmd))) +#define pmd_mkvalid_k (pmd) pte_pmd(pte_mkvalid_k(pmd_pte(pmd)))#define pmd_mkinvalid (pmd) pte_pmd(pte_mkinvalid(pmd_pte(pmd)))#ifdef CONFIG_HAVE_ARCH_USERFAULTFD_WP #define pmd_uffd_wp (pmd) pte_uffd_wp(pmd_pte(pmd))
@@ -635,6 +638,8 @@ static inline pmd_t pmd_mkspecial(pmd_t pmd)#define pud_young (pud) pte_young(pud_pte(pud))#define pud_mkyoung (pud) pte_pud(pte_mkyoung(pud_pte(pud))) +#define pud_mkwrite_novma (pud) pte_pud(pte_mkwrite_novma(pud_pte(pud))) +#define pud_mkvalid_k (pud) pte_pud(pte_mkvalid_k(pud_pte(pud)))#define pud_write (pud) pte_write(pud_pte(pud))static inline pud_t pud_mkhuge (pud_t pud)
arch/arm64/include/asm/uaccess.h +1 -1
@@ -478,7 +478,7 @@ extern __must_check long strnlen_user(const char __user *str, long n);#ifdef CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE extern unsigned long __must_check __copy_user_flushcache (void *to,const void __user *from,unsigned long n); -static inline int __copy_from_user_flushcache (void *dst,const void __user *src,unsigned size) +static inline size_t copy_from_user_flushcache (void *dst,const void __user *src,size_t size) {kasan_check_write (dst, size);return __copy_user_flushcache (dst,__uaccess_mask_ptr (src), size);
arch/arm64/mm/mmu.c +4 -0
@@ -602,6 +602,8 @@ static int split_pmd(pmd_t *pmdp, pmd_t pmd, gfp_t gfp, bool to_cont) tableprot |=PMD_TABLE_PXN ; prot =__pgprot ((pgprot_val (prot) & ~PTE_TYPE_MASK ) |PTE_TYPE_PAGE ); +if (!pmd_valid (pmd)) + prot =pte_pgprot (pte_mkinvalid (pfn_pte (0 , prot))); prot =__pgprot (pgprot_val (prot) & ~PTE_CONT );if (to_cont) prot =__pgprot (pgprot_val (prot) |PTE_CONT );
@@ -647,6 +649,8 @@ static int split_pud(pud_t *pudp, pud_t pud, gfp_t gfp, bool to_cont) tableprot |=PUD_TABLE_PXN ; prot =__pgprot ((pgprot_val (prot) & ~PMD_TYPE_MASK ) |PMD_TYPE_SECT ); +if (!pud_valid (pud)) + prot =pmd_pgprot (pmd_mkinvalid (pfn_pmd (0 , prot))); prot =__pgprot (pgprot_val (prot) & ~PTE_CONT );if (to_cont) prot =__pgprot (pgprot_val (prot) |PTE_CONT );
arch/arm64/mm/pageattr.c +28 -22
116 lines not on this page · raw message
arch/arm64/mm/trans_pgd.c +7 -35
66 lines not on this page · raw message
arch/powerpc/include/asm/uaccess.h +1 -2
@@ -434,8 +434,7 @@ copy_mc_to_user(void __user *to, const void *from, unsigned long n) }#endif -extern long __copy_from_user_flushcache (void *dst,const void __user *src, -unsigned size); +extern size_t copy_from_user_flushcache (void *dst,const void __user *src,size_t size); static __must_check __always_inline bool __user_access_begin(const void __user *ptr, size_t len,unsigned long dir)
arch/powerpc/lib/pmem.c +6 -5
@@ -66,15 +66,16 @@ EXPORT_SYMBOL_GPL(arch_invalidate_pmem);/* * CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE symbols */ -long __copy_from_user_flushcache (void *dest,const void __user *src, -unsigned size) +size_t copy_from_user_flushcache (void *dest,const void __user *src, +size_t size) { -unsigned long copied, start = (unsigned long ) dest; +unsigned long not_copied, start = (unsigned long ) dest; - copied =__copy_from_user (dest, src, size); + src =mask_user_address (src); + not_copied =__copy_from_user (dest, src, size);clean_pmem_range (start, start + size); -return copied; +return not_copied; }void memcpy_flushcache (void *dest,const void *src,size_t size)
arch/x86/include/asm/msr-index.h +3 -0
@@ -674,6 +674,9 @@#define MSR_AMD64_DC_CFG 0xc0011022#define MSR_AMD64_TW_CFG 0xc0011023 +#define MSR_AMD64_FP_CFG 0xc0011028 +#define MSR_AMD64_FP_CFG_ZEN1_DENORM_FIX_BIT 9 +#define MSR_AMD64_DE_CFG 0xc0011029#define MSR_AMD64_DE_CFG_LFENCE_SERIALIZE_BIT 1#define MSR_AMD64_DE_CFG_LFENCE_SERIALIZE BIT_ULL(MSR_AMD64_DE_CFG_LFENCE_SERIALIZE_BIT)
arch/x86/include/asm/uaccess.h +1 -1
@@ -507,7 +507,7 @@ extern struct movsl_mask { } ____cacheline_aligned_in_smp movsl_mask;#endif -#define ARCH_HAS_NOCACHE_UACCESS 1 +#define ARCH_HAS_NONTEMPORAL_UACCESS 1/* * The "unsafe" user accesses aren't really "unsafe", but the naming
arch/x86/include/asm/uaccess_32.h +1 -7
@@ -26,13 +26,7 @@ raw_copy_from_user(void *to, const void __user *from, unsigned long n)return __copy_user_ll (to, (__force const void *)from, n); } -static __always_inline unsigned long -__copy_from_user_inatomic_nocache (void *to,const void __user *from, -unsigned long n) -{ -return __copy_from_user_ll_nocache_nozero (to, from, n); -} - +unsigned long __must_check copy_from_user_inatomic_nontemporal (void *,const void __user *,unsigned long n);unsigned long __must_check clear_user (void __user *mem,unsigned long len);unsigned long __must_check __clear_user (void __user *mem,unsigned long len);
arch/x86/include/asm/uaccess_64.h +9 -7
@@ -147,26 +147,28 @@ raw_copy_to_user(void __user *dst, const void *src, unsigned long size)return copy_user_generic ((__force void *)dst, src, size); } -extern long __copy_user_nocache (void *dst,const void __user *src,unsigned size); -extern long __copy_user_flushcache (void *dst,const void __user *src,unsigned size); +#define copy_to_nontemporal copy_to_nontemporal +extern size_t copy_to_nontemporal (void *dst,const void *src,size_t size); +extern size_t copy_user_flushcache (void *dst,const void __user *src,size_t size);static inline int -__copy_from_user_inatomic_nocache (void *dst,const void __user *src, +copy_from_user_inatomic_nontemporal (void *dst,const void __user *src,unsigned size) {long ret;kasan_check_write (dst, size); + src =mask_user_address (src);stac (); - ret =__copy_user_nocache (dst, src, size); + ret =copy_to_nontemporal (dst, (__force const void *)src, size);clac ();return ret; } -static inline int -__copy_from_user_flushcache (void *dst,const void __user *src,unsigned size) +static inline size_t +copy_from_user_flushcache (void *dst,const void __user *src,size_t size) {kasan_check_write (dst, size); -return __copy_user_flushcache (dst, src, size); +return copy_user_flushcache (dst, src, size); }/*
arch/x86/kernel/cpu/amd.c +3 -0
@@ -943,6 +943,9 @@ static void init_amd_zen1(struct cpuinfo_x86 *c)msr_clear_bit (MSR_K7_HWCR ,MSR_K7_HWCR_IRPERF_EN_BIT );clear_cpu_cap (c,X86_FEATURE_IRPERF ); } + +pr_notice_once ("AMD Zen1 FPDSS bug detected, enabling mitigation.\n" ); +msr_set_bit (MSR_AMD64_FP_CFG ,MSR_AMD64_FP_CFG_ZEN1_DENORM_FIX_BIT ); }static const struct x86_cpu_id amd_zenbleed_microcode[] = {
arch/x86/kvm/svm/sev.c +32 -14
129 lines not on this page · raw message
arch/x86/kvm/x86.c +13 -1
@@ -8225,7 +8225,13 @@ static int emulator_read_write_onepage(unsigned long addr, void *val,WARN_ON (vcpu->mmio_nr_fragments >=KVM_MAX_MMIO_FRAGMENTS ); frag = &vcpu->mmio_fragments[vcpu->mmio_nr_fragments++]; frag->gpa = gpa; - frag->data = val; +if (write && bytes <=8u ) { + frag->val =0 ; + frag->data = &frag->val; +memcpy (&frag->val, val, bytes); + }else { + frag->data = val; + } frag->len = bytes;return X86EMUL_CONTINUE ; }
@@ -8240,6 +8246,9 @@ static int emulator_read_write(struct x86_emulate_ctxt *ctxt,gpa_t gpa;int rc; +if (WARN_ON_ONCE ((bytes >8u || !ops->write) &&object_is_on_stack (val))) +return X86EMUL_UNHANDLEABLE ; +if (ops->read_write_prepare && ops->read_write_prepare (vcpu, val, bytes))return X86EMUL_CONTINUE ;
@@ -11846,6 +11855,9 @@ static int complete_emulated_mmio(struct kvm_vcpu *vcpu) frag++; vcpu->mmio_cur_fragment++; }else { +if (WARN_ON_ONCE (frag->data == &frag->val)) +return -EIO ; +/* Go forward to the next mmio piece. */ frag->data += len; frag->gpa += len;
arch/x86/lib/copy_user_uncached_64.S +3 -3
@@ -27,7 +27,7 @@ * Output: * rax uncopied bytes or 0 if successful. */ -SYM_FUNC_START(__copy_user_nocache) +SYM_FUNC_START(copy_to_nontemporal) ANNOTATE_NOENDBR /* If destination is not 7-byte aligned, we'll have to align it */ testb $7,%dil
@@ -240,5 +240,5 @@ _ASM_EXTABLE_UA(95b, .Ldone) _ASM_EXTABLE_UA(52b, .Ldone0) _ASM_EXTABLE_UA(53b, .Ldone0) -SYM_FUNC_END(__copy_user_nocache) -EXPORT_SYMBOL(__copy_user_nocache) +SYM_FUNC_END(copy_to_nontemporal) +EXPORT_SYMBOL(copy_to_nontemporal)
arch/x86/lib/usercopy_32.c +5 -4
@@ -322,10 +322,11 @@ unsigned long __copy_user_ll(void *to, const void *from, unsigned long n) }EXPORT_SYMBOL (__copy_user_ll); -unsigned long __copy_from_user_ll_nocache_nozero (void *to,const void __user *from, +unsigned long copy_from_user_inatomic_nontemporal (void *to,const void __user *from,unsigned long n) { -__uaccess_begin_nospec (); +if (!user_access_begin (from, n)) +return n;#ifdef CONFIG_X86_INTEL_USERCOPY if (n >64 &&static_cpu_has (X86_FEATURE_XMM2 )) n =__copy_user_intel_nocache (to, from, n);
@@ -334,7 +335,7 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr#else __copy_user (to, from, n);#endif -__uaccess_end (); +user_access_end ();return n; } -EXPORT_SYMBOL (__copy_from_user_ll_nocache_nozero); +EXPORT_SYMBOL (copy_from_user_inatomic_nontemporal);
arch/x86/lib/usercopy_64.c +6 -6
@@ -43,17 +43,17 @@ void arch_wb_cache_pmem(void *addr, size_t size) }EXPORT_SYMBOL_GPL (arch_wb_cache_pmem); -long __copy_user_flushcache (void *dst,const void __user *src,unsigned size) +size_t copy_user_flushcache (void *dst,const void __user *src,size_t size) {unsigned long flushed, dest = (unsigned long ) dst; -long rc; +unsigned long rc; -stac (); - rc =__copy_user_nocache (dst, src, size); -clac (); + src =masked_user_access_begin (src); + rc =copy_to_nontemporal (dst, (__force const void *)src, size); +user_access_end ();/* -* __copy_user_nocache() uses non-temporal stores for the bulk +* copy_to_nontemporal() uses non-temporal stores for the bulk * of the transfer, but we need to manually flush if the * transfer is unaligned. A cached memory copy is used when * destination or size is not naturally aligned. That is:
drivers/gpu/drm/i915/i915_gem.c +1 -1
@@ -520,7 +520,7 @@ ggtt_write(struct io_mapping *mapping,/* We can use the cpu mem copy function because this is X86. */ vaddr =io_mapping_map_atomic_wc (mapping, base); - unwritten =__copy_from_user_inatomic_nocache ((void __force *)vaddr + offset, + unwritten =copy_from_user_inatomic_nontemporal ((void __force *)vaddr + offset, user_data, length);io_mapping_unmap_atomic (vaddr);if (unwritten) {
drivers/gpu/drm/qxl/qxl_ioctl.c +1 -1
@@ -183,7 +183,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,/* TODO copy slow path code from i915 */ fb_cmd =qxl_bo_kmap_atomic_page (qdev, cmd_bo, (release->release_offset &PAGE_MASK )); - unwritten =__copy_from_user_inatomic_nocache + unwritten =copy_from_user_inatomic_nontemporal (fb_cmd +sizeof (union qxl_release_info ) + (release->release_offset & ~PAGE_MASK ),u64_to_user_ptr (cmd->command), cmd->command_size);
drivers/gpu/drm/vc4/vc4_hdmi.c +10 -4
@@ -2449,17 +2449,23 @@ static int vc4_hdmi_hotplug_init(struct vc4_hdmi *vc4_hdmi)int ret;if (vc4_hdmi->variant->external_irq_controller) { -unsigned int hpd_con =platform_get_irq_byname (pdev,"hpd-connected" ); -unsigned int hpd_rm =platform_get_irq_byname (pdev,"hpd-removed" ); +int hpd =platform_get_irq_byname (pdev,"hpd-connected" ); - ret =devm_request_threaded_irq (&pdev->dev, hpd_con, +if (hpd <0 ) +return hpd; + + ret =devm_request_threaded_irq (&pdev->dev, hpd,NULL , vc4_hdmi_hpd_irq_thread,IRQF_ONESHOT ,"vc4 hdmi hpd connected" , vc4_hdmi);if (ret)return ret; - ret =devm_request_threaded_irq (&pdev->dev, hpd_rm, + hpd =platform_get_irq_byname (pdev,"hpd-removed" ); +if (hpd <0 ) +return hpd; + + ret =devm_request_threaded_irq (&pdev->dev, hpd,NULL , vc4_hdmi_hpd_irq_thread,IRQF_ONESHOT ,"vc4 hdmi hpd disconnected" , vc4_hdmi);
drivers/hid/hid-alps.c +3 -0
@@ -437,6 +437,9 @@ static int alps_raw_event(struct hid_device *hdev,int ret =0 ;struct alps_dev *hdata =hid_get_drvdata (hdev); +if (!(hdev->claimed &HID_CLAIMED_INPUT ) || !hdata->input) +return 0 ; +switch (hdev->product) {case HID_PRODUCT_ID_T4_BTNLESS : ret =t4_raw_event (hdata, data, size);
drivers/hid/hid-core.c +3 -0
@@ -71,6 +71,9 @@ static u32 s32ton(__s32 value, unsigned int n)if (!value || !n)return 0 ; +if (n >32 ) + n =32 ; + a = value >> (n -1 );if (a && a !=-1 )return value <0 ?1 << (n -1 ) : (1 << (n -1 )) -1 ;
drivers/hwmon/powerz.c +6 -2
@@ -108,6 +108,9 @@ static int powerz_read_data(struct usb_device *udev, struct powerz_priv *priv) {int ret; +if (!priv->urb) +return -ENODEV ; + priv->status = -ETIMEDOUT ;reinit_completion (&priv->completion);
@@ -224,6 +227,8 @@ static int powerz_probe(struct usb_interface *intf,mutex_init (&priv->mutex);init_completion (&priv->completion); +usb_set_intfdata (intf, priv); + hwmon_dev =devm_hwmon_device_register_with_info (parent,DRIVER_NAME , priv, &powerz_chip_info,NULL );
@@ -232,8 +237,6 @@ static int powerz_probe(struct usb_interface *intf,return PTR_ERR (hwmon_dev); } -usb_set_intfdata (intf, priv); -return 0 ; }
@@ -244,6 +247,7 @@ static void powerz_disconnect(struct usb_interface *intf)mutex_lock (&priv->mutex);usb_kill_urb (priv->urb);usb_free_urb (priv->urb); + priv->urb =NULL ;mutex_unlock (&priv->mutex); }
drivers/i2c/busses/i2c-s3c2410.c +6 -1
@@ -503,8 +503,13 @@ static void i2c_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat) i2c->msg->buf[i2c->msg_ptr++] = byte;/* Add actual length to read for smbus block read */ -if (i2c->msg->flags &I2C_M_RECV_LEN && i2c->msg->len ==1 ) +if (i2c->msg->flags &I2C_M_RECV_LEN && i2c->msg->len ==1 ) { +if (byte ==0 || byte >I2C_SMBUS_BLOCK_MAX ) { +s3c24xx_i2c_stop (i2c, -EPROTO ); +break ; + } i2c->msg->len += byte; + } prepare_read:if (is_msglast (i2c)) {/* last byte of buffer */
drivers/infiniband/sw/rdmavt/qp.c +3 -5
@@ -92,12 +92,10 @@ static int rvt_wss_llc_size(void)static void cacheless_memcpy (void *dst,void *src,size_t n) {/* -* Use the only available X64 cacheless copy. Add a __user cast -* to quiet sparse. The src agument is already in the kernel so -* there are no security issues. The extra fault recovery machinery -* is not invoked. +* Use the only available X64 cacheless copy. +* The extra fault recovery machinery is not invoked. */ -__copy_user_nocache (dst, (void __user *)src, n); +copy_to_nontemporal (dst, src, n); }void rvt_wss_exit (struct rvt_dev_info *rdi)
drivers/md/bcache/super.c +7 -0
@@ -1373,6 +1373,13 @@ static CLOSURE_CALLBACK(cached_dev_free)mutex_unlock (&bch_register_lock); +/* +* Wait for any pending sb_write to complete before free. +* The sb_bio is embedded in struct cached_dev, so we must +* ensure no I/O is in progress. +*/ +closure_sync (&dc->sb_write); +if (dc->sb_disk)folio_put (virt_to_folio (dc->sb_disk));
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.c +9 -0
@@ -215,6 +215,15 @@ static int fops_vcodec_release(struct file *file)v4l2_fh_exit (&ctx->fh);v4l2_ctrl_handler_free (&ctx->ctrl_hdl); +/* +* Cancel any pending encode work before freeing the context. +* Although v4l2_m2m_ctx_release() waits for m2m job completion, +* the workqueue handler (mtk_venc_worker) may still be accessing +* the context after v4l2_m2m_job_finish() returns. Without this, +* a use-after-free occurs when the worker accesses ctx after kfree. +*/ +cancel_work_sync (&ctx->encode_work); +spin_lock_irqsave (&dev->dev_ctx_lock, flags);list_del_init (&ctx->list);spin_unlock_irqrestore (&dev->dev_ctx_lock, flags);
drivers/media/test-drivers/vidtv/vidtv_bridge.c +3 -1
@@ -237,8 +237,10 @@ static int vidtv_start_feed(struct dvb_demux_feed *feed)if (dvb->nfeeds ==1 ) { ret =vidtv_start_streaming (dvb); -if (ret <0 ) +if (ret <0 ) { + dvb->nfeeds--; rc = ret; + } }mutex_unlock (&dvb->feed_lock);
drivers/media/test-drivers/vidtv/vidtv_channel.c +4 -0
@@ -341,6 +341,10 @@ vidtv_channel_pmt_match_sections(struct vidtv_channel *channels, tail =vidtv_psi_pmt_stream_init (tail, s->type, e_pid); +if (!tail) { +vidtv_psi_pmt_stream_destroy (head); +return ; + }if (!head) head = tail;
drivers/media/test-drivers/vidtv/vidtv_mux.c +2 -2
@@ -233,7 +233,7 @@ static u32 vidtv_mux_push_pcr(struct vidtv_mux *m)/* the 27Mhz clock will feed both parts of the PCR bitfield */ args.pcr = m->timing.clk; - nbytes +=vidtv_ts_pcr_write_into (args); + nbytes +=vidtv_ts_pcr_write_into (&args); m->mux_buf_offset += nbytes; m->num_streamed_pcr++;
@@ -363,7 +363,7 @@ static u32 vidtv_mux_pad_with_nulls(struct vidtv_mux *m, u32 npkts) args.continuity_counter = &ctx->cc;for (i =0 ; i < npkts; ++i) { - m->mux_buf_offset +=vidtv_ts_null_write_into (args); + m->mux_buf_offset +=vidtv_ts_null_write_into (&args); args.dest_offset = m->mux_buf_offset; }
drivers/media/test-drivers/vidtv/vidtv_ts.c +24 -24
96 lines not on this page · raw message
drivers/media/test-drivers/vidtv/vidtv_ts.h +2 -2
@@ -90,7 +90,7 @@ void vidtv_ts_inc_cc(u8 *continuity_counter);* * Return: The number of bytes written into the buffer. */ -u32 vidtv_ts_null_write_into (struct null_packet_write_args args); +u32 vidtv_ts_null_write_into (const struct null_packet_write_args *args);/** * vidtv_ts_pcr_write_into - Write a PCR packet into a buffer.
@@ -101,6 +101,6 @@ u32 vidtv_ts_null_write_into(struct null_packet_write_args args);* * Return: The number of bytes written into the buffer. */ -u32 vidtv_ts_pcr_write_into (struct pcr_write_args args); +u32 vidtv_ts_pcr_write_into (const struct pcr_write_args *args);#endif //VIDTV_TS_H
drivers/media/usb/as102/as102_usb_drv.c +2 -0
@@ -403,7 +403,9 @@ static int as102_usb_probe(struct usb_interface *intf, failed_dvb:as102_free_usb_stream_buffer (as102_dev); failed_stream: +usb_set_intfdata (intf,NULL );usb_deregister_dev (intf, &as102_usb_class_driver); +return ret; failed:usb_put_dev (as102_dev->bus_adap.usb_dev);usb_set_intfdata (intf,NULL );
drivers/media/usb/em28xx/em28xx-video.c +10 -4
@@ -2126,7 +2126,7 @@ static int em28xx_v4l2_open(struct file *filp) {struct video_device *vdev =video_devdata (filp);struct em28xx *dev =video_drvdata (filp); -struct em28xx_v4l2 *v4l2 = dev->v4l2; +struct em28xx_v4l2 *v4l2;enum v4l2_buf_type fh_type =0 ;int ret;
@@ -2143,13 +2143,19 @@ static int em28xx_v4l2_open(struct file *filp)return -EINVAL ; } +if (mutex_lock_interruptible (&dev->lock)) +return -ERESTARTSYS ; + + v4l2 = dev->v4l2; +if (!v4l2) { +mutex_unlock (&dev->lock); +return -ENODEV ; + } +em28xx_videodbg ("open dev=%s type=%s users=%d\n" ,video_device_node_name (vdev), v4l2_type_names[fh_type], v4l2->users); -if (mutex_lock_interruptible (&dev->lock)) -return -ERESTARTSYS ; - ret =v4l2_fh_open (filp);if (ret) { dev_err(&dev->intf->dev,
drivers/media/usb/hackrf/hackrf.c +4 -3
@@ -1485,7 +1485,7 @@ static int hackrf_probe(struct usb_interface *intf,if (ret) {dev_err (dev->dev,"Failed to register as video device (%d)\n" , ret); - goto err_v4l2_device_unregister; + goto err_v4l2_device_put; }dev_info (dev->dev,"Registered as %s\n" ,video_device_node_name (&dev->rx_vdev));
@@ -1513,8 +1513,9 @@ static int hackrf_probe(struct usb_interface *intf,return 0 ; err_video_unregister_device_rx:video_unregister_device (&dev->rx_vdev); -err_v4l2_device_unregister: -v4l2_device_unregister (&dev->v4l2_dev); +err_v4l2_device_put: +v4l2_device_put (&dev->v4l2_dev); +return ret; err_v4l2_ctrl_handler_free_tx:v4l2_ctrl_handler_free (&dev->tx_ctrl_handler); err_v4l2_ctrl_handler_free_rx:
drivers/net/ethernet/broadcom/bnge/bnge_auxr.c +1 -0
@@ -194,6 +194,7 @@ void bnge_rdma_aux_device_add(struct bnge_dev *bd)dev_warn (bd->dev,"Failed to add auxiliary device for ROCE\n" );auxiliary_device_uninit (aux_dev); bd->flags &= ~BNGE_EN_ROCE ; +return ; } bd->auxr_dev->net = bd->netdev;
drivers/net/usb/cdc-phonet.c +6 -1
@@ -157,11 +157,16 @@ static void rx_complete(struct urb *req) PAGE_SIZE); page =NULL ; } - }else { + }else if (skb_shinfo (skb)->nr_frags <MAX_SKB_FRAGS ) {skb_add_rx_frag (skb,skb_shinfo (skb)->nr_frags, page,0 , req->actual_length,PAGE_SIZE ); page =NULL ; + }else { +dev_kfree_skb_any (skb); + pnd->rx_skb =NULL ; + skb =NULL ; + dev->stats.rx_length_errors++; }if (req->actual_length <PAGE_SIZE ) pnd->rx_skb =NULL ;/* Last fragment */
drivers/net/wireguard/device.c +3 -5
@@ -411,12 +411,11 @@ static struct rtnl_link_ops link_ops __read_mostly = { .newlink = wg_newlink, }; -static void wg_netns_pre_exit (struct net *net) +static void __net_exit wg_netns_exit_rtnl(struct net *net, struct list_head *dev_kill_list) {struct wg_device *wg;struct wg_peer *peer; -rtnl_lock ();list_for_each_entry (wg, &device_list, device_list) {if (rcu_access_pointer (wg->creating_net) == net) {pr_debug ("%s: Creating namespace exiting\n" , wg->dev->name);
@@ -429,11 +428,10 @@ static void wg_netns_pre_exit(struct net *net)mutex_unlock (&wg->device_update_lock); } } -rtnl_unlock (); } -static struct pernet_operations pernet_ops = { - .pre_exit = wg_netns_pre_exit +static struct pernet_operations pernet_ops__read_mostly = { + .exit_rtnl = wg_netns_exit_rtnl };int __init wg_device_init (void )
drivers/net/wireless/realtek/rtw88/usb.c +1 -2
@@ -1041,7 +1041,7 @@ static int rtw_usb_intf_init(struct rtw_dev *rtwdev, struct usb_interface *intf) {struct rtw_usb *rtwusb =rtw_get_usb_priv (rtwdev); -struct usb_device *udev =usb_get_dev (interface_to_usbdev (intf)); +struct usb_device *udev =interface_to_usbdev (intf);int ret; rtwusb->udev = udev;
@@ -1067,7 +1067,6 @@ static void rtw_usb_intf_deinit(struct rtw_dev *rtwdev, {struct rtw_usb *rtwusb =rtw_get_usb_priv (rtwdev); -usb_put_dev (rtwusb->udev);kfree (rtwusb->usb_data);usb_set_intfdata (intf,NULL ); }
drivers/ntb/ntb_transport.c +4 -3
@@ -1779,12 +1779,13 @@ static void ntb_tx_copy_callback(void *data,static void ntb_memcpy_tx_on_stack (struct ntb_queue_entry *entry,void __iomem *offset) { -#ifdef ARCH_HAS_NOCACHE_UACCESS +#ifdef copy_to_nontemporal/* * Using non-temporal mov to improve performance on non-cached -* writes, even though we aren't actually copying from user space. +* writes. This only works if __iomem is strictly memory-like, +* but that is the case on x86-64 */ -__copy_from_user_inatomic_nocache (offset, entry->buf, entry->len); +copy_to_nontemporal (offset, entry->buf, entry->len);#else memcpy_toio (offset, entry->buf, entry->len);#endif
drivers/pci/endpoint/functions/pci-epf-vntb.c +2 -18
@@ -763,19 +763,6 @@ static void epf_ntb_mw_bar_clear(struct epf_ntb *ntb, int num_mws) } } -/** -* epf_ntb_epc_destroy() - Cleanup NTB EPC interface -* @ntb: NTB device that facilitates communication between HOST and VHOST -* -* Wrapper for epf_ntb_epc_destroy_interface() to cleanup all the NTB interfaces -*/ -static void epf_ntb_epc_destroy (struct epf_ntb *ntb) -{ -pci_epc_remove_epf (ntb->epf->epc, ntb->epf,0 ); -pci_epc_put (ntb->epf->epc); -} - -/** * epf_ntb_is_bar_used() - Check if a bar is used in the ntb configuration * @ntb: NTB device that facilitates communication between HOST and VHOST
@@ -955,6 +942,7 @@ static int epf_ntb_epc_init(struct epf_ntb *ntb)*/ static void epf_ntb_epc_cleanup (struct epf_ntb *ntb) { +disable_delayed_work_sync (&ntb->cmd_handler);epf_ntb_mw_bar_clear (ntb, ntb->num_mws);epf_ntb_db_bar_clear (ntb);epf_ntb_config_sspad_bar_clear (ntb);
@@ -1525,7 +1513,7 @@ static int epf_ntb_bind(struct pci_epf *epf) ret =epf_ntb_init_epc_bar (ntb);if (ret) {dev_err (dev,"Failed to create NTB EPC\n" ); - goto err_bar_init; +return ret; } ret =epf_ntb_config_spad_bar_alloc (ntb);
@@ -1565,9 +1553,6 @@ static int epf_ntb_bind(struct pci_epf *epf) err_bar_alloc:epf_ntb_config_spad_bar_free (ntb); -err_bar_init: -epf_ntb_epc_destroy (ntb); -return ret; }
@@ -1583,7 +1568,6 @@ static void epf_ntb_unbind(struct pci_epf *epf)epf_ntb_epc_cleanup (ntb);epf_ntb_config_spad_bar_free (ntb); -epf_ntb_epc_destroy (ntb);pci_unregister_driver (&vntb_pci_driver); }
drivers/staging/rtl8723bs/core/rtw_security.c +1 -1
@@ -1291,7 +1291,7 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe)u8 mic[16 ];struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;__le16 le_tmp; -__le64 le_tmp64; +__le64 le_tmp64 =0 ; ori_len = pattrib->pkt_len -WLAN_HDR_A3_LEN +BIP_AAD_SIZE ;BIP_AAD =kzalloc (ori_len,GFP_KERNEL );
drivers/staging/sm750fb/sm750.c +3 -0
@@ -481,6 +481,9 @@ static int lynxfb_ops_check_var(struct fb_var_screeninfo *var,struct lynxfb_crtc *crtc;resource_size_t request; +if (!var->pixclock) +return -EINVAL ; + ret =0 ; par = info->par; crtc = &par->crtc;
drivers/usb/class/cdc-acm.c +46 -7
101 lines not on this page · raw message
drivers/usb/core/port.c +1 -0
@@ -141,6 +141,7 @@ static ssize_t disable_store(struct device *dev, struct device_attribute *attr,usb_disconnect (&port_dev->child); rc =usb_hub_set_port_power (hdev, hub, port1, !disabled); +msleep (2 *hub_power_on_good_delay (hub));if (disabled) {usb_clear_port_feature (hdev, port1,USB_PORT_FEAT_C_CONNECTION );
drivers/usb/gadget/function/f_hid.c +10 -5
@@ -106,7 +106,7 @@ struct f_hidg {struct list_head report_list;struct device dev; -struct cdev cdev; +struct cdev *cdev;struct usb_function func;struct usb_ep *in_ep;
@@ -749,8 +749,9 @@ static int f_hidg_release(struct inode *inode, struct file *fd)static int f_hidg_open (struct inode *inode,struct file *fd) { +struct kobject *parent = inode->i_cdev->kobj.parent;struct f_hidg *hidg = - container_of(inode->i_cdev, struct f_hidg, cdev); + container_of(parent, struct f_hidg, dev.kobj); fd->private_data = hidg;
@@ -1276,8 +1277,12 @@ static int hidg_bind(struct usb_configuration *c, struct usb_function *f) }/* create char device */ -cdev_init (&hidg->cdev, &f_hidg_fops); - status =cdev_device_add (&hidg->cdev, &hidg->dev); + hidg->cdev =cdev_alloc (); +if (!hidg->cdev) + goto fail_free_all; + hidg->cdev->ops = &f_hidg_fops; + + status =cdev_device_add (hidg->cdev, &hidg->dev);if (status) goto fail_free_all;
@@ -1579,7 +1584,7 @@ static void hidg_unbind(struct usb_configuration *c, struct usb_function *f) {struct f_hidg *hidg =func_to_hidg (f); -cdev_device_del (&hidg->cdev, &hidg->dev); +cdev_device_del (hidg->cdev, &hidg->dev);destroy_workqueue (hidg->workqueue);usb_free_all_descriptors (f); }
drivers/usb/gadget/function/f_ncm.c +2 -2
@@ -1210,8 +1210,8 @@ static int ncm_unwrap_ntb(struct gether *port, block_len =get_ncm (&tmp, opts->block_length);/* (d)wBlockLength */ -if (block_len > ntb_max) { -INFO (port->func.config->cdev,"OUT size exceeded\n" ); +if ((block_len < opts->nth_size + opts->ndp_size) || (block_len > ntb_max)) { +INFO (port->func.config->cdev,"Bad block length: %#X\n" , block_len); goto err; }
drivers/usb/gadget/function/f_phonet.c +9 -0
@@ -333,6 +333,15 @@ static void pn_rx_complete(struct usb_ep *ep, struct usb_request *req)if (unlikely (!skb))break ; +if (unlikely (skb_shinfo (skb)->nr_frags >=MAX_SKB_FRAGS )) { +/* Frame count from host exceeds frags[] capacity */ +dev_kfree_skb_any (skb); +if (fp->rx.skb == skb) + fp->rx.skb =NULL ; + dev->stats.rx_length_errors++; +break ; + } +if (skb->len ==0 ) {/* First fragment */ skb->protocol =htons (ETH_P_PHONET );skb_reset_mac_header (skb);
drivers/usb/gadget/udc/renesas_usb3.c +6 -1
@@ -1669,6 +1669,10 @@ static bool usb3_std_req_get_status(struct renesas_usb3 *usb3,break ;case USB_RECIP_ENDPOINT : num =le16_to_cpu (ctrl->wIndex) &USB_ENDPOINT_NUMBER_MASK ; +if (num >= usb3->num_usb3_eps) { + stall = true; +break ; + } usb3_ep =usb3_get_ep (usb3, num);if (usb3_ep->halt) status |=1 <<USB_ENDPOINT_HALT ;
@@ -1781,7 +1785,8 @@ static bool usb3_std_req_feature_endpoint(struct renesas_usb3 *usb3,struct renesas_usb3_ep *usb3_ep;struct renesas_usb3_request *usb3_req; -if (le16_to_cpu (ctrl->wValue) !=USB_ENDPOINT_HALT ) +if ((le16_to_cpu (ctrl->wValue) !=USB_ENDPOINT_HALT ) || + (num >= usb3->num_usb3_eps))return true;/* stall */ usb3_ep =usb3_get_ep (usb3, num);
drivers/usb/serial/option.c +2 -0
@@ -1383,6 +1383,8 @@ static const struct usb_device_id option_ids[] = { .driver_info = NCTRL(2) | RSVD(3) }, { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1073, 0xff), /* Telit FN990A (ECM) */ .driver_info = NCTRL(0) | RSVD(1) }, + { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1074, 0xff), /* Telit FN990A (MBIM) */ + .driver_info = NCTRL(5) | RSVD(6) | RSVD(7) }, { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1075, 0xff), /* Telit FN990A (PCIe) */ .driver_info = RSVD(0) }, { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1077, 0xff), /* Telit FN990A (rmnet + audio) */
drivers/usb/storage/unusual_devs.h +4 -3
@@ -2350,10 +2350,11 @@ UNUSUAL_DEV( 0x2027, 0xa001, 0x0000, 0x9999, US_FL_SCM_MULT_TARG ),/* -* Reported by DocMAX <[email protected]> -* and Thomas Weißschuh <[email protected]> +* Reported by DocMAX <[email protected]>, +* Thomas Weißschuh <[email protected]> +* and Daniel Brát <[email protected]> */ -UNUSUAL_DEV( 0x2109, 0x0715, 0x9999, 0x9999, +UNUSUAL_DEV( 0x2109, 0x0715, 0x0000, 0x9999, "VIA Labs, Inc.", "VL817 SATA Bridge", USB_SC_DEVICE, USB_PR_DEVICE, NULL,
drivers/usb/typec/tcpm/fusb302.c +3 -2
@@ -1755,8 +1755,9 @@ static int fusb302_probe(struct i2c_client *client) goto destroy_workqueue; } - ret =request_irq (chip->gpio_int_n_irq, fusb302_irq_intn, -IRQF_TRIGGER_LOW ,"fsc_interrupt_int_n" , chip); + ret =request_threaded_irq (chip->gpio_int_n_irq,NULL , fusb302_irq_intn, +IRQF_ONESHOT |IRQF_TRIGGER_LOW , +"fsc_interrupt_int_n" , chip);if (ret <0 ) {dev_err (dev,"cannot request IRQ for GPIO Int_N, ret=%d" , ret); goto tcpm_unregister_port;
drivers/usb/usbip/usbip_common.c +12 -0
@@ -470,6 +470,18 @@ static void usbip_pack_ret_submit(struct usbip_header *pdu, struct urb *urb, urb->status = rpdu->status; urb->actual_length = rpdu->actual_length; urb->start_frame = rpdu->start_frame; +/* +* The number_of_packets field determines the length of +* iso_frame_desc[], which is a flexible array allocated +* at URB creation time. A response must never claim more +* packets than originally submitted; doing so would cause +* an out-of-bounds write in usbip_recv_iso() and +* usbip_pad_iso(). Clamp to zero on violation so both +* functions safely return early. +*/ +if (rpdu->number_of_packets <0 || + rpdu->number_of_packets > urb->number_of_packets) + rpdu->number_of_packets =0 ; urb->number_of_packets = rpdu->number_of_packets; urb->error_count = rpdu->error_count; }
drivers/vfio/pci/xe/main.c +25 -18
71 lines not on this page · raw message
drivers/video/fbdev/tdfxfb.c +3 -0
@@ -496,6 +496,9 @@ static int tdfxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) } } +if (!var->pixclock) +return -EINVAL ; +if (PICOS2KHZ (var->pixclock) > par->max_pixclock) {DPRINTK ("pixclock too high (%ldKHz)\n" ,PICOS2KHZ (var->pixclock));
drivers/video/fbdev/udlfb.c +3 -0
@@ -1018,6 +1018,9 @@ static int dlfb_ops_check_var(struct fb_var_screeninfo *var,struct fb_videomode mode;struct dlfb_data *dlfb = info->par; +if (!var->pixclock) +return -EINVAL ; +/* set device-specific elements of var unrelated to mode */ dlfb_var_color_format (var);
fs/dcache.c +2 -2
@@ -3257,7 +3257,7 @@ static void __init dcache_init_early(void)HASH_EARLY |HASH_ZERO , &d_hash_shift,NULL , -0 , +2 , 0); d_hash_shift =32 - d_hash_shift;
@@ -3289,7 +3289,7 @@ static void __init dcache_init(void)HASH_ZERO , &d_hash_shift,NULL , -0 , +2 , 0); d_hash_shift =32 - d_hash_shift;
fs/nilfs2/dat.c +3 -0
@@ -524,6 +524,9 @@ int nilfs_dat_read(struct super_block *sb, size_t entry_size,if (err) goto failed; + err =nilfs_attach_btree_node_cache (dat); +if (err) + goto failed; err =nilfs_read_inode_common (dat, raw_inode);if (err) goto failed;
fs/ocfs2/aops.c +1 -2
@@ -2294,8 +2294,6 @@ static int ocfs2_dio_end_io_write(struct inode *inode, goto out; } -down_write (&oi->ip_alloc_sem); -/* Delete orphan before acquire i_rwsem. */ if (dwc->dw_orphaned) {BUG_ON (dwc->dw_writer_pid !=task_pid_nr (current));
@@ -2308,6 +2306,7 @@ static int ocfs2_dio_end_io_write(struct inode *inode,mlog_errno (ret); } +down_write (&oi->ip_alloc_sem); di = (struct ocfs2_dinode *)di_bh->b_data;ocfs2_init_dinode_extent_tree (&et,INODE_CACHE (inode), di_bh);
fs/ocfs2/mmap.c +3 -4
@@ -30,7 +30,8 @@static vm_fault_t ocfs2_fault (struct vm_fault *vmf) { -struct vm_area_struct *vma = vmf->vma; +unsigned long long ip_blkno = +OCFS2_I (file_inode (vmf->vma->vm_file))->ip_blkno;sigset_t oldset;vm_fault_t ret;
@@ -38,11 +39,9 @@ static vm_fault_t ocfs2_fault(struct vm_fault *vmf) ret =filemap_fault (vmf);ocfs2_unblock_signals (&oldset); -trace_ocfs2_fault (OCFS2_I (vma->vm_file->f_mapping->host)->ip_blkno, - vma, vmf->page, vmf->pgoff); +trace_ocfs2_fault (ip_blkno, vmf->page, vmf->pgoff);return ret; } -static vm_fault_t __ocfs2_page_mkwrite (struct file *file,struct buffer_head *di_bh,struct folio *folio) {
fs/ocfs2/ocfs2_trace.h +4 -6
@@ -1246,22 +1246,20 @@ TRACE_EVENT(ocfs2_write_end_inline,TRACE_EVENT (ocfs2_fault, TP_PROTO(unsigned long long ino, - void *area, void *page, unsigned long pgoff), -TP_ARGS (ino, area, page, pgoff), + void *page, unsigned long pgoff), +TP_ARGS (ino, page, pgoff),TP_STRUCT__entry ( __field(unsigned long long, ino) - __field(void *, area) __field(void *, page) __field(unsigned long, pgoff) ),TP_fast_assign ( __entry->ino = ino; - __entry->area = area; __entry->page = page; __entry->pgoff = pgoff; ), -TP_printk ("%llu %p %p %lu" , - __entry->ino, __entry->area, __entry->page, __entry->pgoff) +TP_printk ("%llu %p %lu" , + __entry->ino, __entry->page, __entry->pgoff) );/* End of trace events for fs/ocfs2/mmap.c. */
fs/ocfs2/resize.c +7 -3
@@ -303,9 +303,13 @@ int ocfs2_group_extend(struct inode * inode, int new_clusters) fe = (struct ocfs2_dinode *)main_bm_bh->b_data; -/* main_bm_bh is validated by inode read inside ocfs2_inode_lock(), -* so any corruption is a code bug. */ -BUG_ON (!OCFS2_IS_VALID_DINODE (fe)); +/* JBD-managed buffers can bypass validation, so treat this as corruption. */ +if (!OCFS2_IS_VALID_DINODE (fe)) { + ret =ocfs2_error (main_bm_inode->i_sb, +"Invalid dinode #%llu\n" , + (unsigned long long )OCFS2_I (main_bm_inode)->ip_blkno); + goto out_unlock; + }if (le16_to_cpu (fe->id2.i_chain.cl_cpg) != ocfs2_group_bitmap_size(osb->sb, 0,
fs/smb/client/smb2file.c +12 -8
@@ -27,10 +27,11 @@ static struct smb2_symlink_err_rsp *symlink_data(const struct kvec *iov) {struct smb2_err_rsp *err = iov->iov_base;struct smb2_symlink_err_rsp *sym =ERR_PTR (-EINVAL ); +u8 *end = (u8 *)err + iov->iov_len;u32 len;if (err->ErrorContextCount) { -struct smb2_error_context_rsp *p, *end; +struct smb2_error_context_rsp *p; len = (u32)err->ErrorContextCount * (offsetof(struct smb2_error_context_rsp, ErrorContextData) +
@@ -39,8 +40,7 @@ static struct smb2_symlink_err_rsp *symlink_data(const struct kvec *iov)return ERR_PTR (-EINVAL ); p = (struct smb2_error_context_rsp *)err->ErrorData; - end = (struct smb2_error_context_rsp *)((u8 *)err + iov->iov_len); - do { +while ((u8 *)p +sizeof (*p) <= end) {if (le32_to_cpu (p->ErrorId) ==SMB2_ERROR_ID_DEFAULT ) { sym = (struct smb2_symlink_err_rsp *)p->ErrorContextData;break ;
@@ -50,14 +50,16 @@ static struct smb2_symlink_err_rsp *symlink_data(const struct kvec *iov) len =ALIGN (le32_to_cpu (p->ErrorDataLength),8 ); p = (struct smb2_error_context_rsp *)(p->ErrorContextData + len); - }while (p < end); + } }else if (le32_to_cpu (err->ByteCount) >=sizeof (*sym) && iov->iov_len >=SMB2_SYMLINK_STRUCT_SIZE ) { sym = (struct smb2_symlink_err_rsp *)err->ErrorData; } -if (!IS_ERR (sym) && (le32_to_cpu (sym->SymLinkErrorTag) !=SYMLINK_ERROR_TAG || -le32_to_cpu (sym->ReparseTag) !=IO_REPARSE_TAG_SYMLINK )) +if (!IS_ERR (sym) && + ((u8 *)sym +sizeof (*sym) > end || +le32_to_cpu (sym->SymLinkErrorTag) !=SYMLINK_ERROR_TAG || +le32_to_cpu (sym->ReparseTag) !=IO_REPARSE_TAG_SYMLINK )) sym =ERR_PTR (-EINVAL );return sym;
@@ -128,8 +130,10 @@ int smb2_parse_symlink_response(struct cifs_sb_info *cifs_sb, const struct kvec print_len =le16_to_cpu (sym->PrintNameLength); print_offs =le16_to_cpu (sym->PrintNameOffset); -if (iov->iov_len <SMB2_SYMLINK_STRUCT_SIZE + sub_offs + sub_len || - iov->iov_len <SMB2_SYMLINK_STRUCT_SIZE + print_offs + print_len) +if ((char *)sym->PathBuffer + sub_offs + sub_len > + (char *)iov->iov_base + iov->iov_len || + (char *)sym->PathBuffer + print_offs + print_len > + (char *)iov->iov_base + iov->iov_len)return -EINVAL ; return smb2_parse_native_symlink(path,
fs/smb/client/smb2inode.c +1 -1
@@ -128,7 +128,7 @@ static int check_wsl_eas(struct kvec *rsp_iov) nlen = ea->ea_name_length; vlen =le16_to_cpu (ea->ea_value_length);if (nlen !=SMB2_WSL_XATTR_NAME_LEN || - (u8 *)ea + nlen +1 + vlen > end) + (u8 *)ea->ea_data + nlen +1 + vlen > end)return -EINVAL ;switch (vlen) {
fs/smb/client/smbdirect.c +8 -0
@@ -1551,17 +1551,25 @@ static int smbd_post_send_iter(struct smbdirect_socket *sc, rc =smbd_post_send (sc, batch, request);if (!rc) { +/* +* From here request is moved to batch +* and we should not free it explicitly. +*/ +if (batch != &_batch)return 0 ; rc =smbd_send_batch_flush (sc, batch, true);if (!rc)return 0 ; + + goto err_flush; } err_dma:smbd_free_send_io (request); +err_flush: err_alloc:atomic_inc (&sc->send_io.credits.count);wake_up (&sc->send_io.credits.wait_queue);
fs/smb/server/connection.c +1 -0
@@ -96,6 +96,7 @@ void ksmbd_conn_free(struct ksmbd_conn *conn)xa_destroy (&conn->sessions);kvfree (conn->request_buf);kfree (conn->preauth_info); +kfree (conn->mechToken);if (atomic_dec_and_test (&conn->refcnt)) { conn->transport->ops->free_transport (conn->transport);kfree (conn);
fs/smb/server/smb2pdu.c +6 -1
@@ -1915,7 +1915,7 @@ int smb2_sess_setup(struct ksmbd_work *work)else if (rc) rsp->hdr.Status =STATUS_LOGON_FAILURE ; -if (conn->use_spnego && conn->mechToken) { +if (conn->mechToken) {kfree (conn->mechToken); conn->mechToken =NULL ; }
@@ -4716,6 +4716,11 @@ static int smb2_get_ea(struct ksmbd_work *work, struct ksmbd_file *fp, ea_req = (struct smb2_ea_info_req *)((char *)req +le16_to_cpu (req->InputBufferOffset)); + +if (le32_to_cpu (req->InputBufferLength) < + offsetof(struct smb2_ea_info_req , name) + + ea_req->EaNameLength) +return -EINVAL ; }else {/* need to send all EAs, if no specific EA is requested*/ if (le32_to_cpu (req->Flags) &SL_RETURN_SINGLE_ENTRY )
fs/smb/server/smbacl.c +2 -1
@@ -451,7 +451,8 @@ static void parse_dacl(struct mnt_idmap *idmap, ppace[i]->access_req =smb_map_generic_desired_access (ppace[i]->access_req); -if (!(compare_sids (&ppace[i]->sid, &sid_unix_NFS_mode))) { +if (ppace[i]->sid.num_subauth >=3 && + !(compare_sids (&ppace[i]->sid, &sid_unix_NFS_mode))) { fattr->cf_mode =le32_to_cpu (ppace[i]->sid.sub_auth[2 ]);break ;
fs/smb/server/transport_rdma.c +7 -1
@@ -1588,15 +1588,21 @@ static int smb_direct_post_send_data(struct smbdirect_socket *sc,if (ret) goto err; +/* +* From here msg is moved to send_ctx +* and we should not free it explicitly. +*/ +if (send_ctx == &_send_ctx) { ret =smb_direct_flush_send_list (sc, send_ctx, true);if (ret) - goto err; + goto flush_failed; }return 0 ; err:smb_direct_free_sendmsg (sc, msg); +flush_failed: header_failed:atomic_inc (&sc->send_io.credits.count); credit_failed:
include/linux/hugetlb.h +17 -0
@@ -796,6 +796,23 @@ static inline unsigned huge_page_shift(struct hstate *h)return h->order +PAGE_SHIFT ; } +/** +* hugetlb_linear_page_index() - linear_page_index() but in hugetlb +* page size granularity. +* @vma: the hugetlb VMA +* @address: the virtual address within the VMA +* +* Return: the page offset within the mapping in huge page units. +*/ +static inline pgoff_t hugetlb_linear_page_index (struct vm_area_struct *vma, +unsigned long address) +{ +struct hstate *h =hstate_vma (vma); + +return ((address - vma->vm_start) >>huge_page_shift (h)) + + (vma->vm_pgoff >>huge_page_order (h)); +} +static inline bool order_is_gigantic (unsigned int order) {return order >MAX_PAGE_ORDER ;
include/linux/kvm_host.h +9 -1
@@ -318,7 +318,8 @@ static inline bool kvm_vcpu_can_poll(ktime_t cur, ktime_t stop)struct kvm_mmio_fragment {gpa_t gpa;void *data; -unsigned len; +u64 val; +unsigned int len; };struct kvm_vcpu {
@@ -1029,6 +1030,13 @@ static inline struct kvm_vcpu *kvm_get_vcpu_by_id(struct kvm *kvm, int id)return NULL ; } +static inline bool kvm_is_vcpu_creation_in_progress (struct kvm *kvm) +{ +lockdep_assert_held (&kvm->lock); + +return kvm->created_vcpus !=atomic_read (&kvm->online_vcpus); +} +void kvm_destroy_vcpus (struct kvm *kvm);int kvm_trylock_all_vcpus (struct kvm *kvm);
include/linux/uaccess.h +8 -3
@@ -331,16 +331,21 @@ static inline size_t probe_subpage_writeable(char __user *uaddr, size_t size)#endif /* CONFIG_ARCH_HAS_SUBPAGE_FAULTS */ -#ifndef ARCH_HAS_NOCACHE_UACCESS +#ifndef ARCH_HAS_NONTEMPORAL_UACCESS static inline __must_check unsigned long -__copy_from_user_inatomic_nocache (void *to,const void __user *from, +copy_from_user_inatomic_nontemporal (void *to,const void __user *from,unsigned long n) { +if (can_do_masked_user_access ()) + from =mask_user_address (from); +else +if (!access_ok (from, n)) +return n;return __copy_from_user_inatomic (to, from, n); } -#endif /* ARCH_HAS_NOCACHE_UACCESS */ +#endif /* ARCH_HAS_NONTEMPORAL_UACCESS */ extern __must_check int check_zeroed_user (const void __user *from,size_t size);
kernel/time/clockevents.c +6 -1
@@ -94,6 +94,9 @@ static int __clockevents_switch_state(struct clock_event_device *dev,if (dev->features &CLOCK_EVT_FEAT_DUMMY )return 0 ; +/* On state transitions clear the forced flag unconditionally */ + dev->next_event_forced =0 ; +/* Transition with new state-specific callbacks */ switch (state) {case CLOCK_EVT_STATE_DETACHED :
@@ -332,8 +335,10 @@ int clockevents_program_event(struct clock_event_device *dev, ktime_t expires,if (delta > (int64_t )dev->min_delta_ns) { delta =min (delta, (int64_t ) dev->max_delta_ns); clc = ((unsigned long long ) delta * dev->mult) >> dev->shift; -if (!dev->set_next_event ((unsigned long ) clc, dev)) +if (!dev->set_next_event ((unsigned long ) clc, dev)) { + dev->next_event_forced =0 ;return 0 ; + } }if (dev->next_event_forced)
kernel/time/tick-broadcast.c +1 -0
@@ -108,6 +108,7 @@ static struct clock_event_device *tick_get_oneshot_wakeup_device(int cpu)static void tick_oneshot_wakeup_handler (struct clock_event_device *wd) { + wd->next_event_forced =0 ;/* * If we woke up early and the tick was reprogrammed in the * meantime then this may be spurious but harmless.
lib/iov_iter.c +2 -2
@@ -277,7 +277,7 @@ static __always_inlinesize_t copy_from_user_iter_nocache (void __user *iter_from,size_t progress,size_t len,void *to,void *priv2) { -return __copy_from_user_inatomic_nocache (to + progress, iter_from, len); +return copy_from_user_inatomic_nontemporal (to + progress, iter_from, len); }size_t _copy_from_iter_nocache (void *addr,size_t bytes,struct iov_iter *i)
@@ -296,7 +296,7 @@ static __always_inlinesize_t copy_from_user_iter_flushcache (void __user *iter_from,size_t progress,size_t len,void *to,void *priv2) { -return __copy_from_user_flushcache (to + progress, iter_from, len); +return copy_from_user_flushcache (to + progress, iter_from, len); } static __always_inline
mm/backing-dev.c +3 -2
@@ -618,12 +618,13 @@ static void cgwb_release_workfn(struct work_struct *work)wb_shutdown (wb);css_put (wb->memcg_css); -css_put (wb->blkcg_css); -mutex_unlock (&wb->bdi->cgwb_release_mutex);/* triggers blkg destruction if no online users left */ blkcg_unpin_online (wb->blkcg_css); +css_put (wb->blkcg_css); +mutex_unlock (&wb->bdi->cgwb_release_mutex); +fprop_local_destroy_percpu (&wb->memcg_completions);spin_lock_irq (&cgwb_lock);
mm/filemap.c +2 -1
@@ -228,7 +228,8 @@ void __filemap_remove_folio(struct folio *folio, void *shadow)page_cache_delete (mapping, folio, shadow); } -void filemap_free_folio (struct address_space *mapping,struct folio *folio) +static void filemap_free_folio (const struct address_space *mapping, +struct folio *folio) {void (*free_folio)(struct folio *);
mm/internal.h +0 -1
@@ -540,7 +540,6 @@ unsigned find_lock_entries(struct address_space *mapping, pgoff_t *start, pgoff_t end, struct folio_batch *fbatch, pgoff_t *indices);unsigned find_get_entries (struct address_space *mapping,pgoff_t *start,pgoff_t end,struct folio_batch *fbatch,pgoff_t *indices); -void filemap_free_folio (struct address_space *mapping,struct folio *folio);int truncate_inode_folio (struct address_space *mapping,struct folio *folio);bool truncate_inode_partial_folio (struct folio *folio,loff_t start,loff_t end);
mm/kasan/init.c +4 -4
@@ -292,7 +292,7 @@ static void kasan_free_pte(pte_t *pte_start, pmd_t *pmd)return ; } -pte_free_kernel (&init_mm, (pte_t *)page_to_virt (pmd_page (*pmd))); +pte_free_kernel (&init_mm, pte_start);pmd_clear (pmd); }
@@ -307,7 +307,7 @@ static void kasan_free_pmd(pmd_t *pmd_start, pud_t *pud)return ; } -pmd_free (&init_mm, (pmd_t *)page_to_virt (pud_page (*pud))); +pmd_free (&init_mm, pmd_start);pud_clear (pud); }
@@ -322,7 +322,7 @@ static void kasan_free_pud(pud_t *pud_start, p4d_t *p4d)return ; } -pud_free (&init_mm, (pud_t *)page_to_virt (p4d_page (*p4d))); +pud_free (&init_mm, pud_start);p4d_clear (p4d); }
@@ -337,7 +337,7 @@ static void kasan_free_p4d(p4d_t *p4d_start, pgd_t *pgd)return ; } -p4d_free (&init_mm, (p4d_t *)page_to_virt (pgd_page (*pgd))); +p4d_free (&init_mm, p4d_start);pgd_clear (pgd); }
mm/truncate.c +5 -1
@@ -622,6 +622,7 @@ static int folio_launder(struct address_space *mapping, struct folio *folio)int folio_unmap_invalidate (struct address_space *mapping,struct folio *folio,gfp_t gfp) { +void (*free_folio)(struct folio *);int ret;VM_BUG_ON_FOLIO (!folio_test_locked (folio), folio);
@@ -648,9 +649,12 @@ int folio_unmap_invalidate(struct address_space *mapping, struct folio *folio,xa_unlock_irq (&mapping->i_pages);if (mapping_shrinkable (mapping))inode_lru_list_add (mapping->host); + free_folio = mapping->a_ops->free_folio;spin_unlock (&mapping->host->i_lock); -filemap_free_folio (mapping, folio); +if (free_folio) +free_folio (folio); +folio_put_refs (folio,folio_nr_pages (folio));return 1 ; failed:xa_unlock_irq (&mapping->i_pages);
mm/userfaultfd.c +1 -1
@@ -573,7 +573,7 @@ static __always_inline ssize_t mfill_atomic_hugetlb(* in the case of shared pmds. fault mutex prevents * races with other faulting threads. */ - idx =linear_page_index (dst_vma, dst_addr); + idx =hugetlb_linear_page_index (dst_vma, dst_addr); mapping = dst_vma->vm_file->f_mapping; hash =hugetlb_fault_mutex_hash (mapping, idx);mutex_lock (&hugetlb_fault_mutex_table[hash]);
net/can/raw.c +10 -1
@@ -361,6 +361,14 @@ static int raw_notifier(struct notifier_block *nb, unsigned long msg,return NOTIFY_DONE ; } +static void raw_sock_destruct (struct sock *sk) +{ +struct raw_sock *ro =raw_sk (sk); + +free_percpu (ro->uniq); +can_sock_destruct (sk); +} +static int raw_init (struct sock *sk) {struct raw_sock *ro =raw_sk (sk);
@@ -387,6 +395,8 @@ static int raw_init(struct sock *sk)if (unlikely (!ro->uniq))return -ENOMEM ; + sk->sk_destruct = raw_sock_destruct; +/* set notifier */ spin_lock (&raw_notifier_lock);list_add_tail (&ro->notifier, &raw_notifier_list);
@@ -436,7 +446,6 @@ static int raw_release(struct socket *sock) ro->bound =0 ; ro->dev =NULL ; ro->count =0 ; -free_percpu (ro->uniq);sock_orphan (sk); sock->sk =NULL ;
net/nfc/digital_technology.c +6 -0
@@ -424,6 +424,12 @@ static void digital_in_recv_sdd_res(struct nfc_digital_dev *ddev, void *arg, size =4 ; } +if (target->nfcid1_len + size >NFC_NFCID1_MAXSIZE ) { +PROTOCOL_ERR ("4.7.2.1" ); + rc = -EPROTO ; + goto exit; + } +memcpy (target->nfcid1 + target->nfcid1_len, sdd_res->nfcid1 + offset, size); target->nfcid1_len += size;
net/nfc/llcp_core.c +2 -0
@@ -1091,6 +1091,7 @@ static void nfc_llcp_recv_hdlc(struct nfc_llcp_local *local,if (sk->sk_state ==LLCP_CLOSED ) {release_sock (sk);nfc_llcp_sock_put (llcp_sock); +return ; }/* Pass the payload upstream */
@@ -1182,6 +1183,7 @@ static void nfc_llcp_recv_disc(struct nfc_llcp_local *local,if (sk->sk_state ==LLCP_CLOSED ) {release_sock (sk);nfc_llcp_sock_put (llcp_sock); +return ; }if (sk->sk_state ==LLCP_CONNECTED ) {
scripts/checkpatch.pl +10 -0
@@ -641,6 +641,7 @@ our $signature_tags = qr{(?xi: Reviewed-by:| Reported-by:| Suggested-by:| + Assisted-by:| To:| Cc: )};
@@ -3105,6 +3106,15 @@ sub process { } } + # Assisted-by uses AGENT_NAME:MODEL_VERSION format, not email + if ($sign_off =~ /^Assisted-by:/i) { + if ($email !~ /^\S+:\S+/) { + WARN("BAD_SIGN_OFF", + "Assisted-by expects 'AGENT_NAME:MODEL_VERSION [TOOL1] [TOOL2]' format\n" . $herecurr); + } + next; + } + my ($email_name, $name_comment, $email_address, $comment) = parse_email($email); my $suggested_email = format_email(($email_name, $name_comment, $email_address, $comment)); if ($suggested_email eq "") {
scripts/gdb/linux/symbols.py +1 -1
@@ -298,7 +298,7 @@ are loaded as well.""" if p == "-bpf": monitor_bpf = True else: - p.append(os.path.abspath(os.path.expanduser(p))) + self.module_paths.append(os.path.abspath(os.path.expanduser(p))) self.module_paths.append(os.getcwd()) if self.breakpoint is not None:
scripts/generate_rust_analyzer.py +2 -1
@@ -190,9 +190,10 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs, core_edit def is_root_crate(build_file, target): try: - return f"{target}.o" in open(build_file).read() + contents = build_file.read_text() except FileNotFoundError: return False + return f"{target}.o" in contents # Then, the rest outside of `rust/`. #
sound/firewire/fireworks/fireworks_command.c +4 -1
@@ -151,10 +151,13 @@ efw_transaction(struct snd_efw *efw, unsigned int category, (be32_to_cpu(header->category) != category) || (be32_to_cpu(header->command) != command) || (be32_to_cpu(header->status) != EFR_STATUS_OK)) { +u32 st =be32_to_cpu (header->status); +dev_err (&efw->unit->device,"EFW command failed [%u/%u]: %s\n" ,be32_to_cpu (header->category),be32_to_cpu (header->command), - efr_status_names[be32_to_cpu (header->status)]); + st <ARRAY_SIZE (efr_status_names) ? + efr_status_names[st] :"unknown" ); err = -EIO ; goto end; }
sound/pci/ctxfi/ctvmem.h +1 -1
@@ -15,7 +15,7 @@#ifndef CTVMEM_H #define CTVMEM_H -#define CT_PTP_NUM 4/* num of device page table pages */ +#define CT_PTP_NUM 1/* num of device page table pages */ #include <linux/mutex.h> #include <linux/list.h>
sound/soc/qcom/qdsp6/q6apm.c +12 -2
@@ -747,13 +747,22 @@ static int apm_probe(gpr_device_t *gdev)q6apm_get_apm_state (apm); - ret =devm_snd_soc_register_component (dev, &q6apm_audio_component,NULL ,0 ); + ret =snd_soc_register_component (dev, &q6apm_audio_component,NULL ,0 );if (ret <0 ) {dev_err (dev,"failed to register q6apm: %d\n" , ret);return ret; } -return of_platform_populate (dev->of_node,NULL ,NULL , dev); + ret =of_platform_populate (dev->of_node,NULL ,NULL , dev); +if (ret) +snd_soc_unregister_component (dev); + +return ret; +} + +static void apm_remove (gpr_device_t *gdev) +{ +snd_soc_unregister_component (&gdev->dev); }struct audioreach_module *q6apm_find_module_by_mid (struct q6apm_graph *graph,uint32_t mid)
@@ -820,6 +829,7 @@ MODULE_DEVICE_TABLE(of, apm_device_id);static gpr_driver_t apm_driver = { .probe = apm_probe, + .remove = apm_remove, .gpr_callback = apm_callback, .driver = { .name ="qcom-apm" ,
sound/usb/6fire/chip.c +12 -5
@@ -53,11 +53,6 @@ static void usb6fire_chip_abort(struct sfire_chip *chip)usb6fire_comm_abort (chip);if (chip->control)usb6fire_control_abort (chip); -if (chip->card) { -snd_card_disconnect (chip->card); -snd_card_free_when_closed (chip->card); - chip->card =NULL ; - } } }
@@ -168,6 +163,7 @@ static int usb6fire_chip_probe(struct usb_interface *intf,static void usb6fire_chip_disconnect (struct usb_interface *intf) {struct sfire_chip *chip; +struct snd_card *card; chip =usb_get_intfdata (intf);if (chip) {/* if !chip, fw upload has been performed */
@@ -178,8 +174,19 @@ static void usb6fire_chip_disconnect(struct usb_interface *intf) chips[chip->regidx] =NULL ; } +/* +* Save card pointer before teardown. +* snd_card_free_when_closed() may free card (and +* the embedded chip) immediately, so it must be +* called last and chip must not be accessed after. +*/ + card = chip->card; chip->shutdown = true; +if (card) +snd_card_disconnect (card);usb6fire_chip_abort (chip); +if (card) +snd_card_free_when_closed (card); } } }
sound/usb/usx2y/us144mkii.c +5 -1
@@ -420,7 +420,11 @@ static int tascam_probe(struct usb_interface *intf,/* The device has two interfaces; we drive both from this driver. */ if (intf->cur_altsetting->desc.bInterfaceNumber ==1 ) { - tascam =usb_get_intfdata (usb_ifnum_to_if (dev,0 )); +struct usb_interface *intf_zero =usb_ifnum_to_if (dev,0 ); + +if (!intf_zero) +return -ENODEV ; + tascam =usb_get_intfdata (intf_zero);if (tascam) {usb_set_intfdata (intf, tascam); tascam->iface1 = intf;
tools/objtool/check.c +1 -1
@@ -1301,7 +1301,7 @@ static const char *uaccess_safe_builtin[] = {"copy_mc_enhanced_fast_string" ,"rep_stos_alternative" ,"rep_movs_alternative" , -"__copy_user_nocache" , +"copy_to_nontemporal" , NULL };
tools/testing/selftests/kvm/x86/sev_migrate_tests.c +0 -2
@@ -36,8 +36,6 @@ static struct kvm_vm *sev_vm_create(bool es)sev_vm_launch (vm, es ?SEV_POLICY_ES :0 ); -if (es) -vm_sev_ioctl (vm,KVM_SEV_LAUNCH_UPDATE_VMSA ,NULL );return vm; }
tools/testing/selftests/mm/hmm-tests.c +16 -67
185 lines not on this page · raw message