Linux 5.10.260
Greg Kroah-Hartman
maintainerI'm announcing the release of the 5.10.260 kernel.
All users of the 5.10 kernel series must upgrade.
The updated 5.10.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.10.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/userspace-api/ioctl/ioctl-number.rst | 427 +++++++-------- Makefile | 2 arch/mips/dec/prom/console.c | 7 arch/x86/kvm/svm/sev.c | 1 crypto/af_alg.c | 2 drivers/char/agp/amd64-agp.c | 2 drivers/crypto/qat/qat_common/adf_cfg_common.h | 32 - drivers/crypto/qat/qat_common/adf_cfg_user.h | 38 - drivers/crypto/qat/qat_common/adf_common_drv.h | 3 drivers/crypto/qat/qat_common/adf_ctl_drv.c | 421 -------------- drivers/crypto/qat/qat_common/adf_dev_mgr.c | 70 -- drivers/fpga/of-fpga-region.c | 3 drivers/gpu/drm/amd/display/dc/basics/vector.c | 2 drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 15 drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 12 drivers/gpu/drm/amd/display/dc/bios/bios_parser_helper.h | 5 drivers/hv/hv_kvp.c | 25 drivers/hv/vmbus_drv.c | 56 + drivers/i2c/i2c-stub.c | 5 drivers/infiniband/hw/bnxt_re/ib_verbs.c | 2 drivers/irqchip/irq-imgpdc.c | 6 drivers/media/test-drivers/vidtv/vidtv_mux.c | 8 drivers/misc/fastrpc.c | 9 drivers/mmc/host/renesas_sdhi_internal_dmac.c | 1 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 8 drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h | 1 drivers/net/ethernet/ti/cpsw_new.c | 4 drivers/net/netdevsim/dev.c | 1 drivers/net/wireless/ath/ath11k/dp.c | 1 drivers/net/wireless/mediatek/mt76/mt76x2/usb.c | 1 drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.h | 2 drivers/regulator/core.c | 10 drivers/slimbus/qcom-ngd-ctrl.c | 11 drivers/tty/vt/vc_screen.c | 2 drivers/usb/cdns3/gadget.c | 3 drivers/vfio/vfio_iommu_type1.c | 2 drivers/video/fbdev/core/fbmem.c | 12 drivers/video/fbdev/core/modedb.c | 2 fs/dlm/lockspace.c | 2 fs/exfat/dir.c | 4 fs/ext4/inline.c | 8 fs/f2fs/acl.c | 18 fs/fuse/dev.c | 4 fs/fuse/file.c | 8 fs/nfs/pnfs.c | 2 fs/nfsd/nfs2acl.c | 17 fs/nfsd/nfs3acl.c | 17 fs/nfsd/nfs4recover.c | 3 fs/nfsd/nfs4xdr.c | 3 fs/ocfs2/suballoc.c | 22 include/keys/request_key_auth-type.h | 2 include/linux/ring_buffer.h | 4 include/linux/skbuff.h | 12 include/net/phonet/pn_dev.h | 2 include/net/tc_act/tc_pedit.h | 80 ++ kernel/bpf/cgroup.c | 2 kernel/trace/ring_buffer.c | 72 -- kernel/trace/trace.c | 14 kernel/trace/trace_kdb.c | 8 net/9p/trans_fd.c | 1 net/batman-adv/bat_iv_ogm.c | 11 net/batman-adv/bat_v.c | 1 net/batman-adv/bat_v_ogm.c | 23 net/batman-adv/bridge_loop_avoidance.c | 28 net/batman-adv/distributed-arp-table.c | 12 net/batman-adv/fragmentation.c | 22 net/batman-adv/fragmentation.h | 3 net/batman-adv/netlink.c | 8 net/batman-adv/routing.c | 3 net/batman-adv/tp_meter.c | 113 ++- net/batman-adv/translation-table.c | 40 + net/batman-adv/tvlv.c | 69 ++ net/batman-adv/types.h | 21 net/ipv6/ip6_vti.c | 1 net/mac802154/llsec.c | 14 net/mptcp/protocol.c | 8 net/phonet/pn_dev.c | 12 net/phonet/pn_netlink.c | 23 net/sched/act_pedit.c | 390 +++++++------ net/sched/cls_u32.c | 13 net/tipc/crypto.c | 9 security/keys/internal.h | 2 security/keys/keyctl.c | 24 security/keys/keyctl_pkey.c | 9 security/keys/request_key_auth.c | 33 + 86 files changed, 1187 insertions(+), 1227 deletions(-)
Abel Vesa (1):
misc: fastrpc: Add dma_mask to fastrpc_channel_ctx
André Draszik (1):
regulator: core: fix locking in regulator_resolve_supply() error path
Ashutosh Desai (1):
KVM: SVM: Fix page overflow in sev_dbg_crypt() for ENCRYPT path
Bagas Sanjaya (1):
Documentation: ioctl-number: Extend "Include File" column width
Bitterblue Smith (1):
wifi: rtlwifi: rtl8821ae: Fix C2H bit location in RX descriptor
Bjoern Doebel (1):
ring-buffer: Remove ring_buffer_read_prepare_sync()
Bjorn Andersson (1):
slimbus: qcom-ngd-ctrl: Register callbacks after creating the ngd
Dawei Feng (1):
bpf: use kvfree() for replaced sysctl write buffer
Dexuan Cui (1):
Drivers: hv: vmbus: Improve the logic of reserving fb_mmio on Gen2 VMs
Dominik Woźniak (1):
nfsd: check get_user() return when reading princhashlen
Doruk Tan Ozturk (2):
mac802154: llsec: add skb_cow_data() before in-place crypto
tipc: fix slab-use-after-free Read in tipc_aead_decrypt_done
Eric Dumazet (3):
ip6_vti: set netns_immutable on the fallback device.
net: add skb_header_pointer_careful() helper net/sched: cls_u32: use skb_header_pointer_careful()
Giovanni Cabiddu (1):
crypto: qat - remove unused character device and IOCTLs
Greg Kroah-Hartman (1):
Linux 5.10.260
Guannan Wang (1):
NFSD: Fix SECINFO_NO_NAME decode error cleanup
Hangyu Hua (1):
net: 9p: fix refcount leak in p9_read_work() error handling
Harry Wentland (2):
drm/amd/display: Bound VBIOS record-chain walk loops drm/amd/display: Use krealloc_array() in dal_vector_reserve()
Herbert Xu (2):
crypto: qat - Return pointer directly in adf_ctl_alloc_resources
crypto: af_alg - Set merge to zero early in af_alg_sendmsg
Ian Bridges (1):
fbdev: Fix fb_new_modelist to prevent null-ptr-deref in fb_videomode_to_var
Jann Horn (1):
fuse: limit FUSE_NOTIFY_RETRIEVE to uptodate folios
Jarkko Sakkinen (1):
KEYS: fix overflow in keyctl_pkey_params_get_2()
Jeff Layton (1):
nfsd: fix posix_acl leak on SETACL decode failure
Jiacheng Shi (1):
vfio/iommu_type1: replace kfree with kvfree
Jose Ignacio Tornos Martinez (1):
wifi: ath11k: fix warning when unbinding
Junrui Luo (1):
misc: fastrpc: fix DMA address corruption due to find_vma misuse
Kevin Hao (1):
net: cpsw_new: Fix potential unregister of netdev that has not been registered yet
Kuniyuki Iwashima (2):
phonet: Pass ifindex to fill_addr().
phonet: Pass net and ifindex to phonet_address_notify().
Kyle Meyer (1):
bnxt_en: Fix NULL pointer dereference
Lad Prabhakar (1):
mmc: renesas_sdhi: Add OF entry for RZ/G2H SoC
Lord Ulf Henrik Holmberg (1):
RDMA/bnxt_re: zero shared page before exposing to userspace
Maciej W. Rozycki (1):
MIPS: DEC: Prevent initial console buffer from landing in XKPHYS
Max Tottenham (1):
net/sched: act_pedit: Parse L3 Header for L4 offset
Michael Bommarito (1):
exfat: fix potential use-after-free in exfat_find_dir_entry()
Michael Chan (1):
bnxt_en: Modify bnxt_disable_int_sync() to be called more than once.
Miklos Szeredi (1):
virtiofs: fix UAF on submount umount
Mingyu Wang (1):
agp/amd64: Fix broken error propagation in agp_amd64_probe()
Mukesh Ojha (1):
misc: fastrpc: Fix NULL pointer dereference in rpmsg callback
Paolo Abeni (1):
mptcp: fix missing wakeups in edge scenarios
Pedro Tammela (8):
net/sched: act_pedit: use NLA_POLICY for parsing 'ex' keys net/sched: transition act_pedit to rcu and percpu stats net/sched: simplify tcf_pedit_act
net/sched: act_pedit: remove extra check for key type net/sched: act_pedit: check static offsets a priori net/sched: act_pedit: rate limit datapath messages net/sched: act_pedit: free pedit keys on bail from offset check net/sched: act_pedit: fix action bind logic
Qingshuang Fu (1):
irqchip/imgpdc: Fix resource leak, add missing chained handler cleanup on remove
Rajat Gupta (1):
net/sched: fix pedit partial COW leading to page cache corruption
Ruslan Valiyev (1):
media: vidtv: fix NULL pointer dereference in vidtv_mux_push_si
Santosh Kalluri (1):
net: phonet: free phonet_device after RCU grace period
Shaomin Chen (1):
keys: Pin request_key_auth payload in instantiate paths
Steffen Persvold (1):
fbdev: modedb: Fix misaligned fields in the 1920x1080-60 mode
Sven Eckelmann (25):
batman-adv: tt: reject oversized local TVLV buffers
batman-adv: tt: prevent TVLV entry number overflow
batman-adv: tp_meter: keep unacked list in ascending ordered
batman-adv: tp_meter: initialize dup_acks explicitly
batman-adv: tp_meter: initialize dec_cwnd explicitly
batman-adv: tp_meter: avoid window underflow
batman-adv: tp_meter: avoid divide-by-zero for dec_cwnd
batman-adv: tp_meter: fix fast recovery precondition
batman-adv: tp_meter: handle seqno wrap-around for fast recovery detection
batman-adv: tp_meter: add only finished tp_vars to lists
batman-adv: bla: annotate lasttime access with READ/WRITE_ONCE
batman-adv: prevent ELP transmission interval underflow
batman-adv: tp_meter: initialize last_recv_time during init
batman-adv: frag: ensure fragment is writable before modifying TTL
batman-adv: frag: avoid underflow of TTL
batman-adv: v: prevent OGM aggregation on disabled hardif
batman-adv: tp_meter: restrict number of unacked list entries
batman-adv: tp_meter: annotate last_recv_time access with READ/WRITE_ONCE
batman-adv: tp_meter: prevent parallel modifications of last_recv
batman-adv: tp_meter: handle overlapping packets
batman-adv: tt: don't merge change entries with different VIDs
batman-adv: tt: track roam count per VID
batman-adv: dat: prevent false sharing between VLANs
batman-adv: tvlv: enforce 2-byte alignment
batman-adv: tvlv: avoid race of cifsnotfound handler state
Thadeu Lima de Souza Cascardo (1):
dlm: prevent NPD when writing a positive value to event_done
Thorsten Blum (2):
crypto: qat - Replace kzalloc() + copy_from_user() with memdup_user()
hv: utils: handle and propagate errors in kvp_register
Wang Yufen (1):
netdevsim: Fix memory leak of nsim_dev->fa_cookie
Weiming Shi (2):
i2c: stub: Reject I2C block transfers with invalid length
net: qualcomm: rmnet: fix endpoint use-after-free in rmnet_dellink()
Wentao Liang (2):
pNFS: Fix use-after-free in pnfs_update_layout()
fpga: region: fix use-after-free in child_regions_with_firmware()
Yi Yang (1):
vc_screen: fix null-ptr-deref in vcs_notifier() during concurrent vcs_write
Yongchao Wu (1):
usb: cdns3: gadget: fix NULL pointer dereference in ep_queue
Yuto Ohnuki (1):
ext4: add bounds check for inline data length in ext4_read_inline_page
Zenm Chen (1):
wifi: mt76: mt76x2u: Add support for ELECOM WDC-867SU3S
Zhang Cen (2):
f2fs: validate ACL entry sizes in f2fs_acl_from_disk()
ocfs2: reject oversized group bitmap descriptors
Greg Kroah-Hartman
maintainerDocumentation/userspace-api/ioctl/ioctl-number.rst +213 -214
@@ -66,17 +66,17 @@ This table lists ioctls visible from user land for Linux/x86. It contains most drivers up to 2.6.31, but I know I am missing some. There has been no attempt to list non-X86 architectures or ioctls from drivers/staging/. -==== ===== ======================================================= ================================================================ -Code Seq# Include File Comments +==== ===== ========================================================= ================================================================ +Code Seq# Include File Comments (hex) -==== ===== ======================================================= ================================================================ -0x00 00-1F linux/fs.h conflict! -0x00 00-1F scsi/scsi_ioctl.h conflict! -0x00 00-1F linux/fb.h conflict! -0x00 00-1F linux/wavefront.h conflict! +==== ===== ========================================================= ================================================================ +0x00 00-1F linux/fs.h conflict! +0x00 00-1F scsi/scsi_ioctl.h conflict! +0x00 00-1F linux/fb.h conflict! +0x00 00-1F linux/wavefront.h conflict! 0x02 all linux/fd.h 0x03 all linux/hdreg.h -0x04 D2-DC linux/umsdos_fs.h Dead since 2.6.11, but don't reuse these. +0x04 D2-DC linux/umsdos_fs.h Dead since 2.6.11, but don't reuse these. 0x06 all linux/lp.h 0x09 all linux/raid/md_u.h 0x10 00-0F drivers/char/s390/vmcp.h
@@ -84,282 +84,281 @@ Code Seq# Include File Comments 0x10 20-2F arch/s390/include/uapi/asm/hypfs.h 0x12 all linux/fs.h linux/blkpg.h -0x1b all InfiniBand Subsystem - <http://infiniband.sourceforge.net/> +0x1b all InfiniBand Subsystem + <http://infiniband.sourceforge.net/> 0x20 all drivers/cdrom/cm206.h 0x22 all scsi/sg.h '!' 00-1F uapi/linux/seccomp.h -'#' 00-3F IEEE 1394 Subsystem - Block for the entire subsystem +'#' 00-3F IEEE 1394 Subsystem + Block for the entire subsystem '$' 00-0F linux/perf_counter.h, linux/perf_event.h -'%' 00-0F include/uapi/linux/stm.h System Trace Module subsystem - <mailto:[email protected]> +'%' 00-0F include/uapi/linux/stm.h System Trace Module subsystem + <mailto:[email protected]> '&' 00-07 drivers/firewire/nosy-user.h -'1' 00-1F linux/timepps.h PPS kit from Ulrich Windl - <ftp://ftp.de.kernel.org/pub/linux/daemons/ntp/PPS/> +'1' 00-1F linux/timepps.h PPS kit from Ulrich Windl + <ftp://ftp.de.kernel.org/pub/linux/daemons/ntp/PPS/> '2' 01-04 linux/i2o.h -'3' 00-0F drivers/s390/char/raw3270.h conflict! -'3' 00-1F linux/suspend_ioctls.h, conflict! +'3' 00-0F drivers/s390/char/raw3270.h conflict! +'3' 00-1F linux/suspend_ioctls.h, conflict! kernel/power/user.c -'8' all SNP8023 advanced NIC card - <mailto:[email protected]> +'8' all SNP8023 advanced NIC card + <mailto:[email protected]> ';' 64-7F linux/vfio.h -'@' 00-0F linux/radeonfb.h conflict! -'@' 00-0F drivers/video/aty/aty128fb.c conflict! -'A' 00-1F linux/apm_bios.h conflict! -'A' 00-0F linux/agpgart.h, conflict! +'@' 00-0F linux/radeonfb.h conflict! +'@' 00-0F drivers/video/aty/aty128fb.c conflict! +'A' 00-1F linux/apm_bios.h conflict! +'A' 00-0F linux/agpgart.h, conflict! drivers/char/agp/compat_ioctl.h -'A' 00-7F sound/asound.h conflict! -'B' 00-1F linux/cciss_ioctl.h conflict! -'B' 00-0F include/linux/pmu.h conflict! -'B' C0-FF advanced bbus <mailto:[email protected]> -'C' all linux/soundcard.h conflict! -'C' 01-2F linux/capi.h conflict! -'C' F0-FF drivers/net/wan/cosa.h conflict! +'A' 00-7F sound/asound.h conflict! +'B' 00-1F linux/cciss_ioctl.h conflict! +'B' 00-0F include/linux/pmu.h conflict! +'B' C0-FF advanced bbus <mailto:[email protected]> +'C' all linux/soundcard.h conflict! +'C' 01-2F linux/capi.h conflict! +'C' F0-FF drivers/net/wan/cosa.h conflict! 'D' all arch/s390/include/asm/dasd.h 'D' 40-5F drivers/scsi/dpt/dtpi_ioctl.h 'D' 05 drivers/scsi/pmcraid.h -'E' all linux/input.h conflict! -'E' 00-0F xen/evtchn.h conflict! -'F' all linux/fb.h conflict! -'F' 01-02 drivers/scsi/pmcraid.h conflict! -'F' 20 drivers/video/fsl-diu-fb.h conflict! -'F' 20 drivers/video/intelfb/intelfb.h conflict! -'F' 20 linux/ivtvfb.h conflict! -'F' 20 linux/matroxfb.h conflict! -'F' 20 drivers/video/aty/atyfb_base.c conflict! -'F' 00-0F video/da8xx-fb.h conflict! -'F' 80-8F linux/arcfb.h conflict! -'F' DD video/sstfb.h conflict! -'G' 00-3F drivers/misc/sgi-gru/grulib.h conflict! -'H' 00-7F linux/hiddev.h conflict! -'H' 00-0F linux/hidraw.h conflict! -'H' 01 linux/mei.h conflict! -'H' 02 linux/mei.h conflict! -'H' 03 linux/mei.h conflict! -'H' 00-0F sound/asound.h conflict! -'H' 20-40 sound/asound_fm.h conflict! -'H' 80-8F sound/sfnt_info.h conflict! -'H' 10-8F sound/emu10k1.h conflict! -'H' 10-1F sound/sb16_csp.h conflict! -'H' 10-1F sound/hda_hwdep.h conflict! -'H' 40-4F sound/hdspm.h conflict! -'H' 40-4F sound/hdsp.h conflict! +'E' all linux/input.h conflict! +'E' 00-0F xen/evtchn.h conflict! +'F' all linux/fb.h conflict! +'F' 01-02 drivers/scsi/pmcraid.h conflict! +'F' 20 drivers/video/fsl-diu-fb.h conflict! +'F' 20 drivers/video/intelfb/intelfb.h conflict! +'F' 20 linux/ivtvfb.h conflict! +'F' 20 linux/matroxfb.h conflict! +'F' 20 drivers/video/aty/atyfb_base.c conflict! +'F' 00-0F video/da8xx-fb.h conflict! +'F' 80-8F linux/arcfb.h conflict! +'F' DD video/sstfb.h conflict! +'G' 00-3F drivers/misc/sgi-gru/grulib.h conflict! +'H' 00-7F linux/hiddev.h conflict! +'H' 00-0F linux/hidraw.h conflict! +'H' 01 linux/mei.h conflict! +'H' 02 linux/mei.h conflict! +'H' 03 linux/mei.h conflict! +'H' 00-0F sound/asound.h conflict! +'H' 20-40 sound/asound_fm.h conflict! +'H' 80-8F sound/sfnt_info.h conflict! +'H' 10-8F sound/emu10k1.h conflict! +'H' 10-1F sound/sb16_csp.h conflict! +'H' 10-1F sound/hda_hwdep.h conflict! +'H' 40-4F sound/hdspm.h conflict! +'H' 40-4F sound/hdsp.h conflict! 'H' 90 sound/usb/usx2y/usb_stream.h -'H' 00-0F uapi/misc/habanalabs.h conflict! +'H' 00-0F uapi/misc/habanalabs.h conflict! 'H' A0 uapi/linux/usb/cdc-wdm.h -'H' C0-F0 net/bluetooth/hci.h conflict! -'H' C0-DF net/bluetooth/hidp/hidp.h conflict! -'H' C0-DF net/bluetooth/cmtp/cmtp.h conflict! -'H' C0-DF net/bluetooth/bnep/bnep.h conflict! -'H' F1 linux/hid-roccat.h <mailto:[email protected]> +'H' C0-F0 net/bluetooth/hci.h conflict! +'H' C0-DF net/bluetooth/hidp/hidp.h conflict! +'H' C0-DF net/bluetooth/cmtp/cmtp.h conflict! +'H' C0-DF net/bluetooth/bnep/bnep.h conflict! +'H' F1 linux/hid-roccat.h <mailto:[email protected]> 'H' F8-FA sound/firewire.h -'I' all linux/isdn.h conflict! -'I' 00-0F drivers/isdn/divert/isdn_divert.h conflict! -'I' 40-4F linux/mISDNif.h conflict! +'I' all linux/isdn.h conflict! +'I' 00-0F drivers/isdn/divert/isdn_divert.h conflict! +'I' 40-4F linux/mISDNif.h conflict! 'J' 00-1F drivers/scsi/gdth_ioctl.h 'K' all linux/kd.h -'L' 00-1F linux/loop.h conflict! -'L' 10-1F drivers/scsi/mpt3sas/mpt3sas_ctl.h conflict! +'L' 00-1F linux/loop.h conflict! +'L' 10-1F drivers/scsi/mpt3sas/mpt3sas_ctl.h conflict! 'L' 20-2F linux/lightnvm.h -'L' E0-FF linux/ppdd.h encrypted disk device driver - <http://linux01.gwdg.de/~alatham/ppdd.html> -'M' all linux/soundcard.h conflict! -'M' 01-16 mtd/mtd-abi.h conflict! +'L' E0-FF linux/ppdd.h encrypted disk device driver + <http://linux01.gwdg.de/~alatham/ppdd.html> +'M' all linux/soundcard.h conflict! +'M' 01-16 mtd/mtd-abi.h conflict! and drivers/mtd/mtdchar.c 'M' 01-03 drivers/scsi/megaraid/megaraid_sas.h -'M' 00-0F drivers/video/fsl-diu-fb.h conflict! +'M' 00-0F drivers/video/fsl-diu-fb.h conflict! 'N' 00-1F drivers/usb/scanner.h 'N' 40-7F drivers/block/nvme.c -'O' 00-06 mtd/ubi-user.h UBI -'P' all linux/soundcard.h conflict! -'P' 60-6F sound/sscape_ioctl.h conflict! -'P' 00-0F drivers/usb/class/usblp.c conflict! -'P' 01-09 drivers/misc/pci_endpoint_test.c conflict! +'O' 00-06 mtd/ubi-user.h UBI +'P' all linux/soundcard.h conflict! +'P' 60-6F sound/sscape_ioctl.h conflict! +'P' 00-0F drivers/usb/class/usblp.c conflict! +'P' 01-09 drivers/misc/pci_endpoint_test.c conflict! 'Q' all linux/soundcard.h -'R' 00-1F linux/random.h conflict! -'R' 01 linux/rfkill.h conflict! +'R' 00-1F linux/random.h conflict! +'R' 01 linux/rfkill.h conflict! 'R' C0-DF net/bluetooth/rfcomm.h -'S' all linux/cdrom.h conflict! -'S' 80-81 scsi/scsi_ioctl.h conflict! -'S' 82-FF scsi/scsi.h conflict! -'S' 00-7F sound/asequencer.h conflict! -'T' all linux/soundcard.h conflict! -'T' 00-AF sound/asound.h conflict! -'T' all arch/x86/include/asm/ioctls.h conflict! -'T' C0-DF linux/if_tun.h conflict! -'U' all sound/asound.h conflict! -'U' 00-CF linux/uinput.h conflict! +'S' all linux/cdrom.h conflict! +'S' 80-81 scsi/scsi_ioctl.h conflict! +'S' 82-FF scsi/scsi.h conflict! +'S' 00-7F sound/asequencer.h conflict! +'T' all linux/soundcard.h conflict! +'T' 00-AF sound/asound.h conflict! +'T' all arch/x86/include/asm/ioctls.h conflict! +'T' C0-DF linux/if_tun.h conflict! +'U' all sound/asound.h conflict! +'U' 00-CF linux/uinput.h conflict! 'U' 00-EF linux/usbdevice_fs.h 'U' C0-CF drivers/bluetooth/hci_uart.h -'V' all linux/vt.h conflict! -'V' all linux/videodev2.h conflict! -'V' C0 linux/ivtvfb.h conflict! -'V' C0 linux/ivtv.h conflict! -'V' C0 media/davinci/vpfe_capture.h conflict! -'V' C0 media/si4713.h conflict! -'W' 00-1F linux/watchdog.h conflict! -'W' 00-1F linux/wanrouter.h conflict! (pre 3.9) -'W' 00-3F sound/asound.h conflict! +'V' all linux/vt.h conflict! +'V' all linux/videodev2.h conflict! +'V' C0 linux/ivtvfb.h conflict! +'V' C0 linux/ivtv.h conflict! +'V' C0 media/davinci/vpfe_capture.h conflict! +'V' C0 media/si4713.h conflict! +'W' 00-1F linux/watchdog.h conflict! +'W' 00-1F linux/wanrouter.h conflict! (pre 3.9) +'W' 00-3F sound/asound.h conflict! 'W' 40-5F drivers/pci/switch/switchtec.c 'W' 60-61 linux/watch_queue.h -'X' all fs/xfs/xfs_fs.h, conflict! +'X' all fs/xfs/xfs_fs.h, conflict! fs/xfs/linux-2.6/xfs_ioctl32.h, include/linux/falloc.h, linux/fs.h, -'X' all fs/ocfs2/ocfs_fs.h conflict! -'X' 01 linux/pktcdvd.h conflict! +'X' all fs/ocfs2/ocfs_fs.h conflict! +'X' 01 linux/pktcdvd.h conflict! 'Y' all linux/cyclades.h 'Z' 14-15 drivers/message/fusion/mptctl.h -'[' 00-3F linux/usb/tmc.h USB Test and Measurement Devices - <mailto:[email protected]> -'a' all linux/atm*.h, linux/sonet.h ATM on linux - <http://lrcwww.epfl.ch/> -'a' 00-0F drivers/crypto/qat/qat_common/adf_cfg_common.h conflict! qat driver -'b' 00-FF conflict! bit3 vme host bridge - <mailto:[email protected]> -'c' all linux/cm4000_cs.h conflict! -'c' 00-7F linux/comstats.h conflict! -'c' 00-7F linux/coda.h conflict! -'c' 00-1F linux/chio.h conflict! -'c' 80-9F arch/s390/include/asm/chsc.h conflict! +'[' 00-3F linux/usb/tmc.h USB Test and Measurement Devices + <mailto:[email protected]> +'a' all linux/atm*.h, linux/sonet.h ATM on linux + <http://lrcwww.epfl.ch/> +'b' 00-FF conflict! bit3 vme host bridge + <mailto:[email protected]> +'c' all linux/cm4000_cs.h conflict! +'c' 00-7F linux/comstats.h conflict! +'c' 00-7F linux/coda.h conflict! +'c' 00-1F linux/chio.h conflict! +'c' 80-9F arch/s390/include/asm/chsc.h conflict! 'c' A0-AF arch/x86/include/asm/msr.h conflict! -'d' 00-FF linux/char/drm/drm.h conflict! -'d' 02-40 pcmcia/ds.h conflict! +'d' 00-FF linux/char/drm/drm.h conflict! +'d' 02-40 pcmcia/ds.h conflict! 'd' F0-FF linux/digi1.h -'e' all linux/digi1.h conflict! -'f' 00-1F linux/ext2_fs.h conflict! -'f' 00-1F linux/ext3_fs.h conflict! -'f' 00-0F fs/jfs/jfs_dinode.h conflict! -'f' 00-0F fs/ext4/ext4.h conflict! -'f' 00-0F linux/fs.h conflict! -'f' 00-0F fs/ocfs2/ocfs2_fs.h conflict! +'e' all linux/digi1.h conflict! +'f' 00-1F linux/ext2_fs.h conflict! +'f' 00-1F linux/ext3_fs.h conflict! +'f' 00-0F fs/jfs/jfs_dinode.h conflict! +'f' 00-0F fs/ext4/ext4.h conflict! +'f' 00-0F linux/fs.h conflict! +'f' 00-0F fs/ocfs2/ocfs2_fs.h conflict! 'f' 13-27 linux/fscrypt.h 'f' 81-8F linux/fsverity.h 'g' 00-0F linux/usb/gadgetfs.h 'g' 20-2F linux/usb/g_printer.h -'h' 00-7F conflict! Charon filesystem - <mailto:[email protected]> -'h' 00-1F linux/hpet.h conflict! +'h' 00-7F conflict! Charon filesystem + <mailto:[email protected]> +'h' 00-1F linux/hpet.h conflict! 'h' 80-8F fs/hfsplus/ioctl.c -'i' 00-3F linux/i2o-dev.h conflict! -'i' 0B-1F linux/ipmi.h conflict! +'i' 00-3F linux/i2o-dev.h conflict! +'i' 0B-1F linux/ipmi.h conflict! 'i' 80-8F linux/i8k.h 'j' 00-3F linux/joystick.h -'k' 00-0F linux/spi/spidev.h conflict! -'k' 00-05 video/kyro.h conflict! -'k' 10-17 linux/hsi/hsi_char.h HSI character device -'l' 00-3F linux/tcfs_fs.h transparent cryptographic file system - <http://web.archive.org/web/%2A/http://mikonos.dia.unisa.it/tcfs> -'l' 40-7F linux/udf_fs_i.h in development: - <http://sourceforge.net/projects/linux-udf/> -'m' 00-09 linux/mmtimer.h conflict! -'m' all linux/mtio.h conflict! -'m' all linux/soundcard.h conflict! -'m' all linux/synclink.h conflict! -'m' 00-19 drivers/message/fusion/mptctl.h conflict! -'m' 00 drivers/scsi/megaraid/megaraid_ioctl.h conflict! +'k' 00-0F linux/spi/spidev.h conflict! +'k' 00-05 video/kyro.h conflict! +'k' 10-17 linux/hsi/hsi_char.h HSI character device +'l' 00-3F linux/tcfs_fs.h transparent cryptographic file system + <http://web.archive.org/web/%2A/http://mikonos.dia.unisa.it/tcfs> +'l' 40-7F linux/udf_fs_i.h in development: + <http://sourceforge.net/projects/linux-udf/> +'m' 00-09 linux/mmtimer.h conflict! +'m' all linux/mtio.h conflict! +'m' all linux/soundcard.h conflict! +'m' all linux/synclink.h conflict! +'m' 00-19 drivers/message/fusion/mptctl.h conflict! +'m' 00 drivers/scsi/megaraid/megaraid_ioctl.h conflict! 'n' 00-7F linux/ncp_fs.h and fs/ncpfs/ioctl.c -'n' 80-8F uapi/linux/nilfs2_api.h NILFS2 -'n' E0-FF linux/matroxfb.h matroxfb -'o' 00-1F fs/ocfs2/ocfs2_fs.h OCFS2 -'o' 00-03 mtd/ubi-user.h conflict! (OCFS2 and UBI overlaps) -'o' 40-41 mtd/ubi-user.h UBI -'o' 01-A1 `linux/dvb/*.h` DVB -'p' 00-0F linux/phantom.h conflict! (OpenHaptics needs this) -'p' 00-1F linux/rtc.h conflict! +'n' 80-8F uapi/linux/nilfs2_api.h NILFS2 +'n' E0-FF linux/matroxfb.h matroxfb +'o' 00-1F fs/ocfs2/ocfs2_fs.h OCFS2 +'o' 00-03 mtd/ubi-user.h conflict! (OCFS2 and UBI overlaps) +'o' 40-41 mtd/ubi-user.h UBI +'o' 01-A1 `linux/dvb/*.h` DVB +'p' 00-0F linux/phantom.h conflict! (OpenHaptics needs this) +'p' 00-1F linux/rtc.h conflict! 'p' 40-7F linux/nvram.h -'p' 80-9F linux/ppdev.h user-space parport - <mailto:[email protected]> -'p' A1-A5 linux/pps.h LinuxPPS - <mailto:[email protected]> +'p' 80-9F linux/ppdev.h user-space parport + <mailto:[email protected]> +'p' A1-A5 linux/pps.h LinuxPPS + <mailto:[email protected]> 'q' 00-1F linux/serio.h -'q' 80-FF linux/telephony.h Internet PhoneJACK, Internet LineJACK - linux/ixjuser.h <http://web.archive.org/web/%2A/http://www.quicknet.net> +'q' 80-FF linux/telephony.h Internet PhoneJACK, Internet LineJACK + linux/ixjuser.h <http://web.archive.org/web/%2A/http://www.quicknet.net> 'r' 00-1F linux/msdos_fs.h and fs/fat/dir.c 's' all linux/cdk.h 't' 00-7F linux/ppp-ioctl.h 't' 80-8F linux/isdn_ppp.h -'t' 90-91 linux/toshiba.h toshiba and toshiba_acpi SMM -'u' 00-1F linux/smb_fs.h gone -'u' 20-3F linux/uvcvideo.h USB video class host driver -'u' 40-4f linux/udmabuf.h userspace dma-buf misc device -'v' 00-1F linux/ext2_fs.h conflict! -'v' 00-1F linux/fs.h conflict! -'v' 00-0F linux/sonypi.h conflict! -'v' 00-0F media/v4l2-subdev.h conflict! -'v' 20-27 arch/powerpc/include/uapi/asm/vas-api.h VAS API -'v' C0-FF linux/meye.h conflict! -'w' all CERN SCI driver -'y' 00-1F packet based user level communications - <mailto:[email protected]> -'z' 00-3F CAN bus card conflict! - <mailto:[email protected]> -'z' 40-7F CAN bus card conflict! - <mailto:[email protected]> -'z' 10-4F drivers/s390/crypto/zcrypt_api.h conflict! +'t' 90-91 linux/toshiba.h toshiba and toshiba_acpi SMM +'u' 00-1F linux/smb_fs.h gone +'u' 20-3F linux/uvcvideo.h USB video class host driver +'u' 40-4f linux/udmabuf.h userspace dma-buf misc device +'v' 00-1F linux/ext2_fs.h conflict! +'v' 00-1F linux/fs.h conflict! +'v' 00-0F linux/sonypi.h conflict! +'v' 00-0F media/v4l2-subdev.h conflict! +'v' 20-27 arch/powerpc/include/uapi/asm/vas-api.h VAS API +'v' C0-FF linux/meye.h conflict! +'w' all CERN SCI driver +'y' 00-1F packet based user level communications + <mailto:[email protected]> +'z' 00-3F CAN bus card conflict! + <mailto:[email protected]> +'z' 40-7F CAN bus card conflict! + <mailto:[email protected]> +'z' 10-4F drivers/s390/crypto/zcrypt_api.h conflict! '|' 00-7F linux/media.h 0x80 00-1F linux/fb.h 0x89 00-06 arch/x86/include/asm/sockios.h 0x89 0B-DF linux/sockios.h -0x89 E0-EF linux/sockios.h SIOCPROTOPRIVATE range -0x89 F0-FF linux/sockios.h SIOCDEVPRIVATE range +0x89 E0-EF linux/sockios.h SIOCPROTOPRIVATE range +0x89 F0-FF linux/sockios.h SIOCDEVPRIVATE range 0x8B all linux/wireless.h -0x8C 00-3F WiNRADiO driver - <http://www.winradio.com.au/> +0x8C 00-3F WiNRADiO driver + <http://www.winradio.com.au/> 0x90 00 drivers/cdrom/sbpcd.h 0x92 00-0F drivers/usb/mon/mon_bin.c 0x93 60-7F linux/auto_fs.h -0x94 all fs/btrfs/ioctl.h Btrfs filesystem - and linux/fs.h some lifted to vfs/generic -0x97 00-7F fs/ceph/ioctl.h Ceph file system -0x99 00-0F 537-Addinboard driver - <mailto:[email protected]> -0xA0 all linux/sdp/sdp.h Industrial Device Project - <mailto:[email protected]> -0xA1 0 linux/vtpm_proxy.h TPM Emulator Proxy Driver -0xA3 80-8F Port ACL in development: - <mailto:[email protected]> +0x94 all fs/btrfs/ioctl.h Btrfs filesystem + and linux/fs.h some lifted to vfs/generic +0x97 00-7F fs/ceph/ioctl.h Ceph file system +0x99 00-0F 537-Addinboard driver + <mailto:[email protected]> +0xA0 all linux/sdp/sdp.h Industrial Device Project + <mailto:[email protected]> +0xA1 0 linux/vtpm_proxy.h TPM Emulator Proxy Driver +0xA3 80-8F Port ACL in development: + <mailto:[email protected]> 0xA3 90-9F linux/dtlk.h -0xA4 00-1F uapi/linux/tee.h Generic TEE subsystem +0xA4 00-1F uapi/linux/tee.h Generic TEE subsystem 0xAA 00-3F linux/uapi/linux/userfaultfd.h 0xAB 00-1F linux/nbd.h 0xAC 00-1F linux/raw.h -0xAD 00 Netfilter device in development: - <mailto:[email protected]> -0xAE 00-1F linux/kvm.h Kernel-based Virtual Machine - <mailto:[email protected]> -0xAE 40-FF linux/kvm.h Kernel-based Virtual Machine - <mailto:[email protected]> -0xAE 20-3F linux/nitro_enclaves.h Nitro Enclaves -0xAF 00-1F linux/fsl_hypervisor.h Freescale hypervisor -0xB0 all RATIO devices in development: - <mailto:[email protected]> -0xB1 00-1F PPPoX - <mailto:[email protected]> +0xAD 00 Netfilter device in development: + <mailto:[email protected]> +0xAE 00-1F linux/kvm.h Kernel-based Virtual Machine + <mailto:[email protected]> +0xAE 40-FF linux/kvm.h Kernel-based Virtual Machine + <mailto:[email protected]> +0xAE 20-3F linux/nitro_enclaves.h Nitro Enclaves +0xAF 00-1F linux/fsl_hypervisor.h Freescale hypervisor +0xB0 all RATIO devices in development: + <mailto:[email protected]> +0xB1 00-1F PPPoX + <mailto:[email protected]> 0xB3 00 linux/mmc/ioctl.h -0xB4 00-0F linux/gpio.h <mailto:[email protected]> -0xB5 00-0F uapi/linux/rpmsg.h <mailto:[email protected]> +0xB4 00-0F linux/gpio.h <mailto:[email protected]> +0xB5 00-0F uapi/linux/rpmsg.h <mailto:[email protected]> 0xB6 all linux/fpga-dfl.h -0xB7 all uapi/linux/remoteproc_cdev.h <mailto:[email protected]> +0xB7 all uapi/linux/remoteproc_cdev.h <mailto:[email protected]> 0xC0 00-0F linux/usb/iowarrior.h 0xCA 00-0F uapi/misc/cxl.h 0xCA 10-2F uapi/misc/ocxl.h 0xCA 80-BF uapi/scsi/cxlflash_ioctl.h -0xCB 00-1F CBM serial IEC bus in development: - <mailto:[email protected]> -0xCC 00-0F drivers/misc/ibmvmc.h pseries VMC driver +0xCB 00-1F CBM serial IEC bus in development: + <mailto:[email protected]> +0xCC 00-0F drivers/misc/ibmvmc.h pseries VMC driver 0xCD 01 linux/reiserfs_fs.h 0xCF 02 fs/cifs/ioctl.c 0xDB 00-0F drivers/char/mwave/mwavepub.h -0xDD 00-3F ZFCP device driver see drivers/s390/scsi/ - <mailto:[email protected]> +0xDD 00-3F ZFCP device driver see drivers/s390/scsi/ + <mailto:[email protected]> 0xE5 00-3F linux/fuse.h -0xEC 00-01 drivers/platform/chrome/cros_ec_dev.h ChromeOS EC driver -0xF3 00-3F drivers/usb/misc/sisusbvga/sisusb.h sisfb (in development) - <mailto:[email protected]> -0xF6 all LTTng Linux Trace Toolkit Next Generation - <mailto:[email protected]> +0xEC 00-01 drivers/platform/chrome/cros_ec_dev.h ChromeOS EC driver +0xF3 00-3F drivers/usb/misc/sisusbvga/sisusb.h sisfb (in development) + <mailto:[email protected]> +0xF6 all LTTng Linux Trace Toolkit Next Generation + <mailto:[email protected]> 0xFD all linux/dm-ioctl.h 0xFE all linux/isst_if.h -==== ===== ======================================================= ================================================================ +==== ===== ========================================================= ================================================================
Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 10 -SUBLEVEL = 259 +SUBLEVEL = 260 EXTRAVERSION = NAME = Dare mighty things
arch/mips/dec/prom/console.c +5 -2
@@ -2,8 +2,9 @@/* * DECstation PROM-based early console support. * -* Copyright (C) 2004, 2007 Maciej W. Rozycki +* Copyright (C) 2004, 2007, 2026 Maciej W. Rozycki */ +#include <linux/bug.h> #include <linux/console.h> #include <linux/init.h> #include <linux/kernel.h>
@@ -14,9 +15,11 @@static void __init prom_console_write (struct console *con,const char *s,unsigned int c) { -char buf[81 ]; +static char buf[81 ]__initdata = {0 };unsigned int chunk =sizeof (buf) -1 ; +BUG_ON ((long )buf != (int )(long )buf); +while (c >0 ) {if (chunk > c) chunk = c;
arch/x86/kvm/svm/sev.c +1 -0
@@ -836,6 +836,7 @@ static int sev_dbg_crypt(struct kvm *kvm, struct kvm_sev_cmd *argp, bool dec) s_off = vaddr & ~PAGE_MASK ; d_off = dst_vaddr & ~PAGE_MASK ; len =min_t (size_t, (PAGE_SIZE - s_off), size); + len =min_t (size_t, len,PAGE_SIZE - d_off);if (dec) ret = __sev_dbg_decrypt_user(kvm,
crypto/af_alg.c +2 -0
@@ -892,6 +892,8 @@ int af_alg_sendmsg(struct socket *sock, struct msghdr *msg, size_t size,continue ; } + ctx->merge =0 ; +if (!af_alg_writable (sk)) { err =af_alg_wait_for_wmem (sk, msg->msg_flags);if (err)
drivers/char/agp/amd64-agp.c +1 -1
@@ -546,7 +546,7 @@ static int agp_amd64_probe(struct pci_dev *pdev,/* Fill in the mode register */ pci_read_config_dword (pdev, bridge->capndx+PCI_AGP_STATUS , &bridge->mode); -if (cache_nbs (pdev, cap_ptr) ==-1 ) { +if (cache_nbs (pdev, cap_ptr) <0 ) {agp_put_bridge (bridge);return -ENODEV ; }
drivers/crypto/qat/qat_common/adf_cfg_common.h +0 -32
@@ -4,18 +4,11 @@#define ADF_CFG_COMMON_H_ #include <linux/types.h> -#include <linux/ioctl.h> #define ADF_CFG_MAX_STR_LEN 64#define ADF_CFG_MAX_KEY_LEN_IN_BYTES ADF_CFG_MAX_STR_LEN#define ADF_CFG_MAX_VAL_LEN_IN_BYTES ADF_CFG_MAX_STR_LEN#define ADF_CFG_MAX_SECTION_LEN_IN_BYTES ADF_CFG_MAX_STR_LEN -#define ADF_CFG_BASE_DEC 10 -#define ADF_CFG_BASE_HEX 16 -#define ADF_CFG_ALL_DEVICES 0xFE -#define ADF_CFG_NO_DEVICE 0xFF -#define ADF_CFG_AFFINITY_WHATEVER 0xFF -#define MAX_DEVICE_NAME_SIZE 32#define ADF_MAX_DEVICES (32 * 32)#define ADF_DEVS_ARRAY_SIZE BITS_TO_LONGS(ADF_MAX_DEVICES)
@@ -34,29 +27,4 @@ enum adf_device_type {DEV_C3XXX ,DEV_C3XXXVF }; - -struct adf_dev_status_info { -enum adf_device_type type; -__u32 accel_id; -__u32 instance_id; -__u8 num_ae; -__u8 num_accel; -__u8 num_logical_accel; -__u8 banks_per_accel; -__u8 state; -__u8 bus; -__u8 dev; -__u8 fun; -char name[MAX_DEVICE_NAME_SIZE ]; -}; - -#define ADF_CTL_IOC_MAGIC 'a' -#define IOCTL_CONFIG_SYS_RESOURCE_PARAMETERS _IOW(ADF_CTL_IOC_MAGIC, 0, \ - struct adf_user_cfg_ctl_data) -#define IOCTL_STOP_ACCEL_DEV _IOW(ADF_CTL_IOC_MAGIC, 1, \ - struct adf_user_cfg_ctl_data) -#define IOCTL_START_ACCEL_DEV _IOW(ADF_CTL_IOC_MAGIC, 2, \ - struct adf_user_cfg_ctl_data) -#define IOCTL_STATUS_ACCEL_DEV _IOW(ADF_CTL_IOC_MAGIC, 3, __u32) -#define IOCTL_GET_NUM_DEVICES _IOW(ADF_CTL_IOC_MAGIC, 4, __s32)#endif
drivers/crypto/qat/qat_common/adf_cfg_user.h deleted +0 -38
@@ -1,38 +0,0 @@ -/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0-only) */ -/* Copyright(c) 2014 - 2020 Intel Corporation */ -#ifndef ADF_CFG_USER_H_ -#define ADF_CFG_USER_H_ - -#include "adf_cfg_common.h" -#include "adf_cfg_strings.h" - -struct adf_user_cfg_key_val { -char key[ADF_CFG_MAX_KEY_LEN_IN_BYTES ]; -char val[ADF_CFG_MAX_VAL_LEN_IN_BYTES ]; -union { -struct adf_user_cfg_key_val *next; -__u64 padding3; - }; -enum adf_cfg_val_type type; -} __packed; - -struct adf_user_cfg_section { -char name[ADF_CFG_MAX_SECTION_LEN_IN_BYTES ]; -union { -struct adf_user_cfg_key_val *params; -__u64 padding1; - }; -union { -struct adf_user_cfg_section *next; -__u64 padding3; - }; -} __packed; - -struct adf_user_cfg_ctl_data { -union { -struct adf_user_cfg_section *config_section; -__u64 padding; - }; -__u8 device_id; -} __packed; -#endif
drivers/crypto/qat/qat_common/adf_common_drv.h +0 -3
@@ -79,11 +79,8 @@ int adf_devmgr_add_dev(struct adf_accel_dev *accel_dev,void adf_devmgr_rm_dev (struct adf_accel_dev *accel_dev,struct adf_accel_dev *pf);struct list_head *adf_devmgr_get_head (void ); -struct adf_accel_dev *adf_devmgr_get_dev_by_id (u32 id);struct adf_accel_dev *adf_devmgr_get_first (void );struct adf_accel_dev *adf_devmgr_pci_to_accel_dev (struct pci_dev *pci_dev); -int adf_devmgr_verify_id (u32 id); -void adf_devmgr_get_num_dev (u32 *num);int adf_devmgr_in_reset (struct adf_accel_dev *accel_dev);int adf_dev_started (struct adf_accel_dev *accel_dev);int adf_dev_restarting_notify (struct adf_accel_dev *accel_dev);
drivers/crypto/qat/qat_common/adf_ctl_drv.c +3 -418
448 lines not on this page · raw message
drivers/crypto/qat/qat_common/adf_dev_mgr.c +0 -70
82 lines not on this page · raw message
drivers/fpga/of-fpga-region.c +1 -2
@@ -166,11 +166,10 @@ static int child_regions_with_firmware(struct device_node *overlay) fpga_region_of_match); } -of_node_put (child_region); -if (ret)pr_err ("firmware-name not allowed in child FPGA region: %pOF" , child_region); +of_node_put (child_region);return ret; }
drivers/gpu/drm/amd/display/dc/basics/vector.c +1 -1
@@ -292,7 +292,7 @@ bool dal_vector_reserve(struct vector *vector, uint32_t capacity)return true; new_container =krealloc (vector->container, - capacity * vector->struct_size,GFP_KERNEL ); +array_size (capacity, vector->struct_size),GFP_KERNEL );if (new_container) { vector->container = new_container;
drivers/gpu/drm/amd/display/dc/bios/bios_parser.c +10 -5
@@ -223,6 +223,7 @@ static enum bp_result bios_parser_get_i2c_info(struct dc_bios *dcb,ATOM_COMMON_RECORD_HEADER *header;ATOM_I2C_RECORD *record;struct bios_parser *bp =BP_FROM_DCB (dcb); +int i;if (!info)return BP_RESULT_BADINPUT ;
@@ -235,7 +236,7 @@ static enum bp_result bios_parser_get_i2c_info(struct dc_bios *dcb, offset =le16_to_cpu (object->usRecordOffset) + bp->object_info_tbl_offset; -for (;;) { +for (i =0 ; i <BIOS_MAX_NUM_RECORD ; i++) { header =GET_IMAGE (ATOM_COMMON_RECORD_HEADER , offset);if (!header)
@@ -294,11 +295,12 @@ static enum bp_result bios_parser_get_device_tag_record( {ATOM_COMMON_RECORD_HEADER *header;uint32_t offset; +int i; offset =le16_to_cpu (object->usRecordOffset) + bp->object_info_tbl_offset; -for (;;) { +for (i =0 ; i <BIOS_MAX_NUM_RECORD ; i++) { header =GET_IMAGE (ATOM_COMMON_RECORD_HEADER , offset);if (!header)
@@ -870,6 +872,7 @@ static ATOM_HPD_INT_RECORD *get_hpd_record(struct bios_parser *bp, {ATOM_COMMON_RECORD_HEADER *header;uint32_t offset; +int i;if (!object) {BREAK_TO_DEBUGGER ();/* Invalid object */
@@ -879,7 +882,7 @@ static ATOM_HPD_INT_RECORD *get_hpd_record(struct bios_parser *bp, offset =le16_to_cpu (object->usRecordOffset) + bp->object_info_tbl_offset; -for (;;) { +for (i =0 ; i <BIOS_MAX_NUM_RECORD ; i++) { header =GET_IMAGE (ATOM_COMMON_RECORD_HEADER , offset);if (!header)
@@ -1576,6 +1579,7 @@ static ATOM_ENCODER_CAP_RECORD_V2 *get_encoder_cap_record( {ATOM_COMMON_RECORD_HEADER *header;uint32_t offset; +int i;if (!object) {BREAK_TO_DEBUGGER ();/* Invalid object */
@@ -1585,7 +1589,7 @@ static ATOM_ENCODER_CAP_RECORD_V2 *get_encoder_cap_record( offset =le16_to_cpu (object->usRecordOffset) + bp->object_info_tbl_offset; -for (;;) { +for (i =0 ; i <BIOS_MAX_NUM_RECORD ; i++) { header =GET_IMAGE (ATOM_COMMON_RECORD_HEADER , offset);if (!header)
@@ -2667,6 +2671,7 @@ enum bp_result update_slot_layout_info( unsigned int record_offset) {unsigned int j; +unsigned int n;struct bios_parser *bp;ATOM_BRACKET_LAYOUT_RECORD *record;ATOM_COMMON_RECORD_HEADER *record_header;
@@ -2676,7 +2681,7 @@ enum bp_result update_slot_layout_info( record =NULL ; record_header =NULL ; -for (;;) { +for (n =0 ; n <BIOS_MAX_NUM_RECORD ; n++) { record_header = (ATOM_COMMON_RECORD_HEADER *)GET_IMAGE (ATOM_COMMON_RECORD_HEADER , record_offset);
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +8 -4
@@ -296,6 +296,7 @@ static enum bp_result bios_parser_get_i2c_info(struct dc_bios *dcb,struct atom_i2c_record *record;struct atom_i2c_record dummy_record = {0 };struct bios_parser *bp =BP_FROM_DCB (dcb); +int i;if (!info)return BP_RESULT_BADINPUT ;
@@ -316,7 +317,7 @@ static enum bp_result bios_parser_get_i2c_info(struct dc_bios *dcb, offset = object->disp_recordoffset + bp->object_info_tbl_offset; -for (;;) { +for (i =0 ; i <BIOS_MAX_NUM_RECORD ; i++) { header = GET_IMAGE(struct atom_common_record_header, offset);if (!header)
@@ -446,6 +447,7 @@ static struct atom_hpd_int_record *get_hpd_record( {struct atom_common_record_header *header;uint32_t offset; +int i;if (!object) {BREAK_TO_DEBUGGER ();/* Invalid object */
@@ -455,7 +457,7 @@ static struct atom_hpd_int_record *get_hpd_record( offset =le16_to_cpu (object->disp_recordoffset) + bp->object_info_tbl_offset; -for (;;) { +for (i =0 ; i <BIOS_MAX_NUM_RECORD ; i++) { header = GET_IMAGE(struct atom_common_record_header, offset);if (!header)
@@ -1423,6 +1425,7 @@ static struct atom_encoder_caps_record *get_encoder_cap_record( {struct atom_common_record_header *header;uint32_t offset; +int i;if (!object) {BREAK_TO_DEBUGGER ();/* Invalid object */
@@ -1431,7 +1434,7 @@ static struct atom_encoder_caps_record *get_encoder_cap_record( offset = object->encoder_recordoffset + bp->object_info_tbl_offset; -for (;;) { +for (i =0 ; i <BIOS_MAX_NUM_RECORD ; i++) { header = GET_IMAGE(struct atom_common_record_header, offset);if (!header)
@@ -1870,6 +1873,7 @@ static enum bp_result update_slot_layout_info( {unsigned int record_offset;unsigned int j; +unsigned int n;struct atom_display_object_path_v2 *object;struct atom_bracket_layout_record *record;struct atom_common_record_header *record_header;
@@ -1891,7 +1895,7 @@ static enum bp_result update_slot_layout_info( (object->disp_recordoffset) + (unsigned int )(bp->object_info_tbl_offset); -for (;;) { +for (n =0 ; n <BIOS_MAX_NUM_RECORD ; n++) { record_header = (struct atom_common_record_header *) GET_IMAGE(struct atom_common_record_header,
drivers/gpu/drm/amd/display/dc/bios/bios_parser_helper.h +5 -0
@@ -38,4 +38,9 @@ uint32_t bios_get_vga_enabled_displays(struct dc_bios *bios);#define GET_IMAGE (type, offset) ((type *) bios_get_image(&bp->base, offset, sizeof(type))) +/* Upper bound on the number of records in a VBIOS record chain. Prevents +* unbounded looping if the VBIOS image is malformed and lacks a terminator. +*/ +#define BIOS_MAX_NUM_RECORD 256 +#endif
drivers/hv/hv_kvp.c +13 -12
@@ -93,7 +93,7 @@ static void kvp_send_key(struct work_struct *dummy);static void kvp_respond_to_host (struct hv_kvp_msg *msg,int error);static void kvp_timeout_func (struct work_struct *dummy);static void kvp_host_handshake_func (struct work_struct *dummy); -static void kvp_register (int ); +static int kvp_register (int ); static DECLARE_DELAYED_WORK(kvp_timeout_work, kvp_timeout_func); static DECLARE_DELAYED_WORK(kvp_host_handshake_work, kvp_host_handshake_func);
@@ -127,24 +127,26 @@ static void kvp_register_done(void)hv_poll_channel (kvp_transaction.recv_channel, kvp_poll_wrapper); } -static void +static int kvp_register (int reg_value) {struct hv_kvp_msg *kvp_msg;char *version; +int ret; kvp_msg =kzalloc (sizeof (*kvp_msg),GFP_KERNEL ); +if (!kvp_msg) +return -ENOMEM ; -if (kvp_msg) { - version = kvp_msg->body.kvp_register.version; - kvp_msg->kvp_hdr.operation = reg_value; -strcpy (version,HV_DRV_VERSION ); + version = kvp_msg->body.kvp_register.version; + kvp_msg->kvp_hdr.operation = reg_value; +strcpy (version,HV_DRV_VERSION ); -hvutil_transport_send (hvt, kvp_msg,sizeof (*kvp_msg), - kvp_register_done); -kfree (kvp_msg); - } + ret =hvutil_transport_send (hvt, kvp_msg,sizeof (*kvp_msg), + kvp_register_done); +kfree (kvp_msg); +return ret; }static void kvp_timeout_func (struct work_struct *dummy)
@@ -186,9 +188,8 @@ static int kvp_handle_handshake(struct hv_kvp_msg *msg)*/ pr_debug ("KVP: userspace daemon ver. %d connected\n" , msg->kvp_hdr.operation); -kvp_register (dm_reg_value); -return 0 ; +return kvp_register (dm_reg_value); }
drivers/hv/vmbus_drv.c +41 -15
75 lines not on this page · raw message
drivers/i2c/i2c-stub.c +5 -0
@@ -215,6 +215,11 @@ static s32 stub_xfer(struct i2c_adapter *adap, u16 addr, unsigned short flags,* We ignore banks here, because banked chips don't use I2C * block transfers */ +if (data->block[0 ] ==0 || + data->block[0 ] >I2C_SMBUS_BLOCK_MAX ) { + ret = -EINVAL ; +break ; + }if (data->block[0 ] >256 - command)/* Avoid overrun */ data->block[0 ] =256 - command; len = data->block[0 ];
drivers/infiniband/hw/bnxt_re/ib_verbs.c +1 -1
@@ -3876,7 +3876,7 @@ int bnxt_re_alloc_ucontext(struct ib_ucontext *ctx, struct ib_udata *udata) uctx->rdev = rdev; - uctx->shpg = (void *)__get_free_page (GFP_KERNEL ); + uctx->shpg = (void *)get_zeroed_page (GFP_KERNEL );if (!uctx->shpg) { rc = -ENOMEM ; goto fail;
drivers/irqchip/irq-imgpdc.c +6 -0
@@ -385,6 +385,7 @@ static int pdc_intc_probe(struct platform_device *pdev)dev_err (&pdev->dev,"cannot add IRQ domain\n" );return -ENOMEM ; } + priv->domain->flags |=IRQ_DOMAIN_FLAG_DESTROY_GC ;/* * Set up 2 generic irq chips with 2 chip types.
@@ -472,6 +473,11 @@ static int pdc_intc_remove(struct platform_device *pdev) {struct pdc_intc_priv *priv =platform_get_drvdata (pdev); +for (unsigned int i =0 ; i < priv->nr_perips; ++i) +irq_set_chained_handler_and_data (priv->perip_irqs[i],NULL ,NULL ); + +irq_set_chained_handler_and_data (priv->syswake_irq,NULL ,NULL ); +irq_domain_remove (priv->domain);return 0 ; }
drivers/media/test-drivers/vidtv/vidtv_mux.c +7 -1
@@ -101,7 +101,8 @@ static int vidtv_mux_pid_ctx_init(struct vidtv_mux *m)/* add a ctx for all PMT sections */ while (p) { pid =vidtv_psi_get_pat_program_pid (p); -vidtv_mux_create_pid_ctx_once (m, pid); +if (!vidtv_mux_create_pid_ctx_once (m, pid)) + goto free; p = p->next; }
@@ -170,6 +171,9 @@ static u32 vidtv_mux_push_si(struct vidtv_mux *m) nit_ctx =vidtv_mux_get_pid_ctx (m,VIDTV_NIT_PID ); eit_ctx =vidtv_mux_get_pid_ctx (m,VIDTV_EIT_PID ); +if (!pat_ctx || !sdt_ctx || !nit_ctx || !eit_ctx) +return 0 ; + pat_args.offset = m->mux_buf_offset; pat_args.continuity_counter = &pat_ctx->cc;
@@ -186,6 +190,8 @@ static u32 vidtv_mux_push_si(struct vidtv_mux *m) } pmt_ctx =vidtv_mux_get_pid_ctx (m, pmt_pid); +if (!pmt_ctx) +continue ; pmt_args.offset = m->mux_buf_offset; pmt_args.pmt = m->si.pmt_secs[i];
drivers/misc/fastrpc.c +7 -2
@@ -214,6 +214,7 @@ struct fastrpc_channel_ctx {struct list_head users;struct miscdevice miscdev;struct kref refcount; +u64 dma_mask; };struct fastrpc_user {
@@ -874,7 +875,7 @@ static int fastrpc_get_args(u32 kernel, struct fastrpc_invoke_ctx *ctx)mmap_read_lock (current->mm); vma =find_vma (current->mm, ctx->args[i].ptr); -if (vma) +if (vma && ctx->args[i].ptr >= vma->vm_start) pages[i].addr += (ctx->args[i].ptr &PAGE_MASK ) - vma->vm_start;mmap_read_unlock (current->mm);
@@ -1688,13 +1689,14 @@ static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev)kref_init (&data->refcount); -dev_set_drvdata (&rpdev->dev, data); + rdev->dma_mask = &data->dma_mask;dma_set_mask_and_coherent (rdev,DMA_BIT_MASK (32 ));INIT_LIST_HEAD (&data->users);spin_lock_init (&data->lock);idr_init (&data->ctx_idr); data->domain_id = domain_id; data->rpdev = rpdev; +dev_set_drvdata (&rpdev->dev, data);return of_platform_populate (rdev->of_node,NULL ,NULL , rdev); }
@@ -1742,6 +1744,9 @@ static int fastrpc_rpmsg_callback(struct rpmsg_device *rpdev, void *data,if (len <sizeof (*rsp))return -EINVAL ; +if (!cctx) +return -ENODEV ; + ctxid = ((rsp->ctx &FASTRPC_CTXID_MASK ) >>4 );spin_lock_irqsave (&cctx->lock, flags);
drivers/mmc/host/renesas_sdhi_internal_dmac.c +1 -0
@@ -119,6 +119,7 @@ static const struct renesas_sdhi_of_data of_rcar_gen3_compatible = {static const struct of_device_id renesas_sdhi_internal_dmac_of_match[] = { { .compatible ="renesas,sdhi-r7s9210" , .data = &of_rza2_compatible, }, { .compatible ="renesas,sdhi-mmc-r8a77470" , .data = &of_rcar_gen3_compatible, }, + { .compatible ="renesas,sdhi-r8a774e1" , .data = &of_rcar_gen3_compatible, }, { .compatible ="renesas,sdhi-r8a7795" , .data = &of_rcar_gen3_compatible, }, { .compatible ="renesas,sdhi-r8a7796" , .data = &of_rcar_gen3_compatible, }, { .compatible ="renesas,rcar-gen3-sdhi" , .data = &of_rcar_gen3_compatible, },
drivers/net/ethernet/broadcom/bnxt/bnxt.c +3 -0
@@ -4382,6 +4382,9 @@ static void bnxt_disable_int_sync(struct bnxt *bp) {int i; +if (!bp->irq_tbl || !bp->bnapi) +return ; +atomic_inc (&bp->intr_sem);bnxt_disable_int (bp);
drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c +4 -4
@@ -204,8 +204,8 @@ static void rmnet_dellink(struct net_device *dev, struct list_head *head) ep =rmnet_get_endpoint (real_port, mux_id);if (ep) {hlist_del_init_rcu (&ep->hlnode); -rmnet_vnd_dellink (mux_id, real_port, ep); -kfree (ep); + real_port->nr_rmnet_devs--; +kfree_rcu (ep, rcu); }netdev_upper_dev_unlink (real_dev, dev);
@@ -229,9 +229,9 @@ static void rmnet_force_unassociate_device(struct net_device *real_dev)hash_for_each_safe (port->muxed_ep, bkt_ep, tmp_ep, ep, hlnode) {unregister_netdevice_queue (ep->egress_dev, &list);netdev_upper_dev_unlink (real_dev, ep->egress_dev); -rmnet_vnd_dellink (ep->mux_id, port, ep);hlist_del_init_rcu (&ep->hlnode); -kfree (ep); + port->nr_rmnet_devs--; +kfree_rcu (ep, rcu); }rmnet_unregister_real_device (real_dev);unregister_netdevice_many (&list);
drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h +1 -0
@@ -16,6 +16,7 @@ struct rmnet_endpoint {u8 mux_id;struct net_device *egress_dev;struct hlist_node hlnode; +struct rcu_head rcu; };/* One instance of this structure is instantiated for each real_dev associated
drivers/net/ethernet/ti/cpsw_new.c +2 -2
@@ -1456,7 +1456,8 @@ static void cpsw_unregister_ports(struct cpsw_common *cpsw)int i =0 ;for (i =0 ; i < cpsw->data.slaves; i++) { -if (!cpsw->slaves[i].ndev) +if (!cpsw->slaves[i].ndev || + cpsw->slaves[i].ndev->reg_state !=NETREG_REGISTERED )continue ;unregister_netdev (cpsw->slaves[i].ndev);
@@ -1476,7 +1477,6 @@ static int cpsw_register_ports(struct cpsw_common *cpsw)if (ret) {dev_err (cpsw->dev,"cpsw: err registering net device%d\n" , i); - cpsw->slaves[i].ndev =NULL ;break ; } }
drivers/net/netdevsim/dev.c +1 -0
@@ -1173,6 +1173,7 @@ void nsim_dev_remove(struct nsim_bus_dev *nsim_bus_dev) ARRAY_SIZE(nsim_devlink_params));devlink_unregister (devlink);devlink_resources_unregister (devlink,NULL ); +kfree (nsim_dev->fa_cookie);devlink_free (devlink); }
drivers/net/wireless/ath/ath11k/dp.c +1 -0
@@ -1015,6 +1015,7 @@ void ath11k_dp_free(struct ath11k_base *ab)idr_destroy (&dp->tx_ring[i].txbuf_idr);spin_unlock_bh (&dp->tx_ring[i].tx_idr_lock);kfree (dp->tx_ring[i].tx_status); + dp->tx_ring[i].tx_status =NULL ; }/* Deinit any SOC level resource */
drivers/net/wireless/mediatek/mt76/mt76x2/usb.c +1 -0
@@ -16,6 +16,7 @@ static const struct usb_device_id mt76x2u_device_table[] = { { USB_DEVICE(0x0e8d, 0x7612) }, /* Aukey USBAC1200 - Alfa AWUS036ACM */ { USB_DEVICE(0x057c, 0x8503) }, /* Avm FRITZ!WLAN AC860 */ { USB_DEVICE(0x7392, 0xb711) }, /* Edimax EW 7722 UAC */ + { USB_DEVICE(0x056e, 0x400a) }, /* ELECOM WDC-867SU3S */ { USB_DEVICE(0x0e8d, 0x7632) }, /* HC-M7662BU1 */ { USB_DEVICE(0x0471, 0x2126) }, /* LiteOn WN4516R module, nonstandard USB connector */ { USB_DEVICE(0x0471, 0x7600) }, /* LiteOn WN4519R module, nonstandard USB connector */
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.h +1 -1
@@ -291,7 +291,7 @@ static inline int get_rx_desc_paggr(__le32 *__pdesc)static inline int get_rx_status_desc_rpt_sel (__le32 *__pdesc) { -return le32_get_bits (*(__pdesc +1 ),BIT (28 )); +return le32_get_bits (*(__pdesc +2 ),BIT (28 )); }static inline int get_rx_desc_rxmcs (__le32 *__pdesc)
drivers/regulator/core.c +9 -1
@@ -2036,8 +2036,16 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)if (rdev->use_count) { ret =regulator_enable (rdev->supply);if (ret <0 ) { -_regulator_put (rdev->supply); +struct regulator *supply; + +regulator_lock_two (rdev, rdev->supply->rdev, &ww_ctx); + + supply = rdev->supply; rdev->supply =NULL ; + +regulator_unlock_two (rdev, supply->rdev, &ww_ctx); + +regulator_put (supply); goto out; } }
drivers/slimbus/qcom-ngd-ctrl.c +9 -2
@@ -1444,7 +1444,8 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev) } ret =devm_request_irq (dev, res->start, qcom_slim_ngd_interrupt, -IRQF_TRIGGER_HIGH ,"slim-ngd" , ctrl); +IRQF_TRIGGER_HIGH |IRQF_NO_AUTOEN , +"slim-ngd" , ctrl);if (ret) {dev_err (&pdev->dev,"request IRQ failed\n" );return ret;
@@ -1468,7 +1469,13 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev)init_completion (&ctrl->qmi.qmi_comp);platform_driver_register (&qcom_slim_ngd_driver); -return of_qcom_slim_ngd_register (dev, ctrl); + ret =of_qcom_slim_ngd_register (dev, ctrl); +if (ret) +return ret; + +enable_irq (res->start); + +return 0 ; }static int qcom_slim_ngd_ctrl_remove (struct platform_device *pdev)
drivers/tty/vt/vc_screen.c +1 -1
@@ -699,7 +699,7 @@ vcs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) } *ppos += written; ret = written; -if (written) +if (written && vc)vcs_scr_updated (vc); unlock_out:
drivers/usb/cdns3/gadget.c +3 -0
@@ -2587,6 +2587,9 @@ static int __cdns3_gadget_ep_queue(struct usb_ep *ep,struct cdns3_request *priv_req;int ret =0 ; +if (!ep->desc) +return -ESHUTDOWN ; + request->actual =0 ; request->status = -EINPROGRESS ; priv_req =to_cdns3_request (request);
drivers/vfio/vfio_iommu_type1.c +1 -1
@@ -228,7 +228,7 @@ static int vfio_dma_bitmap_alloc(struct vfio_dma *dma, size_t pgsize)static void vfio_dma_bitmap_free (struct vfio_dma *dma) { -kfree (dma->bitmap); +kvfree (dma->bitmap); dma->bitmap =NULL ; }
drivers/video/fbdev/core/fbmem.c +12 -0
@@ -1989,6 +1989,18 @@ int fb_new_modelist(struct fb_info *info)if (list_empty (&info->modelist))return 1 ; +/* +* The new modelist may not contain the current mode (info->var), and +* fbcon_new_modelist() below only re-points consoles mapped to this +* framebuffer. Add the current mode here so info->var keeps a match +* even when fbcon is unbound. +*/ +if (!fb_match_mode (&info->var, &info->modelist)) { +fb_var_to_videomode (&mode, &info->var); +if (fb_add_videomode (&mode, &info->modelist)) +return 1 ; + } +fbcon_new_modelist (info);return 0 ;
drivers/video/fbdev/core/modedb.c +1 -1
@@ -258,7 +258,7 @@ static const struct fb_videomode modedb[] = { FB_VMODE_DOUBLE },/* 1920x1080 @ 60 Hz, 67.3 kHz hsync */ - {NULL ,60 ,1920 ,1080 ,6734 ,148 ,88 ,36 ,4 ,44 ,5 ,0 , + {NULL ,60 ,1920 ,1080 ,6734 ,148 ,88 ,36 ,4 ,44 ,5 ,FB_SYNC_HOR_HIGH_ACT |FB_SYNC_VERT_HIGH_ACT , FB_VMODE_NONINTERLACED },
fs/dlm/lockspace.c +1 -1
@@ -639,7 +639,7 @@ static int new_lockspace(const char *name, const char *cluster,lockspace to start running (via sysfs) in dlm_ls_start(). */ error =do_uevent (ls,1 ); -if (error) +if (error <0 ) goto out_recoverd;wait_for_completion (&ls->ls_members_done);
fs/exfat/dir.c +3 -1
@@ -1043,12 +1043,12 @@ int exfat_find_dir_entry(struct super_block *sb, struct exfat_inode_info *ei,continue ; } -brelse (bh);if (entry_type ==TYPE_EXTEND ) {unsigned short entry_uniname[16 ], unichar;if (step !=DIRENT_STEP_NAME || name_len >=MAX_NAME_LENGTH ) { +brelse (bh); step =DIRENT_STEP_FILE ;continue ; }
@@ -1059,6 +1059,7 @@ int exfat_find_dir_entry(struct super_block *sb, struct exfat_inode_info *ei, uniname +=EXFAT_FILE_NAME_LEN ; len =exfat_extract_uni_name (ep, entry_uniname); +brelse (bh); name_len += len; unichar = *(uniname+len);
@@ -1077,6 +1078,7 @@ int exfat_find_dir_entry(struct super_block *sb, struct exfat_inode_info *ei,continue ; } +brelse (bh);if (entry_type & (TYPE_CRITICAL_SEC |TYPE_BENIGN_SEC )) {if (step ==DIRENT_STEP_SECD ) {
fs/ext4/inline.c +8 -0
@@ -513,6 +513,14 @@ static int ext4_read_inline_page(struct inode *inode, struct page *page) goto out; len =min_t (size_t,ext4_get_inline_size (inode),i_size_read (inode)); +if (len >PAGE_SIZE ) { +ext4_error_inode (inode, __func__, __LINE__,0 , +"inline size %zu exceeds PAGE_SIZE" , len); + ret = -EFSCORRUPTED ; +brelse (iloc.bh); + goto out; + } + kaddr =kmap_atomic (page); ret =ext4_read_inline_data (inode, kaddr, len, &iloc);flush_dcache_page (page);
fs/f2fs/acl.c +16 -2
@@ -45,6 +45,7 @@ static inline int f2fs_acl_count(size_t size)static struct posix_acl *f2fs_acl_from_disk (const char *value,size_t size) {int i, count; +int err = -EINVAL ;struct posix_acl *acl;struct f2fs_acl_header *hdr = (struct f2fs_acl_header *)value;struct f2fs_acl_entry *entry = (struct f2fs_acl_entry *)(hdr +1 );
@@ -68,8 +69,11 @@ static struct posix_acl *f2fs_acl_from_disk(const char *value, size_t size)for (i =0 ; i < count; i++) { -if ((char *)entry > end) +if (unlikely ((char *)entry + +sizeof (struct f2fs_acl_entry_short ) > end)) { + err = -EFSCORRUPTED ; goto fail; + } acl->a_entries[i].e_tag =le16_to_cpu (entry->e_tag); acl->a_entries[i].e_perm =le16_to_cpu (entry->e_perm);
@@ -84,6 +88,11 @@ static struct posix_acl *f2fs_acl_from_disk(const char *value, size_t size)break ;case ACL_USER : +if (unlikely ((char *)entry + +sizeof (struct f2fs_acl_entry ) > end)) { + err = -EFSCORRUPTED ; + goto fail; + } acl->a_entries[i].e_uid =make_kuid (&init_user_ns,le32_to_cpu (entry->e_id));
@@ -91,6 +100,11 @@ static struct posix_acl *f2fs_acl_from_disk(const char *value, size_t size) sizeof(struct f2fs_acl_entry));break ;case ACL_GROUP : +if (unlikely ((char *)entry + +sizeof (struct f2fs_acl_entry ) > end)) { + err = -EFSCORRUPTED ; + goto fail; + } acl->a_entries[i].e_gid =make_kgid (&init_user_ns,le32_to_cpu (entry->e_id));
@@ -106,7 +120,7 @@ static struct posix_acl *f2fs_acl_from_disk(const char *value, size_t size)return acl; fail:posix_acl_release (acl); -return ERR_PTR (-EINVAL ); +return ERR_PTR (err); } static void *f2fs_acl_to_disk(struct f2fs_sb_info *sbi,
fs/fuse/dev.c +4 -0
@@ -1728,6 +1728,10 @@ static int fuse_retrieve(struct fuse_mount *fm, struct inode *inode, page =find_get_page (mapping, index);if (!page)break ; +if (!PageUptodate (page)) { +put_page (page); +break ; + } this_num =min_t (unsigned, num,PAGE_SIZE - offset); ap->pages[ap->num_pages] = page;
fs/fuse/file.c +7 -1
@@ -330,8 +330,14 @@ void fuse_release_common(struct file *file, bool isdir)* aio and closes the fd before the aio completes. Since aio takes its * own ref to the file, the IO completion has to drop the ref, which is * how the fuse server can end up closing its clients' files. +* +* Exception is virtio-fs, which is not affected by the above (server is +* on host, cannot close open files in guest). Virtio-fs needs sync +* release, because the num_waiting mechanism to wait for all requests +* before commencing with fs shutdown doesn't work if submounts are +* used. */ -fuse_file_put (ff, false, isdir); +fuse_file_put (ff, ff->fm->fc->auto_submounts, isdir); }static int fuse_open (struct inode *inode,struct file *file)
fs/nfs/pnfs.c +1 -1
@@ -2074,11 +2074,11 @@ pnfs_update_layout(struct inode *ino,dprintk ("%s wait for layoutreturn\n" , __func__); lseg =ERR_PTR (pnfs_prepare_to_retry_layoutget (lo));if (!IS_ERR (lseg)) { -pnfs_put_layout_hdr (lo);dprintk ("%s retrying\n" , __func__);trace_pnfs_update_layout (ino, pos, count, iomode, lo, lseg,PNFS_UPDATE_LAYOUT_RETRY ); +pnfs_put_layout_hdr (lo); goto lookup_again; } trace_pnfs_update_layout(ino, pos, count, iomode, lo, lseg,
fs/nfsd/nfs2acl.c +12 -5
@@ -129,10 +129,7 @@ static __be32 nfsacld_proc_setacl(struct svc_rqst *rqstp) resp->status =fh_getattr (fh, &resp->stat); out: -/* argp->acl_{access,default} may have been allocated in -nfssvc_decode_setaclargs. */ -posix_acl_release (argp->acl_access); -posix_acl_release (argp->acl_default); +/* argp->acl_{access,default} are released in nfsaclsvc_release_setacl. */ return rpc_success; out_drop_lock:
@@ -310,6 +307,16 @@ static void nfsaclsvc_release_access(struct svc_rqst *rqstp)struct nfsd3_voidargs {int dummy; }; +static void nfsaclsvc_release_setacl (struct svc_rqst *rqstp) +{ +struct nfsd3_setaclargs *argp = rqstp->rq_argp; +struct nfsd_attrstat *resp = rqstp->rq_resp; + +fh_put (&resp->fh); +posix_acl_release (argp->acl_access); +posix_acl_release (argp->acl_default); +} +#define ST 1/* status*/ #define AT 21/* attributes */ #define pAT (1+AT)/* post attributes - conditional */
@@ -343,7 +350,7 @@ static const struct svc_procedure nfsd_acl_procedures2[5] = { .pc_func = nfsacld_proc_setacl, .pc_decode = nfsaclsvc_decode_setaclargs, .pc_encode = nfssvc_encode_attrstatres, - .pc_release = nfssvc_release_attrstat, + .pc_release = nfsaclsvc_release_setacl, .pc_argsize = sizeof(struct nfsd3_setaclargs), .pc_argzero = sizeof(struct nfsd3_setaclargs), .pc_ressize = sizeof(struct nfsd_attrstat),
fs/nfsd/nfs3acl.c +12 -5
@@ -116,10 +116,7 @@ static __be32 nfsd3_proc_setacl(struct svc_rqst *rqstp) out_errno: resp->status =nfserrno (error); out: -/* argp->acl_{access,default} may have been allocated in -nfs3svc_decode_setaclargs. */ -posix_acl_release (argp->acl_access); -posix_acl_release (argp->acl_default); +/* argp->acl_{access,default} are released in nfs3svc_release_setacl. */ return rpc_success; }
@@ -223,6 +220,16 @@ static void nfs3svc_release_getacl(struct svc_rqst *rqstp)struct nfsd3_voidargs {int dummy; }; +static void nfs3svc_release_setacl (struct svc_rqst *rqstp) +{ +struct nfsd3_setaclargs *argp = rqstp->rq_argp; +struct nfsd3_attrstat *resp = rqstp->rq_resp; + +fh_put (&resp->fh); +posix_acl_release (argp->acl_access); +posix_acl_release (argp->acl_default); +} +#define ST 1/* status*/ #define AT 21/* attributes */ #define pAT (1+AT)/* post attributes - conditional */
@@ -256,7 +263,7 @@ static const struct svc_procedure nfsd_acl_procedures3[3] = { .pc_func = nfsd3_proc_setacl, .pc_decode = nfs3svc_decode_setaclargs, .pc_encode = nfs3svc_encode_setaclres, - .pc_release = nfs3svc_release_fhandle, + .pc_release = nfs3svc_release_setacl, .pc_argsize = sizeof(struct nfsd3_setaclargs), .pc_argzero = sizeof(struct nfsd3_setaclargs), .pc_ressize = sizeof(struct nfsd3_attrstat),
fs/nfsd/nfs4recover.c +2 -1
@@ -815,7 +815,8 @@ __cld_pipe_inprogress_downcall(const struct cld_msg_v2 __user *cmsg,if (IS_ERR (name.data))return PTR_ERR (name.data); name.len = namelen; -get_user (princhashlen, &ci->cc_princhash.cp_len); +if (get_user (princhashlen, &ci->cc_princhash.cp_len)) +return -EFAULT ;if (princhashlen >0 ) { princhash.data = memdup_user( &ci->cc_princhash.cp_data,
fs/nfsd/nfs4xdr.c +2 -1
@@ -1821,10 +1821,11 @@ static __be32 nfsd4_decode_secinfo_no_name(struct nfsd4_compoundargs *argp, union nfsd4_op_u *u) {struct nfsd4_secinfo_no_name *sin = &u->secinfo_no_name; + + sin->sin_exp =NULL ;if (xdr_stream_decode_u32 (argp->xdr, &sin->sin_style) <0 )return nfserr_bad_xdr; - sin->sin_exp =NULL ;return nfs_ok; }
fs/ocfs2/suballoc.c +22 -0
@@ -203,8 +203,16 @@ static int ocfs2_validate_gd_parent(struct super_block *sb, int resize) {unsigned int max_bits; +unsigned int max_bitmap_bits; +unsigned int max_bitmap_size; +int suballocator;struct ocfs2_group_desc *gd = (struct ocfs2_group_desc *)bh->b_data; + suballocator =le64_to_cpu (di->i_blkno) !=OCFS2_SB (sb)->bitmap_blkno; + max_bitmap_size =ocfs2_group_bitmap_size (sb, suballocator, +OCFS2_SB (sb)->s_feature_incompat); + max_bitmap_bits = max_bitmap_size *8 ; +if (di->i_blkno != gd->bg_parent_dinode) { do_error("Group descriptor #%llu has bad parent pointer (%llu, expected %llu)\n", (unsigned long long)bh->b_blocknr,
@@ -212,6 +220,20 @@ static int ocfs2_validate_gd_parent(struct super_block *sb, (unsigned long long)le64_to_cpu(di->i_blkno)); } +if (le16_to_cpu (gd->bg_size) > max_bitmap_size) { +do_error ("Group descriptor #%llu has bitmap size %u but physical max of %u\n" , + (unsigned long long )bh->b_blocknr, +le16_to_cpu (gd->bg_size), + max_bitmap_size); + } + +if (le16_to_cpu (gd->bg_bits) > max_bitmap_bits) { +do_error ("Group descriptor #%llu has bit count %u but physical max of %u\n" , + (unsigned long long )bh->b_blocknr, +le16_to_cpu (gd->bg_bits), + max_bitmap_bits); + } + max_bits =le16_to_cpu (di->id2.i_chain.cl_cpg) *le16_to_cpu (di->id2.i_chain.cl_bpc);if (le16_to_cpu (gd->bg_bits) > max_bits) { do_error("Group descriptor #%llu has bit count of %u\n",
include/keys/request_key_auth-type.h +2 -0
@@ -9,12 +9,14 @@#define _KEYS_REQUEST_KEY_AUTH_TYPE_H#include <linux/key.h> +#include <linux/refcount.h> /* * Authorisation record for request_key(). */ struct request_key_auth {struct rcu_head rcu; +refcount_t usage;struct key *target_key;struct key *dest_keyring;const struct cred *cred;
include/linux/ring_buffer.h +1 -3
@@ -128,9 +128,7 @@ ring_buffer_consume(struct trace_buffer *buffer, int cpu, u64 *ts, unsigned long *lost_events);struct ring_buffer_iter * -ring_buffer_read_prepare (struct trace_buffer *buffer,int cpu,gfp_t flags); -void ring_buffer_read_prepare_sync (void ); -void ring_buffer_read_start (struct ring_buffer_iter *iter); +ring_buffer_read_start (struct trace_buffer *buffer,int cpu,gfp_t flags);void ring_buffer_read_finish (struct ring_buffer_iter *iter); struct ring_buffer_event *
include/linux/skbuff.h +12 -0
@@ -3686,6 +3686,18 @@ skb_header_pointer(const struct sk_buff *skb, int offset, int len, void *buffer) skb_headlen(skb), buffer); } +/* Variant of skb_header_pointer() where @offset is user-controlled +* and potentially negative. +*/ +static inline void *__must_check +skb_header_pointer_careful (const struct sk_buff *skb,int offset, +int len,void *buffer) +{ +if (unlikely (offset <0 && -offset >skb_headroom (skb))) +return NULL ; +return skb_header_pointer (skb, offset, len, buffer); +} +/** * skb_needs_linearize - check if we need to linearize a given skb * depending on the given device features.
include/net/phonet/pn_dev.h +1 -1
@@ -33,7 +33,7 @@ int phonet_address_add(struct net_device *dev, u8 addr);int phonet_address_del (struct net_device *dev,u8 addr);u8 phonet_address_get (struct net_device *dev,u8 addr);int phonet_address_lookup (struct net *net,u8 addr); -void phonet_address_notify (int event,struct net_device *dev,u8 addr); +void phonet_address_notify (struct net *net,int event,u32 ifindex,u8 addr);int phonet_route_add (struct net_device *dev,u8 daddr);int phonet_route_del (struct net_device *dev,u8 daddr);
include/net/tc_act/tc_pedit.h +65 -15
124 lines not on this page · raw message
kernel/bpf/cgroup.c +1 -1
@@ -1325,7 +1325,7 @@ int __cgroup_bpf_run_filter_sysctl(struct ctl_table_header *head,kfree (ctx.cur_val);if (ret ==1 && ctx.new_updated) { -kfree (*buf); +kvfree (*buf); *buf = ctx.new_val; *pcount = ctx.new_len; }else {
kernel/trace/ring_buffer.c +14 -58
93 lines not on this page · raw message
kernel/trace/trace.c +4 -10
@@ -4480,21 +4480,15 @@ __tracing_open(struct inode *inode, struct file *file, bool snapshot)if (iter->cpu_file ==RING_BUFFER_ALL_CPUS ) {for_each_tracing_cpu (cpu) { iter->buffer_iter[cpu] = -ring_buffer_read_prepare (iter->array_buffer->buffer, - cpu,GFP_KERNEL ); - } -ring_buffer_read_prepare_sync (); -for_each_tracing_cpu (cpu) { -ring_buffer_read_start (iter->buffer_iter[cpu]); +ring_buffer_read_start (iter->array_buffer->buffer, + cpu,GFP_KERNEL );tracing_iter_reset (iter, cpu); } }else { cpu = iter->cpu_file; iter->buffer_iter[cpu] = -ring_buffer_read_prepare (iter->array_buffer->buffer, - cpu,GFP_KERNEL ); -ring_buffer_read_prepare_sync (); -ring_buffer_read_start (iter->buffer_iter[cpu]); +ring_buffer_read_start (iter->array_buffer->buffer, + cpu,GFP_KERNEL );tracing_iter_reset (iter, cpu); }
kernel/trace/trace_kdb.c +3 -5
@@ -43,17 +43,15 @@ static void ftrace_dump_buf(int skip_entries, long cpu_file)if (cpu_file ==RING_BUFFER_ALL_CPUS ) {for_each_tracing_cpu (cpu) { iter.buffer_iter[cpu] = -ring_buffer_read_prepare (iter.array_buffer->buffer, - cpu,GFP_ATOMIC ); -ring_buffer_read_start (iter.buffer_iter[cpu]); +ring_buffer_read_start (iter.array_buffer->buffer, + cpu,GFP_ATOMIC );tracing_iter_reset (&iter, cpu); } }else { iter.cpu_file = cpu_file; iter.buffer_iter[cpu_file] = -ring_buffer_read_prepare (iter.array_buffer->buffer, +ring_buffer_read_start (iter.array_buffer->buffer, cpu_file,GFP_ATOMIC ); -ring_buffer_read_start (iter.buffer_iter[cpu_file]);tracing_iter_reset (&iter, cpu_file); }
net/9p/trans_fd.c +1 -0
@@ -346,6 +346,7 @@ static void p9_read_work(struct work_struct *work)p9_debug (P9_DEBUG_ERROR ,"No recv fcall for tag %d (req %p), disconnecting!\n" , m->rc.tag, m->rreq); +p9_req_put (m->rreq); m->rreq =NULL ; err = -EIO ; goto error;
net/batman-adv/bat_iv_ogm.c +10 -1
@@ -312,14 +312,23 @@ batadv_iv_ogm_aggr_packet(int buff_pos, int packet_len, const struct batadv_ogm_packet *ogm_packet) {int next_buff_pos =0 ; +u16 tvlv_len;/* check if there is enough space for the header */ next_buff_pos += buff_pos +sizeof (*ogm_packet);if (next_buff_pos > packet_len)return false; + tvlv_len =ntohs (ogm_packet->tvlv_len); + +/* the fields of an aggregated OGM are accessed assuming (at least) +* 2-byte alignment, so a following OGM must start at an even offset. +*/ +if (tvlv_len &1 ) +return false; +/* check if there is enough space for the optional TVLV */ - next_buff_pos +=ntohs (ogm_packet->tvlv_len); + next_buff_pos += tvlv_len;return next_buff_pos <= packet_len; }
net/batman-adv/bat_v.c +1 -0
@@ -1084,6 +1084,7 @@ void batadv_v_hardif_init(struct batadv_hard_iface *hard_iface) hard_iface->bat_v.aggr_len =0 ;skb_queue_head_init (&hard_iface->bat_v.aggr_list); + hard_iface->bat_v.aggr_list_enabled = false;INIT_DELAYED_WORK (&hard_iface->bat_v.aggr_wq, batadv_v_ogm_aggr_work); }
net/batman-adv/bat_v_ogm.c +22 -1
@@ -255,11 +255,18 @@ static void batadv_v_ogm_queue_on_if(struct batadv_priv *bat_priv, }spin_lock_bh (&hard_iface->bat_v.aggr_list.lock); +if (!hard_iface->bat_v.aggr_list_enabled) { +kfree_skb (skb); + goto unlock; + } +if (!batadv_v_ogm_queue_left (skb, hard_iface))batadv_v_ogm_aggr_send (bat_priv, hard_iface); hard_iface->bat_v.aggr_len +=batadv_v_ogm_len (skb);__skb_queue_tail (&hard_iface->bat_v.aggr_list, skb); + +unlock:spin_unlock_bh (&hard_iface->bat_v.aggr_list.lock); }
@@ -422,6 +429,10 @@ int batadv_v_ogm_iface_enable(struct batadv_hard_iface *hard_iface) {struct batadv_priv *bat_priv =netdev_priv (hard_iface->soft_iface); +spin_lock_bh (&hard_iface->bat_v.aggr_list.lock); + hard_iface->bat_v.aggr_list_enabled = true; +spin_unlock_bh (&hard_iface->bat_v.aggr_list.lock); +batadv_v_ogm_start_queue_timer (hard_iface);batadv_v_ogm_start_timer (bat_priv);
@@ -437,6 +448,7 @@ void batadv_v_ogm_iface_disable(struct batadv_hard_iface *hard_iface)cancel_delayed_work_sync (&hard_iface->bat_v.aggr_wq);spin_lock_bh (&hard_iface->bat_v.aggr_list.lock); + hard_iface->bat_v.aggr_list_enabled = false;batadv_v_ogm_aggr_list_free (hard_iface);spin_unlock_bh (&hard_iface->bat_v.aggr_list.lock); }
@@ -852,14 +864,23 @@ batadv_v_ogm_aggr_packet(int buff_pos, int packet_len, const struct batadv_ogm2_packet *ogm2_packet) {int next_buff_pos =0 ; +u16 tvlv_len;/* check if there is enough space for the header */ next_buff_pos += buff_pos +sizeof (*ogm2_packet);if (next_buff_pos > packet_len)return false; + tvlv_len =ntohs (ogm2_packet->tvlv_len); + +/* the fields of an aggregated OGMv2 are accessed assuming (at least) +* 2-byte alignment, so a following OGMv2 must start at an even offset. +*/ +if (tvlv_len &1 ) +return false; +/* check if there is enough space for the optional TVLV */ - next_buff_pos +=ntohs (ogm2_packet->tvlv_len); + next_buff_pos += tvlv_len;return next_buff_pos <= packet_len; }
net/batman-adv/bridge_loop_avoidance.c +14 -14
@@ -517,7 +517,7 @@ batadv_bla_get_backbone_gw(struct batadv_priv *bat_priv, u8 *orig,return NULL ; entry->vid = vid; - entry->lasttime = jiffies; +WRITE_ONCE (entry->lasttime, jiffies); entry->crc =BATADV_BLA_CRC_INIT ; entry->bat_priv = bat_priv;spin_lock_init (&entry->crc_lock);
@@ -585,7 +585,7 @@ batadv_bla_update_own_backbone_gw(struct batadv_priv *bat_priv,if (unlikely (!backbone_gw))return ; - backbone_gw->lasttime = jiffies; +WRITE_ONCE (backbone_gw->lasttime, jiffies);batadv_backbone_gw_put (backbone_gw); }
@@ -719,7 +719,7 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv,ether_addr_copy (claim->addr, mac);spin_lock_init (&claim->backbone_lock); claim->vid = vid; - claim->lasttime = jiffies; +WRITE_ONCE (claim->lasttime, jiffies);kref_get (&backbone_gw->refcount); claim->backbone_gw = backbone_gw;kref_init (&claim->refcount);
@@ -741,7 +741,7 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv,return ; } }else { - claim->lasttime = jiffies; +WRITE_ONCE (claim->lasttime, jiffies);if (claim->backbone_gw == backbone_gw)/* no need to register a new backbone */ goto claim_free_ref;
@@ -774,7 +774,7 @@ static void batadv_bla_add_claim(struct batadv_priv *bat_priv,spin_lock_bh (&backbone_gw->crc_lock); backbone_gw->crc ^=crc16 (0 , claim->addr,ETH_ALEN );spin_unlock_bh (&backbone_gw->crc_lock); - backbone_gw->lasttime = jiffies; +WRITE_ONCE (backbone_gw->lasttime, jiffies); claim_free_ref:batadv_claim_put (claim);
@@ -863,7 +863,7 @@ static bool batadv_handle_announce(struct batadv_priv *bat_priv, u8 *an_addr,return true;/* handle as ANNOUNCE frame */ - backbone_gw->lasttime = jiffies; +WRITE_ONCE (backbone_gw->lasttime, jiffies); crc =ntohs (*((__force __be16 *)(&an_addr[4 ]))); batadv_dbg(BATADV_DBG_BLA, bat_priv,
@@ -1258,7 +1258,7 @@ static void batadv_bla_purge_backbone_gw(struct batadv_priv *bat_priv, int now) head, hash_entry) {if (now) goto purge_now; -if (!batadv_has_timed_out (backbone_gw->lasttime, +if (!batadv_has_timed_out (READ_ONCE (backbone_gw->lasttime),BATADV_BLA_BACKBONE_TIMEOUT ))continue ;
@@ -1339,7 +1339,7 @@ static void batadv_bla_purge_claims(struct batadv_priv *bat_priv, primary_if->net_dev->dev_addr)) goto skip; -if (!batadv_has_timed_out (claim->lasttime, +if (!batadv_has_timed_out (READ_ONCE (claim->lasttime),BATADV_BLA_CLAIM_TIMEOUT )) goto skip;
@@ -1499,7 +1499,7 @@ static void batadv_bla_periodic_work(struct work_struct *work)eth_random_addr (bat_priv->bla.loopdetect_addr); bat_priv->bla.loopdetect_addr[0 ] =0xba ; bat_priv->bla.loopdetect_addr[1 ] =0xbe ; - bat_priv->bla.loopdetect_lasttime = jiffies; +WRITE_ONCE (bat_priv->bla.loopdetect_lasttime, jiffies);atomic_set (&bat_priv->bla.loopdetect_next,BATADV_BLA_LOOPDETECT_PERIODS );
@@ -1520,7 +1520,7 @@ static void batadv_bla_periodic_work(struct work_struct *work) primary_if->net_dev->dev_addr))continue ; - backbone_gw->lasttime = jiffies; +WRITE_ONCE (backbone_gw->lasttime, jiffies);batadv_bla_send_announce (bat_priv, backbone_gw);if (send_loopdetect)
@@ -1907,7 +1907,7 @@ batadv_bla_loopdetect_check(struct batadv_priv *bat_priv, struct sk_buff *skb,/* If the packet came too late, don't forward it on the mesh * but don't consider that as loop. It might be a coincidence. */ -if (batadv_has_timed_out (bat_priv->bla.loopdetect_lasttime, +if (batadv_has_timed_out (READ_ONCE (bat_priv->bla.loopdetect_lasttime),BATADV_BLA_LOOPDETECT_TIMEOUT ))return true;
@@ -2023,7 +2023,7 @@ bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb,if (own_claim) {/* ... allow it in any case */ - claim->lasttime = jiffies; +WRITE_ONCE (claim->lasttime, jiffies); goto allow; }
@@ -2127,7 +2127,7 @@ bool batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb,/* if yes, the client has roamed and we have * to unclaim it. */ -if (batadv_has_timed_out (claim->lasttime,100 )) { +if (batadv_has_timed_out (READ_ONCE (claim->lasttime),100 )) {/* only unclaim if the last claim entry is * older than 100 ms to make sure we really * have a roaming client here.
@@ -2513,7 +2513,7 @@ batadv_bla_backbone_dump_entry(struct sk_buff *msg, u32 portid, backbone_crc = backbone_gw->crc;spin_unlock_bh (&backbone_gw->crc_lock); - msecs =jiffies_to_msecs (jiffies - backbone_gw->lasttime); + msecs =jiffies_to_msecs (jiffies -READ_ONCE (backbone_gw->lasttime));if (is_own)if (nla_put_flag (msg,BATADV_ATTR_BLA_OWN )) {
net/batman-adv/distributed-arp-table.c +9 -3
@@ -216,10 +216,13 @@ static void batadv_dat_purge(struct work_struct *work)*/ static bool batadv_compare_dat (const struct hlist_node *node,const void *data2) { - const void *data1 = container_of(node, struct batadv_dat_entry, - hash_entry); +const struct batadv_dat_entry *entry1; +const struct batadv_dat_entry *entry2; -return memcmp (data1, data2,sizeof (__be32)) ==0 ; + entry1 = container_of(node, struct batadv_dat_entry, hash_entry); + entry2 = data2; + +return entry1->ip == entry2->ip && entry1->vid == entry2->vid; }/**
@@ -346,6 +349,9 @@ batadv_dat_entry_hash_find(struct batadv_priv *bat_priv, __be32 ip,if (dat_entry->ip != ip)continue ; +if (dat_entry->vid != vid) +continue ; +if (!kref_get_unless_zero (&dat_entry->refcount))continue ;
net/batman-adv/fragmentation.c +21 -1
@@ -386,6 +386,8 @@ bool batadv_frag_skb_buffer(struct sk_buff **skb,* @skb: skb to forward * @recv_if: interface that the skb is received on * @orig_node_src: originator that the skb is received from +* @rx_result: set to NET_RX_SUCCESS when the fragment was forwarded and +* NET_RX_DROP when it was dropped; only valid when true is returned * * Look up the next-hop of the fragments payload and check if the merged packet * will exceed the MTU towards the next-hop. If so, the fragment is forwarded
@@ -395,7 +397,8 @@ bool batadv_frag_skb_buffer(struct sk_buff **skb,*/ bool batadv_frag_skb_fwd (struct sk_buff *skb,struct batadv_hard_iface *recv_if, -struct batadv_orig_node *orig_node_src) +struct batadv_orig_node *orig_node_src, +int *rx_result) {struct batadv_priv *bat_priv =netdev_priv (recv_if->soft_iface);struct batadv_orig_node *orig_node_dst;
@@ -418,12 +421,29 @@ bool batadv_frag_skb_fwd(struct sk_buff *skb,*/ total_size =ntohs (packet->total_size);if (total_size > neigh_node->if_incoming->net_dev->mtu) { +if (packet->ttl <2 ) { +kfree_skb (skb); + *rx_result =NET_RX_DROP ; + ret = true; + goto out; + } + +if (skb_cow (skb,ETH_HLEN ) <0 ) { +kfree_skb (skb); + *rx_result =NET_RX_DROP ; + ret = true; + goto out; + } + + packet = (struct batadv_frag_packet *)skb->data; +batadv_inc_counter (bat_priv,BATADV_CNT_FRAG_FWD );batadv_add_counter (bat_priv,BATADV_CNT_FRAG_FWD_BYTES , skb->len +ETH_HLEN ); packet->ttl--;batadv_send_unicast_skb (skb, neigh_node); + *rx_result =NET_RX_SUCCESS ; ret = true; }
net/batman-adv/fragmentation.h +2 -1
@@ -19,7 +19,8 @@ void batadv_frag_purge_orig(struct batadv_orig_node *orig, bool (*check_cb)(struct batadv_frag_table_entry *));bool batadv_frag_skb_fwd (struct sk_buff *skb,struct batadv_hard_iface *recv_if, -struct batadv_orig_node *orig_node_src); +struct batadv_orig_node *orig_node_src, +int *rx_result);bool batadv_frag_skb_buffer (struct sk_buff **skb,struct batadv_orig_node *orig_node); int batadv_frag_send_packet(struct sk_buff *skb,
net/batman-adv/netlink.c +7 -1
@@ -939,9 +939,15 @@ static int batadv_netlink_set_hardif(struct sk_buff *skb,#ifdef CONFIG_BATMAN_ADV_BATMAN_V if (info->attrs[BATADV_ATTR_ELP_INTERVAL ]) { +u32 elp_interval; + attr = info->attrs[BATADV_ATTR_ELP_INTERVAL ]; + elp_interval =nla_get_u32 (attr); + + elp_interval =min_t (u32, elp_interval,INT_MAX ); + elp_interval =max_t (u32, elp_interval,BATADV_JITTER ); -atomic_set (&hard_iface->bat_v.elp_interval,nla_get_u32 (attr)); +atomic_set (&hard_iface->bat_v.elp_interval, elp_interval); }if (info->attrs[BATADV_ATTR_THROUGHPUT_OVERRIDE ]) {
net/batman-adv/routing.c +1 -2
@@ -1143,10 +1143,9 @@ int batadv_recv_frag_packet(struct sk_buff *skb,/* Route the fragment if it is not for us and too big to be merged. */ if (!batadv_is_my_mac (bat_priv, frag_packet->dest) && -batadv_frag_skb_fwd (skb, recv_if, orig_node_src)) { +batadv_frag_skb_fwd (skb, recv_if, orig_node_src, &ret)) {/* skb was consumed */ skb =NULL ; - ret =NET_RX_SUCCESS ; goto put_orig_node; }
net/batman-adv/tp_meter.c +75 -38
294 lines not on this page · raw message
net/batman-adv/translation-table.c +32 -8
@@ -486,6 +486,9 @@ static void batadv_tt_local_event(struct batadv_priv *bat_priv,if (!batadv_compare_eth (entry->change.addr, common->addr))continue ; +if (entry->change.vid != tt_change_node->change.vid) +continue ; +/* DEL+ADD in the same orig interval have no effect and can be * removed to avoid silly behaviour on the receiver side. The * other way around (ADD+DEL) can happen in case of roaming of
@@ -854,11 +857,18 @@ batadv_tt_prepare_tvlv_global_data(struct batadv_orig_node *orig_node,u16 total_entries =0 ;u8 *tt_change_ptr;int vlan_entries; +u16 sum_entries;spin_lock_bh (&orig_node->vlan_list_lock);hlist_for_each_entry (vlan, &orig_node->vlan_list, list) { vlan_entries =atomic_read (&vlan->tt.num_entries); - total_entries += vlan_entries; + +if (check_add_overflow (vlan_entries, total_entries, &sum_entries)) { + *tt_len =0 ; + goto out; + } + + total_entries = sum_entries; num_vlan++; }
@@ -943,17 +953,24 @@ batadv_tt_prepare_tvlv_local_data(struct batadv_priv *bat_priv, {struct batadv_tvlv_tt_vlan_data *tt_vlan;struct batadv_softif_vlan *vlan; +size_t change_offset;u16 num_vlan =0 ; -u16 vlan_entries =0 ;u16 total_entries =0 ;u16 tvlv_len;u8 *tt_change_ptr; -int change_offset; +int vlan_entries; +u16 sum_entries;spin_lock_bh (&bat_priv->softif_vlan_list_lock);hlist_for_each_entry (vlan, &bat_priv->softif_vlan_list, list) { vlan_entries =atomic_read (&vlan->tt.num_entries); - total_entries += vlan_entries;
Lines of this file are not shown. View the raw message.
net/batman-adv/tvlv.c +63 -6
69 lines not on this page · raw message
net/sched/act_pedit.c +224 -166
390 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.