Linux 6.1.177
Greg Kroah-Hartman
maintainerDocumentation/userspace-api/ioctl/ioctl-number.rst +231 -232
@@ -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,298 +84,297 @@ 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 -0x3E 00-0F linux/counter.h <mailto:[email protected]> +0x3E 00-0F linux/counter.h <mailto:[email protected]> '!' 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-3f uapi/linux/ptp_clock.h <mailto:[email protected]> -'@' 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-3f uapi/linux/ptp_clock.h <mailto:[email protected]> +'@' 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]> -'B' 00-0F xen/xenbus_dev.h conflict! -'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]> +'B' 00-0F xen/xenbus_dev.h conflict! +'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 Dead since 2022 +'D' 40-5F drivers/scsi/dpt/dtpi_ioctl.h Dead since 2022 '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! -'G' 00-0F xen/gntalloc.h, xen/gntdev.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! +'G' 00-0F xen/gntalloc.h, xen/gntdev.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! 'K' all linux/kd.h -'L' 00-1F linux/loop.h conflict! -'L' 10-1F drivers/scsi/mpt3sas/mpt3sas_ctl.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! +'L' 00-1F linux/loop.h conflict! +'L' 10-1F drivers/scsi/mpt3sas/mpt3sas_ctl.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! -'P' 00-0F xen/privcmd.h 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! +'P' 00-0F xen/privcmd.h 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 'R' E0 uapi/linux/fsl_mc.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! '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 -'i' 90-9F `linux/iio/*.h` IIO +'i' 90-9F `linux/iio/*.h` IIO '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: - <https://github.com/pali/udftools> -'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: + <https://github.com/pali/udftools> +'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 0x81 00-1F linux/vduse.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 -0xA2 all uapi/linux/acrn.h ACRN hypervisor -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 +0xA2 all uapi/linux/acrn.h ACRN hypervisor +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/asm/sgx.h <mailto:[email protected]> -0xA5 01-05 linux/surface_aggregator/cdev.h Microsoft Surface Platform System Aggregator - <mailto:[email protected]> -0xA5 20-2F linux/surface_aggregator/dtx.h Microsoft Surface DTX driver - <mailto:[email protected]> +0xA4 00-1F uapi/linux/tee.h Generic TEE subsystem +0xA4 00-1F uapi/asm/sgx.h <mailto:[email protected]> +0xA5 01-05 linux/surface_aggregator/cdev.h Microsoft Surface Platform System Aggregator + <mailto:[email protected]> +0xA5 20-2F linux/surface_aggregator/dtx.h Microsoft Surface DTX driver + <mailto:[email protected]> 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/nsfs.h <mailto:Andrei Vagin <[email protected]>> +0xB7 all uapi/linux/remoteproc_cdev.h <mailto:[email protected]> +0xB7 all uapi/linux/nsfs.h <mailto:Andrei Vagin <[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 -0xCE 01-02 uapi/linux/cxl_mem.h Compute Express Link Memory Devices +0xCE 01-02 uapi/linux/cxl_mem.h Compute Express Link Memory Devices 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 -0xEE 00-09 uapi/linux/pfrut.h Platform Firmware Runtime Update and Telemetry -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]> -0xF8 all arch/x86/include/uapi/asm/amd_hsmp.h AMD HSMP EPYC system management interface driver - <mailto:[email protected]> +0xEC 00-01 drivers/platform/chrome/cros_ec_dev.h ChromeOS EC driver +0xEE 00-09 uapi/linux/pfrut.h Platform Firmware Runtime Update and Telemetry +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]> +0xF8 all arch/x86/include/uapi/asm/amd_hsmp.h AMD HSMP EPYC system management interface driver + <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 = 6 PATCHLEVEL = 1 -SUBLEVEL = 176 +SUBLEVEL = 177 EXTRAVERSION = NAME = Curry Ramen
arch/arm/mm/alignment.c +4 -0
@@ -22,6 +22,7 @@#include <asm/cp15.h> #include <asm/system_info.h> +#include <asm/system_misc.h> #include <asm/unaligned.h> #include <asm/opcodes.h>
@@ -809,6 +810,9 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)int thumb2_32b =0 ;int fault; +if (addr >=TASK_SIZE &&user_mode (regs)) +harden_branch_predictor (); +if (interrupts_enabled (regs))local_irq_enable ();
arch/arm/mm/fault.c +72 -22
146 lines not on this page · raw message
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/include/asm/kvm-x86-ops.h +0 -1
@@ -81,7 +81,6 @@ KVM_X86_OP(check_apicv_inhibit_reasons) KVM_X86_OP(refresh_apicv_exec_ctrl) KVM_X86_OP_OPTIONAL(hwapic_irr_update) KVM_X86_OP_OPTIONAL(hwapic_isr_update) -KVM_X86_OP_OPTIONAL_RET0(guest_apic_has_interrupt) KVM_X86_OP_OPTIONAL(load_eoi_exitmap) KVM_X86_OP_OPTIONAL(set_virtual_apic_mode) KVM_X86_OP_OPTIONAL(set_apic_access_page_addr)
arch/x86/include/asm/kvm_host.h +0 -1
@@ -1549,7 +1549,6 @@ struct kvm_x86_ops {void (*refresh_apicv_exec_ctrl)(struct kvm_vcpu *vcpu);void (*hwapic_irr_update)(struct kvm_vcpu *vcpu,int max_irr);void (*hwapic_isr_update)(struct kvm_vcpu *vcpu,int isr); -bool (*guest_apic_has_interrupt)(struct kvm_vcpu *vcpu);void (*load_eoi_exitmap)(struct kvm_vcpu *vcpu,u64 *eoi_exit_bitmap);void (*set_virtual_apic_mode)(struct kvm_vcpu *vcpu);void (*set_apic_access_page_addr)(struct kvm_vcpu *vcpu);
arch/x86/kvm/mmu/mmu.c +18 -10
@@ -2239,13 +2239,15 @@ static struct kvm_mmu_page *kvm_mmu_get_child_sp(struct kvm_vcpu *vcpu, u64 *sptep, gfn_t gfn, bool direct, unsigned int access) { - union kvm_mmu_page_role role; + union kvm_mmu_page_role role = kvm_mmu_child_role(sptep, direct, access); -if (is_shadow_present_pte (*sptep) && !is_large_pte (*sptep) && -spte_to_child_sp (*sptep) &&spte_to_child_sp (*sptep)->gfn == gfn) +if (is_shadow_present_pte (*sptep) && + !is_large_pte (*sptep) && +spte_to_child_sp (*sptep) && +spte_to_child_sp (*sptep)->gfn == gfn && +spte_to_child_sp (*sptep)->role.word == role.word)return ERR_PTR (-EEXIST ); - role =kvm_mmu_child_role (sptep, direct, access);return kvm_mmu_get_shadow_page (vcpu, gfn, role); }
@@ -6415,13 +6417,19 @@ static bool kvm_mmu_zap_collapsible_spte(struct kvm *kvm, sp =sptep_to_sp (sptep);/* -* We cannot do huge page mapping for indirect shadow pages, -* which are found on the last rmap (level = 1) when not using -* tdp; such shadow pages are synced with the page table in -* the guest, and the guest page table is using 4K page size -* mapping if the indirect sp has level = 1. +* Direct shadow page can be replaced by a hugepage if the host +* mapping level allows it and the memslot maps all of the host +* hugepage. Note! If the memslot maps only part of the +* hugepage, sp->gfn may be below slot->base_gfn, and querying +* the max mapping level would cause an out-of-bounds lpage_info +* access. So the gfn bounds check *must* be done first. +* +* Indirect shadow pages are created when the guest page tables +* are using 4K pages. Since the host mapping is always +* constrained by the page size in the guest, indirect shadow +* pages are never collapsible. */ -if (sp->role.direct && +if (sp->role.direct &&is_gfn_in_memslot (slot, sp->gfn) && sp->role.level <kvm_mmu_max_mapping_level (kvm, slot, sp->gfn,PG_LEVEL_NUM )) {kvm_zap_one_rmap_spte (kvm, rmap_head, sptep);
arch/x86/kvm/svm/sev.c +1 -0
@@ -977,6 +977,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,
arch/x86/kvm/vmx/nested.c +41 -4
63 lines not on this page · raw message
arch/x86/kvm/vmx/posted_intr.h +10 -0
@@ -2,6 +2,8 @@#ifndef __KVM_X86_VMX_POSTED_INTR_H#define __KVM_X86_VMX_POSTED_INTR_H +#include <linux/find.h> +#define POSTED_INTR_ON 0#define POSTED_INTR_SN 1
@@ -103,4 +105,12 @@ int vmx_pi_update_irte(struct kvm *kvm, unsigned int host_irq, uint32_t guest_irq, bool set);void vmx_pi_start_assignment (struct kvm *kvm); +static inline int pi_find_highest_vector (struct pi_desc *pi_desc) +{ +int vec; + + vec =find_last_bit ((unsigned long *)pi_desc->pir,256 ); +return vec <256 ? vec :-1 ; +} +#endif /* __KVM_X86_VMX_POSTED_INTR_H */
arch/x86/kvm/vmx/vmenter.S +2 -0
@@ -274,6 +274,7 @@ SYM_FUNC_END(__vmx_vcpu_run) .section .text, "ax" +#ifndef CONFIG_CC_HAS_ASM_GOTO_OUTPUT /** * vmread_error_trampoline - Trampoline from inline asm to vmread_error() * @field: VMCS field encoding that failed
@@ -322,6 +323,7 @@ SYM_FUNC_START(vmread_error_trampoline) RET SYM_FUNC_END(vmread_error_trampoline) +#endif SYM_FUNC_START(vmx_do_interrupt_nmi_irqoff) /*
arch/x86/kvm/vmx/vmx.c +0 -21
@@ -4063,26 +4063,6 @@ void pt_update_intercept_for_msr(struct kvm_vcpu *vcpu) } } -static bool vmx_guest_apic_has_interrupt (struct kvm_vcpu *vcpu) -{ -struct vcpu_vmx *vmx =to_vmx (vcpu); -void *vapic_page; -u32 vppr; -int rvi; - -if (WARN_ON_ONCE (!is_guest_mode (vcpu)) || - !nested_cpu_has_vid (get_vmcs12 (vcpu)) || -WARN_ON_ONCE (!vmx->nested.virtual_apic_map.gfn)) -return false; - - rvi =vmx_get_rvi (); - - vapic_page = vmx->nested.virtual_apic_map.hva; - vppr = *((u32 *)(vapic_page +APIC_PROCPRI )); - -return ((rvi &0xf0 ) > (vppr &0xf0 )); -} -static void vmx_msr_filter_changed (struct kvm_vcpu *vcpu) {struct vcpu_vmx *vmx =to_vmx (vcpu);
@@ -8266,7 +8246,6 @@ static struct kvm_x86_ops vmx_x86_ops __initdata = { .check_apicv_inhibit_reasons = vmx_check_apicv_inhibit_reasons, .hwapic_irr_update = vmx_hwapic_irr_update, .hwapic_isr_update = vmx_hwapic_isr_update, - .guest_apic_has_interrupt = vmx_guest_apic_has_interrupt, .sync_pir_to_irr = vmx_sync_pir_to_irr, .deliver_interrupt = vmx_deliver_interrupt, .dy_apicv_has_pending_interrupt = pi_has_pending_interrupt,
arch/x86/kvm/vmx/vmx_ops.h +16 -2
@@ -11,14 +11,28 @@#include "../x86.h" void vmread_error (unsigned long field,bool fault); -__attribute__((regparm (0 )))void vmread_error_trampoline (unsigned long field, -bool fault);void vmwrite_error (unsigned long field,unsigned long value);void vmclear_error (struct vmcs *vmcs,u64 phys_addr);void vmptrld_error (struct vmcs *vmcs,u64 phys_addr);void invvpid_error (unsigned long ext,u16 vpid,gva_t gva);void invept_error (unsigned long ext,u64 eptp,gpa_t gpa); +#ifndef CONFIG_CC_HAS_ASM_GOTO_OUTPUT +/* +* The VMREAD error trampoline _always_ uses the stack to pass parameters, even +* for 64-bit targets. Preserving all registers allows the VMREAD inline asm +* blob to avoid clobbering GPRs, which in turn allows the compiler to better +* optimize sequences of VMREADs. +* +* Declare the trampoline as an opaque label as it's not safe to call from C +* code; there is no way to tell the compiler to pass params on the stack for +* 64-bit targets. +* +* void vmread_error_trampoline(unsigned long field, bool fault); +*/ +extern unsigned long vmread_error_trampoline; +#endif + static __always_inline void vmcs_check16(unsigned long field) { BUILD_BUG_ON_MSG(__builtin_constant_p(field) && ((field) & 0x6001) == 0x2000,
arch/x86/kvm/x86.c +1 -9
@@ -13046,12 +13046,6 @@ void kvm_arch_flush_shadow_memslot(struct kvm *kvm,kvm_page_track_flush_slot (kvm, slot); } -static inline bool kvm_guest_apic_has_interrupt (struct kvm_vcpu *vcpu) -{ -return (is_guest_mode (vcpu) && -static_call (kvm_x86_guest_apic_has_interrupt)(vcpu)); -} -static inline bool kvm_vcpu_has_events (struct kvm_vcpu *vcpu) {if (!list_empty_careful (&vcpu->async_pf.done))
@@ -13077,9 +13071,7 @@ static inline bool kvm_vcpu_has_events(struct kvm_vcpu *vcpu) static_call(kvm_x86_smi_allowed)(vcpu, false)))return true; -if (kvm_arch_interrupt_allowed (vcpu) && - (kvm_cpu_has_interrupt (vcpu) || -kvm_guest_apic_has_interrupt (vcpu))) +if (kvm_arch_interrupt_allowed (vcpu) &&kvm_cpu_has_interrupt (vcpu))return true;if (kvm_hv_has_stimer_pending (vcpu))
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)
@@ -48,29 +41,4 @@ enum adf_device_type {DEV_C3XXXVF , DEV_4XXX, }; - -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
@@ -75,11 +75,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 -422
453 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/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)
@@ -1572,6 +1575,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 */
@@ -1581,7 +1585,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)
@@ -2665,6 +2669,7 @@ static 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;
@@ -2674,7 +2679,7 @@ static 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 +18 -9
@@ -393,6 +393,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 ;
@@ -426,7 +427,7 @@ static enum bp_result bios_parser_get_i2c_info(struct dc_bios *dcb,break ; } -for (;;) { +for (i =0 ; i <BIOS_MAX_NUM_RECORD ; i++) { header = GET_IMAGE(struct atom_common_record_header, offset);if (!header)
@@ -532,6 +533,7 @@ static struct atom_hpd_int_record *get_hpd_record_for_path_v3( {struct atom_common_record_header *header;uint32_t offset; +int i;if (!object) {BREAK_TO_DEBUGGER ();/* Invalid object */
@@ -540,7 +542,7 @@ static struct atom_hpd_int_record *get_hpd_record_for_path_v3( 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)
@@ -610,6 +612,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 */
@@ -619,7 +622,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)
@@ -2127,6 +2130,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 */
@@ -2135,7 +2139,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)
@@ -2164,6 +2168,7 @@ static struct atom_disp_connector_caps_record *get_disp_connector_caps_record( {struct atom_common_record_header *header;uint32_t offset; +int i;if (!object) {BREAK_TO_DEBUGGER ();/* Invalid object */
@@ -2172,7 +2177,7 @@ static struct atom_disp_connector_caps_record *get_disp_connector_caps_record( 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)
@@ -2201,6 +2206,7 @@ static struct atom_connector_caps_record *get_connector_caps_record( {struct atom_common_record_header *header;uint32_t offset; +int i;if (!object) {BREAK_TO_DEBUGGER ();/* Invalid object */
@@ -2209,7 +2215,7 @@ static struct atom_connector_caps_record *get_connector_caps_record( 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)
@@ -2290,6 +2296,7 @@ static struct atom_connector_speed_record *get_connector_speed_cap_record( {struct atom_common_record_header *header;uint32_t offset; +int i;if (!object) {BREAK_TO_DEBUGGER ();/* Invalid object */
@@ -2298,7 +2305,7 @@ static struct atom_connector_speed_record *get_connector_speed_cap_record( 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)
@@ -3162,6 +3169,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;
@@ -3183,7 +3191,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,
@@ -3277,6 +3285,7 @@ static enum bp_result update_slot_layout_info_v2( struct slot_layout_info *slot_layout_info) {unsigned int record_offset; +unsigned int n;struct atom_display_object_path_v3 *object;struct atom_bracket_layout_record_v2 *record;struct atom_common_record_header *record_header;
@@ -3299,7 +3308,7 @@ static enum bp_result update_slot_layout_info_v2( (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/gpu/drm/v3d/v3d_drv.h +3 -5
@@ -26,6 +26,9 @@ struct v3d_queue_state {u64 fence_context;u64 emit_seqno; + +/* Currently active job for this queue */ +struct v3d_job *active_job; };/* Performance monitor object. The perform lifetime is controlled by userspace
@@ -110,11 +113,6 @@ struct v3d_dev {struct work_struct overflow_mem_work; -struct v3d_bin_job *bin_job; -struct v3d_render_job *render_job; -struct v3d_tfu_job *tfu_job; -struct v3d_csd_job *csd_job; -struct v3d_queue_state queue[V3D_MAX_QUEUES ];/* Spinlock used to synchronize the overflow memory
drivers/gpu/drm/v3d/v3d_gem.c +3 -2
@@ -1120,14 +1120,15 @@ void v3d_gem_destroy(struct drm_device *dev) {struct v3d_dev *v3d =to_v3d_dev (dev); +enum v3d_queue q;v3d_sched_fini (v3d);/* Waiting for jobs to finish would need to be done before * unregistering V3D. */ -WARN_ON (v3d->bin_job); -WARN_ON (v3d->render_job); +for (q =0 ; q <V3D_MAX_QUEUES ; q++) +WARN_ON (v3d->queue[q].active_job);drm_mm_takedown (&v3d->mm);
drivers/gpu/drm/v3d/v3d_irq.c +14 -10
@@ -40,6 +40,8 @@ v3d_overflow_mem_work(struct work_struct *work) container_of(work, struct v3d_dev, overflow_mem_work);struct drm_device *dev = &v3d->drm;struct v3d_bo *bo =v3d_bo_create (dev,NULL /* XXX: GMP */ ,256 *1024 ); +struct v3d_queue_state *queue = &v3d->queue[V3D_BIN ]; +struct v3d_bin_job *bin_job;struct drm_gem_object *obj;unsigned long irqflags;
@@ -59,13 +61,15 @@ v3d_overflow_mem_work(struct work_struct *work)* some binner pool anyway. */ spin_lock_irqsave (&v3d->job_lock, irqflags); -if (!v3d->bin_job) { + bin_job = (struct v3d_bin_job *)queue->active_job; + +if (!bin_job) {spin_unlock_irqrestore (&v3d->job_lock, irqflags); goto out; }drm_gem_object_get (obj); -list_add_tail (&bo->unref_head, &v3d->bin_job->render->unref_list); +list_add_tail (&bo->unref_head, &bin_job->render->unref_list);spin_unlock_irqrestore (&v3d->job_lock, irqflags);V3D_CORE_WRITE (0 ,V3D_PTB_BPOA , bo->node.start <<PAGE_SHIFT );
@@ -99,11 +103,11 @@ v3d_irq(int irq, void *arg)if (intsts &V3D_INT_FLDONE ) {struct v3d_fence *fence = -to_v3d_fence (v3d->bin_job->base.irq_fence); +to_v3d_fence (v3d->queue[V3D_BIN ].active_job->irq_fence);trace_v3d_bcl_irq (&v3d->drm, fence->seqno); - v3d->bin_job =NULL ; + v3d->queue[V3D_BIN ].active_job =NULL ;dma_fence_signal (&fence->base); status =IRQ_HANDLED ;
@@ -111,11 +115,11 @@ v3d_irq(int irq, void *arg)if (intsts &V3D_INT_FRDONE ) {struct v3d_fence *fence = -to_v3d_fence (v3d->render_job->base.irq_fence); +to_v3d_fence (v3d->queue[V3D_RENDER ].active_job->irq_fence);trace_v3d_rcl_irq (&v3d->drm, fence->seqno); - v3d->render_job =NULL ; + v3d->queue[V3D_RENDER ].active_job =NULL ;dma_fence_signal (&fence->base); status =IRQ_HANDLED ;
@@ -123,11 +127,11 @@ v3d_irq(int irq, void *arg)if (intsts &V3D_INT_CSDDONE ) {struct v3d_fence *fence = -to_v3d_fence (v3d->csd_job->base.irq_fence); +to_v3d_fence (v3d->queue[V3D_CSD ].active_job->irq_fence);trace_v3d_csd_irq (&v3d->drm, fence->seqno); - v3d->csd_job =NULL ; + v3d->queue[V3D_CSD ].active_job =NULL ;dma_fence_signal (&fence->base); status =IRQ_HANDLED ;
@@ -162,11 +166,11 @@ v3d_hub_irq(int irq, void *arg)if (intsts &V3D_HUB_INT_TFUC ) {struct v3d_fence *fence = -to_v3d_fence (v3d->tfu_job->base.irq_fence); +to_v3d_fence (v3d->queue[V3D_TFU ].active_job->irq_fence);trace_v3d_tfu_irq (&v3d->drm, fence->seqno); - v3d->tfu_job =NULL ; + v3d->queue[V3D_TFU ].active_job =NULL ;dma_fence_signal (&fence->base); status =IRQ_HANDLED ;
drivers/gpu/drm/v3d/v3d_sched.c +28 -8
@@ -80,14 +80,18 @@ static struct dma_fence *v3d_bin_job_run(struct drm_sched_job *sched_job)struct dma_fence *fence;unsigned long irqflags; -if (unlikely (job->base.base.s_fence->finished.error)) +if (unlikely (job->base.base.s_fence->finished.error)) { +spin_lock_irqsave (&v3d->job_lock, irqflags); + v3d->queue[V3D_BIN ].active_job =NULL ; +spin_unlock_irqrestore (&v3d->job_lock, irqflags);return NULL ; + }/* Lock required around bin_job update vs * v3d_overflow_mem_work(). */ spin_lock_irqsave (&v3d->job_lock, irqflags); - v3d->bin_job = job; + v3d->queue[V3D_BIN ].active_job = &job->base;/* Clear out the overflow allocation, so we don't * reuse the overflow attached to a previous job. */
@@ -134,10 +138,12 @@ static struct dma_fence *v3d_render_job_run(struct drm_sched_job *sched_job)struct drm_device *dev = &v3d->drm;struct dma_fence *fence; -if (unlikely (job->base.base.s_fence->finished.error)) +if (unlikely (job->base.base.s_fence->finished.error)) { + v3d->queue[V3D_RENDER ].active_job =NULL ;return NULL ; + } - v3d->render_job = job; + v3d->queue[V3D_RENDER ].active_job = &job->base;/* Can we avoid this flush? We need to be careful of * scheduling, though -- imagine job0 rendering to texture and
@@ -179,10 +185,12 @@ v3d_tfu_job_run(struct drm_sched_job *sched_job)struct drm_device *dev = &v3d->drm;struct dma_fence *fence; -if (unlikely (job->base.base.s_fence->finished.error)) +if (unlikely (job->base.base.s_fence->finished.error)) { + v3d->queue[V3D_TFU ].active_job =NULL ;return NULL ; + } - v3d->tfu_job = job; + v3d->queue[V3D_TFU ].active_job = &job->base; fence =v3d_fence_create (v3d,V3D_TFU );if (IS_ERR (fence))
@@ -221,10 +229,22 @@ v3d_csd_job_run(struct drm_sched_job *sched_job)struct dma_fence *fence;int i; -if (unlikely (job->base.base.s_fence->finished.error)) +if (unlikely (job->base.base.s_fence->finished.error)) { + v3d->queue[V3D_CSD ].active_job =NULL ; +return NULL ; + } + +/* The HW interprets a workgroup size of 0 as 65536; however, the +* user-space driver exposes a maximum of 65535. Therefore, a 0 in +* any dimension means that we have no workgroups and the compute +* shader should not be dispatched. +*/ +if (!V3D_GET_FIELD (job->args.cfg[0 ],V3D_CSD_QUEUED_CFG0_NUM_WGS_X ) || + !V3D_GET_FIELD (job->args.cfg[1 ],V3D_CSD_QUEUED_CFG1_NUM_WGS_Y ) || + !V3D_GET_FIELD (job->args.cfg[2 ],V3D_CSD_QUEUED_CFG2_NUM_WGS_Z ))return NULL ; - v3d->csd_job = job; + v3d->queue[V3D_CSD ].active_job = &job->base;v3d_invalidate_caches (v3d);
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 +26 -3
@@ -2027,8 +2027,8 @@ static acpi_status vmbus_walk_resources(struct acpi_resource *res, void *ctx)return AE_NO_MEMORY ;/* If this range overlaps the virtual TPM, truncate it. */ -if (end >VTPM_BASE_ADDRESS && start <VTPM_BASE_ADDRESS ) - end =VTPM_BASE_ADDRESS ; +if (end >=VTPM_BASE_ADDRESS && start <VTPM_BASE_ADDRESS ) + end =VTPM_BASE_ADDRESS -1 ; new_res->name ="hyperv mmio" ; new_res->flags =IORESOURCE_MEM ;
@@ -2096,12 +2096,31 @@ static int vmbus_acpi_remove(struct acpi_device *device)static void vmbus_reserve_fb (void ) {resource_size_t start =0 , size; +resource_size_t low_mmio_base;struct pci_dev *pdev;if (efi_enabled (EFI_BOOT )) {/* Gen2 VM: get FB base from EFI framebuffer */ start = screen_info.lfb_base; size =max_t (__u32, screen_info.lfb_size,0x800000 ); + + low_mmio_base = hyperv_mmio->start; +if (!low_mmio_base ||upper_32_bits (low_mmio_base) || + (start && start < low_mmio_base)) { +pr_warn ("Unexpected low mmio base %pa\n" , &low_mmio_base); + }else { +/* +* If the kdump/kexec or CVM kernel's lfb_base +* is 0, fall back to the low mmio base. +*/ +if (!start) + start = low_mmio_base; +/* +* Reserve half of the space below 4GB for high +* resolutions, but cap the reservation to 128MB. +*/ + size =min ((SZ_4G - start) /2 ,SZ_128M ); + } }else {/* Gen1 VM: get FB base from PCI */ pdev = pci_get_device(PCI_VENDOR_ID_MICROSOFT,
@@ -2121,8 +2140,10 @@ static void vmbus_reserve_fb(void)pci_dev_put (pdev); } -if (!start) +if (!start) { +pr_warn ("Unexpected framebuffer mmio base of zero\n" );return ; + }/* * Make a claim for the frame buffer in the resource tree under the
@@ -2132,6 +2153,8 @@ static void vmbus_reserve_fb(void)*/ for (; !fb_mmio && (size >=0x100000 ); size >>=1 ) fb_mmio =__request_region (hyperv_mmio, start, size, fb_mmio_name,0 ); + +pr_info ("hv_mmio=%pR,%pR fb=%pR\n" , hyperv_mmio, hyperv_mmio->sibling, fb_mmio); }/**
drivers/i2c/i2c-stub.c +5 -0
@@ -214,6 +214,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
@@ -3870,7 +3870,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
@@ -378,6 +378,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.
@@ -465,6 +466,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 +6 -1
@@ -262,6 +262,7 @@ struct fastrpc_channel_ctx {struct fastrpc_device *fdevice;bool secure;bool unsigned_support; +u64 dma_mask; };struct fastrpc_device {
@@ -2174,13 +2175,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); err =of_platform_populate (rdev->of_node,NULL ,NULL , rdev);if (err)
@@ -2247,6 +2249,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/net/ethernet/qualcomm/rmnet/rmnet_config.c +4 -4
@@ -205,8 +205,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);
@@ -230,9 +230,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
@@ -17,6 +17,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/wan/hdlc_ppp.c +13 -2
@@ -621,7 +621,6 @@ static void ppp_start(struct net_device *dev)struct proto *proto = &ppp->protos[i]; proto->dev = dev; -timer_setup (&proto->timer, ppp_timer,0 ); proto->state =CLOSED ; } ppp->protos[IDX_LCP ].pid =PID_LCP ;
@@ -641,6 +640,15 @@ static void ppp_close(struct net_device *dev)ppp_tx_flush (); } +static void ppp_timer_release (struct net_device *dev) +{ +struct ppp *ppp =get_ppp (dev); +int i; + +for (i =0 ; i <IDX_COUNT ; i++) +timer_shutdown_sync (&ppp->protos[i].timer); +} +static struct hdlc_proto proto = { .start = ppp_start, .stop = ppp_stop,
@@ -649,6 +657,7 @@ static struct hdlc_proto proto = { .ioctl = ppp_ioctl, .netif_rx = ppp_rx, .module = THIS_MODULE, + .detach = ppp_timer_release, };static const struct header_ops ppp_header_ops = {
@@ -659,7 +668,7 @@ static int ppp_ioctl(struct net_device *dev, struct if_settings *ifs) {hdlc_device *hdlc =dev_to_hdlc (dev);struct ppp *ppp; -int result; +int i, result;switch (ifs->type) {case IF_GET_PROTO :
@@ -687,6 +696,8 @@ static int ppp_ioctl(struct net_device *dev, struct if_settings *ifs)return result; ppp =get_ppp (dev); +for (i =0 ; i <IDX_COUNT ; i++) +timer_setup (&ppp->protos[i].timer, ppp_timer,0 );spin_lock_init (&ppp->lock); ppp->req_timeout =2 ; ppp->cr_retries =10 ;
drivers/net/wireless/ath/ath11k/dp.c +1 -0
@@ -1039,6 +1039,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/ntb/hw/epf/ntb_hw_epf.c +2 -1
@@ -649,7 +649,8 @@ static void ntb_epf_deinit_pci(struct ntb_epf_dev *ndev)struct pci_dev *pdev = ndev->ntb.pdev;pci_iounmap (pdev, ndev->ctrl_reg); -pci_iounmap (pdev, ndev->peer_spad_reg); +if (ndev->barno_map[BAR_PEER_SPAD ] != ndev->barno_map[BAR_CONFIG ]) +pci_iounmap (pdev, ndev->peer_spad_reg);pci_iounmap (pdev, ndev->db_reg);pci_clear_master (pdev);
drivers/power/reset/linkstation-poweroff.c +1 -1
@@ -163,10 +163,10 @@ static int __init linkstation_poweroff_init(void) dn =of_find_matching_node (NULL , ls_poweroff_of_match);if (!dn)return -ENODEV ; -of_node_put (dn); match =of_match_node (ls_poweroff_of_match, dn); cfg = match->data; +of_node_put (dn); dn =of_find_node_by_name (NULL , cfg->mdio_node_name);if (!dn)
drivers/regulator/core.c +9 -1
@@ -2183,8 +2183,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/rpmsg/rpmsg_char.c +8 -0
@@ -75,6 +75,7 @@ int rpmsg_chrdev_eptdev_destroy(struct device *dev, void *data)struct rpmsg_eptdev *eptdev =dev_to_eptdev (dev);mutex_lock (&eptdev->ept_lock); + eptdev->rpdev =NULL ;if (eptdev->ept) {/* The default endpoint is released by the rpmsg core */ if (!eptdev->default_ept)
@@ -128,6 +129,11 @@ static int rpmsg_eptdev_open(struct inode *inode, struct file *filp)return -EBUSY ; } +if (!eptdev->rpdev) { +mutex_unlock (&eptdev->ept_lock); +return -ENETRESET ; + } +get_device (dev);/*
@@ -279,7 +285,9 @@ static __poll_t rpmsg_eptdev_poll(struct file *filp, poll_table *wait)if (!skb_queue_empty (&eptdev->queue)) mask |=EPOLLIN |EPOLLRDNORM ; +mutex_lock (&eptdev->ept_lock); mask |=rpmsg_poll (eptdev->ept, filp, wait); +mutex_unlock (&eptdev->ept_lock);return mask; }
drivers/tty/serial/8250/8250_dw.c +3 -1
@@ -673,8 +673,10 @@ static int dw8250_probe(struct platform_device *pdev)*/ if (data->clk) { err =clk_notifier_register (data->clk, &data->clk_notifier); -if (err) +if (err) { +serial8250_unregister_port (data->data.line);return dev_err_probe (dev, err,"Failed to set the clock notifier\n" ); + }queue_work (system_unbound_wq, &data->clk_work); }
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/video/fbdev/core/fbmem.c +12 -0
@@ -1855,6 +1855,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
@@ -657,7 +657,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 until recovery is successful or failed */
fs/exfat/dir.c +3 -1
@@ -1040,12 +1040,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 ; }
@@ -1056,6 +1056,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);
@@ -1074,6 +1075,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
@@ -518,6 +518,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
@@ -46,6 +46,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 );
@@ -69,8 +70,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);
@@ -85,6 +89,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));
@@ -92,6 +101,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));
@@ -107,7 +121,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/f2fs/file.c +8 -1
@@ -1786,8 +1786,15 @@ static int expand_inode_data(struct inode *inode, loff_t offset,if (f2fs_is_pinned_file (inode)) {block_t sec_blks =CAP_BLKS_PER_SEC (sbi); -block_t sec_len =roundup (map.m_len, sec_blks); +block_t sec_len; +if (map.m_lblk % sec_blks) { + map.m_lblk =rounddown (map.m_lblk, sec_blks); + map.m_len = pg_end - map.m_lblk; +if (off_end) + map.m_len++; + } + sec_len =roundup (map.m_len, sec_blks); map.m_len = sec_blks; next_alloc: if (has_not_enough_free_secs(sbi, 0,
fs/f2fs/inode.c +7 -2
@@ -476,8 +476,13 @@ static int do_read_inode(struct inode *inode)static bool is_meta_ino (struct f2fs_sb_info *sbi,unsigned int ino) { -return ino ==F2FS_NODE_INO (sbi) || ino ==F2FS_META_INO (sbi) || - ino ==F2FS_COMPRESS_INO (sbi); +if (ino ==F2FS_NODE_INO (sbi) || ino ==F2FS_META_INO (sbi)) +return true; +#ifdef CONFIG_F2FS_FS_COMPRESSION +if (test_opt (sbi,COMPRESS_CACHE ) && ino ==F2FS_COMPRESS_INO (sbi)) +return true; +#endif +return false; }struct inode *f2fs_iget (struct super_block *sb,unsigned long ino)
fs/fuse/dev.c +9 -14
@@ -839,6 +839,10 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep)if (WARN_ON (PageMlocked (oldpage))) goto out_fallback_unlock; + err =lock_request (cs->req); +if (err) + goto out_fallback_unlock; +replace_page_cache_page (oldpage, newpage);get_page (newpage);
@@ -852,20 +856,7 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep)*/ pipe_buf_release (cs->pipe, buf); - err =0 ; -spin_lock (&cs->req->waitq.lock); -if (test_bit (FR_ABORTED , &cs->req->flags)) - err = -ENOENT ; -else - *pagep = newpage; -spin_unlock (&cs->req->waitq.lock); - -if (err) { -unlock_page (newpage); -put_page (newpage); - goto out_put_old; - } - + *pagep = newpage;unlock_page (oldpage);/* Drop ref for ap->pages[] array */ put_page (oldpage);
@@ -1718,6 +1709,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
@@ -356,8 +356,14 @@ void fuse_file_release(struct inode *inode, struct fuse_file *ff,* 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); +fuse_file_put (ff, ff->fm->fc->auto_submounts); }void fuse_release_common (struct file *file,bool isdir)
fs/nfs/pnfs.c +1 -1
@@ -2070,11 +2070,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/nfs/pnfs_nfs.c +2 -2
@@ -1057,14 +1057,14 @@ nfs4_decode_mp_ds_addr(struct net *net, struct xdr_stream *xdr, gfp_t gfp_flags)/* r_netid */ nlen =xdr_stream_decode_string_dup (xdr, &netid,XDR_MAX_NETOBJ , gfp_flags); -if (unlikely (nlen <0 )) +if (unlikely (nlen <=0 )) goto out_err;/* r_addr: ip/ip6addr with port in dec octets - see RFC 5665 */ /* port is ".ABC.DEF", 8 chars max */ rlen =xdr_stream_decode_string_dup (xdr, &buf,INET6_ADDRSTRLEN +IPV6_SCOPE_ID_LEN +8 , gfp_flags); -if (unlikely (rlen <0 )) +if (unlikely (rlen <=0 )) goto out_free_netid;/* replace port '.' with '-' */
fs/nfsd/nfs2acl.c +12 -5
@@ -131,10 +131,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:
@@ -312,6 +309,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 */
@@ -345,7 +352,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
@@ -118,10 +118,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; }
@@ -225,6 +222,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 */
@@ -258,7 +265,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/ntfs3/xattr.c +12 -0
@@ -846,6 +846,12 @@ static int ntfs_getxattr(const struct xattr_handler *handler, struct dentry *de,return err; } +static bool ntfs_is_reserved_lxattr (const char *name) +{ +return !strcmp (name,"$LXUID" ) || !strcmp (name,"$LXGID" ) || + !strcmp (name,"$LXMOD" ) || !strcmp (name,"$LXDEV" ); +} +/* * ntfs_setxattr - inode_operations::setxattr */
@@ -951,6 +957,12 @@ static noinline int ntfs_setxattr(const struct xattr_handler *handler, goto out; } +/* Do not allow non privileged users to change $LXUID/$LXGID... */ +if (ntfs_is_reserved_lxattr (name) && !capable (CAP_SYS_ADMIN )) { + err = -EPERM ; + goto out; + } +/* Deal with NTFS extended attribute. */ err =ntfs_set_ea (inode, name, name_len, value, size, flags,0 );
fs/ocfs2/suballoc.c +22 -0
@@ -201,8 +201,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,
@@ -210,6 +218,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",
fs/smb/server/smb2pdu.c +5 -0
@@ -605,6 +605,11 @@ int smb2_check_user_session(struct ksmbd_work *work) sess_id, work->sess->id);return -EINVAL ; } +if (work->sess->state !=SMB2_SESSION_VALID ) { +pr_err ("compound request on a non-valid session (state %d)\n" , + work->sess->state); +return -EINVAL ; + }return 1 ; }
fs/smb/server/smbacl.c +3 -1
@@ -1331,7 +1331,9 @@ int smb_check_perm_dacl(struct ksmbd_conn *conn, const struct path *path,break ; aces_size -= ace_size; -if (ace->sid.num_subauth >SID_MAX_SUB_AUTHORITIES ) +if (ace->sid.num_subauth >SID_MAX_SUB_AUTHORITIES || + ace_size < offsetof(struct smb_ace , sid) +CIFS_SID_BASE_SIZE + +sizeof (__le32) * ace->sid.num_subauth)break ; if (!compare_sids(&sid, &ace->sid) ||
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/kvm_host.h +6 -1
@@ -1621,6 +1621,11 @@ int kvm_request_irq_source_id(struct kvm *kvm);void kvm_free_irq_source_id (struct kvm *kvm,int irq_source_id);bool kvm_arch_irqfd_allowed (struct kvm *kvm,struct kvm_irqfd *args); +static inline bool is_gfn_in_memslot (const struct kvm_memory_slot *slot,gfn_t gfn) +{ +return gfn >= slot->base_gfn && gfn < slot->base_gfn + slot->npages; +} +/* * Returns a pointer to the memslot if it contains gfn. * Otherwise returns NULL.
@@ -1631,7 +1636,7 @@ try_get_memslot(struct kvm_memory_slot *slot, gfn_t gfn)if (!slot)return NULL ; -if (gfn >= slot->base_gfn && gfn < slot->base_gfn + slot->npages) +if (is_gfn_in_memslot (slot, gfn))return slot;else return NULL ;
include/linux/lockdep.h +14 -0
@@ -339,6 +339,16 @@ extern void lock_unpin_lock(struct lockdep_map *lock, struct pin_cookie);#define lockdep_repin_lock (l,c) lock_repin_lock(&(l)->dep_map, (c))#define lockdep_unpin_lock (l,c) lock_unpin_lock(&(l)->dep_map, (c)) +/* +* Must use lock_map_aquire_try() with override maps to avoid +* lockdep thinking they participate in the block chain. +*/ +#define DEFINE_WAIT_OVERRIDE_MAP (_name, _wait_type) \ + struct lockdep_map _name = { \ + .name = #_name "-wait-type-override", \ + .wait_type_inner = _wait_type, \ + .lock_type = LD_LOCK_WAIT_OVERRIDE, } +#else /* !CONFIG_LOCKDEP */ static inline void lockdep_init_task (struct task_struct *task)
@@ -427,6 +437,9 @@ extern int lockdep_is_held(const void *);#define lockdep_repin_lock (l, c) do { (void)(l); (void)(c); } while (0)#define lockdep_unpin_lock (l, c) do { (void)(l); (void)(c); } while (0) +#define DEFINE_WAIT_OVERRIDE_MAP (_name, _wait_type) \ + struct lockdep_map __maybe_unused _name = {} +#endif /* !LOCKDEP */ enum xhlock_context_t {
@@ -552,6 +565,7 @@ do { \#define rwsem_release (l, i) lock_release(l, i)#define lock_map_acquire (l) lock_acquire_exclusive(l, 0, 0, NULL, _THIS_IP_) +#define lock_map_acquire_try (l) lock_acquire_exclusive(l, 0, 1, NULL, _THIS_IP_)#define lock_map_acquire_read (l) lock_acquire_shared_recursive(l, 0, 0, NULL, _THIS_IP_)#define lock_map_acquire_tryread (l) lock_acquire_shared_recursive(l, 0, 1, NULL, _THIS_IP_)#define lock_map_release (l) lock_release(l, _THIS_IP_)
include/linux/lockdep_types.h +1 -0
@@ -33,6 +33,7 @@ enum lockdep_wait_type {enum lockdep_lock_type {LD_LOCK_NORMAL =0 ,/* normal, catch all */ LD_LOCK_PERCPU ,/* percpu */ +LD_LOCK_WAIT_OVERRIDE ,/* annotation */ LD_LOCK_MAX , };
include/linux/ring_buffer.h +1 -3
@@ -130,9 +130,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/skmsg.h +11 -4
@@ -4,6 +4,7 @@#ifndef _LINUX_SKMSG_H#define _LINUX_SKMSG_H +#include <linux/bitops.h> #include <linux/bpf.h> #include <linux/filter.h> #include <linux/scatterlist.h>
@@ -188,11 +189,14 @@ static inline void sk_msg_xfer(struct sk_msg *dst, struct sk_msg *src, int which, u32 size) { dst->sg.data[which] = src->sg.data[which]; +__assign_bit (which, dst->sg.copy,test_bit (which, src->sg.copy)); dst->sg.data[which].length = size; dst->sg.size += size; src->sg.size -= size; src->sg.data[which].length -= size; src->sg.data[which].offset += size; +if (!src->sg.data[which].length) +__clear_bit (which, src->sg.copy); }static inline void sk_msg_xfer_full (struct sk_msg *dst,struct sk_msg *src)
@@ -262,16 +266,19 @@ static inline void sk_msg_page_add(struct sk_msg *msg, struct page *page,static inline void sk_msg_sg_copy (struct sk_msg *msg,u32 i,bool copy_state) {do { -if (copy_state) -__set_bit (i, msg->sg.copy); -else -__clear_bit (i, msg->sg.copy); +__assign_bit (i, msg->sg.copy, copy_state);sk_msg_iter_var_next (i);if (i == msg->sg.end)break ; }while (1 ); } +static inline void sk_msg_sg_copy_assign (struct sk_msg *dst,u32 dst_i, +const struct sk_msg *src,u32 src_i) +{ +__assign_bit (dst_i, dst->sg.copy,test_bit (src_i, src->sg.copy)); +} +static inline void sk_msg_sg_copy_set (struct sk_msg *msg,u32 start) {sk_msg_sg_copy (msg, start, true);
include/net/netfilter/nf_tables.h +6 -0
@@ -422,6 +422,9 @@ struct nft_set_ext;* @remove: remove element from set * @walk: iterate over all set elements * @get: get set elements +* @ksize: kernel set size +* @usize: userspace set size +* @adjust_maxsize: delta to adjust maximum set size * @privsize: function to return size of set private data * @init: initialize private data of new set instance * @destroy: destroy private data of set instance
@@ -470,6 +473,9 @@ struct nft_set_ops {const struct nft_set *set, const struct nft_set_elem *elem, unsigned int flags); +u32 (*ksize)(u32 size); +u32 (*usize)(u32 size); +u32 (*adjust_maxsize)(const struct nft_set *set);void (*commit)(struct nft_set *set);void (*abort)(const struct nft_set *set); u64 (*privsize)(const struct nlattr * const nla[],
include/net/phonet/pn_dev.h +1 -1
@@ -38,7 +38,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 +0 -1
@@ -14,7 +14,6 @@ struct tcf_pedit_key_ex {struct tcf_pedit_parms {struct tc_pedit_key *tcfp_keys;struct tcf_pedit_key_ex *tcfp_keys_ex; -u32 tcfp_off_max_hint;unsigned char tcfp_nkeys;unsigned char tcfp_flags;struct rcu_head rcu;
kernel/bpf/cgroup.c +1 -1
@@ -1745,7 +1745,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;
Lines of this file are not shown. View the raw message.
kernel/trace/ring_buffer.c +10 -57
67 lines not on this page · raw message
lib/debugobjects.c +53 -4
57 lines not on this page · raw message
net/batman-adv/bridge_loop_avoidance.c +14 -14
Lines of this file are not shown. View the raw message.
net/batman-adv/routing.c +61 -3
64 lines not on this page · raw message
net/batman-adv/tp_meter.c +75 -38
113 lines not on this page · raw message
net/batman-adv/tvlv.c +63 -6
69 lines not on this page · raw message
net/netfilter/nf_tables_api.c +61 -13
74 lines not on this page · raw message
net/netfilter/nft_set_rbtree.c +43 -0
43 lines not on this page · raw message
net/sched/act_pedit.c +57 -44
101 lines not on this page · raw message
security/apparmor/include/policy_unpack.h +19 -0
Lines of this file are not shown. View the raw message.
tools/testing/selftests/bpf/prog_tests/empty_skb.c +10 -15
Lines of this file are not shown. View the raw message.
tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c +0 -8
Lines of this file are not shown. View the raw message.
tools/testing/selftests/bpf/prog_tests/perf_link.c +13 -2
Lines of this file are not shown. View the raw message.
tools/testing/selftests/bpf/prog_tests/tc_redirect.c +73 -81
154 lines not on this page · raw message
tools/testing/selftests/bpf/prog_tests/test_tunnel.c +28 -43
71 lines not on this page · raw message
tools/testing/selftests/bpf/prog_tests/xdp_bonding.c +16 -24
Lines of this file are not shown. View the raw message.
tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c +11 -19
Lines of this file are not shown. View the raw message.
tools/testing/selftests/bpf/prog_tests/xdp_synproxy.c +18 -23
41 lines not on this page · raw message
tools/testing/selftests/bpf/test_progs.h +15 -0
Lines of this file are not shown. View the raw message.
tools/testing/selftests/bpf/testing_helpers.h +10 -0
Lines of this file are not shown. View the 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.
Greg Kroah-Hartman
maintainerI'm announcing the release of the 6.1.177 kernel.
All users of the 6.1 kernel series must upgrade.
The updated 6.1.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.1.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 | 463 ++++++------- Makefile | 2 arch/arm/mm/alignment.c | 4 arch/arm/mm/fault.c | 94 ++ arch/mips/dec/prom/console.c | 7 arch/x86/include/asm/kvm-x86-ops.h | 1 arch/x86/include/asm/kvm_host.h | 1 arch/x86/kvm/mmu/mmu.c | 28 arch/x86/kvm/svm/sev.c | 1 arch/x86/kvm/vmx/nested.c | 45 + arch/x86/kvm/vmx/posted_intr.h | 10 arch/x86/kvm/vmx/vmenter.S | 2 arch/x86/kvm/vmx/vmx.c | 21 arch/x86/kvm/vmx/vmx_ops.h | 18 arch/x86/kvm/x86.c | 10 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 | 425 ----------- drivers/crypto/qat/qat_common/adf_dev_mgr.c | 70 - drivers/fpga/of-fpga-region.c | 3 drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 15 drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 27 drivers/gpu/drm/amd/display/dc/bios/bios_parser_helper.h | 5 drivers/gpu/drm/v3d/v3d_drv.h | 8 drivers/gpu/drm/v3d/v3d_gem.c | 5 drivers/gpu/drm/v3d/v3d_irq.c | 24 drivers/gpu/drm/v3d/v3d_sched.c | 36 - drivers/hv/hv_kvp.c | 25 drivers/hv/vmbus_drv.c | 29 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 | 7 drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 8 drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h | 1 drivers/net/wan/hdlc_ppp.c | 15 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/ntb/hw/epf/ntb_hw_epf.c | 3 drivers/power/reset/linkstation-poweroff.c | 2 drivers/regulator/core.c | 10 drivers/rpmsg/rpmsg_char.c | 8 drivers/tty/serial/8250/8250_dw.c | 4 drivers/tty/vt/vc_screen.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/f2fs/file.c | 9 fs/f2fs/inode.c | 9 fs/fuse/dev.c | 23 fs/fuse/file.c | 8 fs/nfs/pnfs.c | 2 fs/nfs/pnfs_nfs.c | 4 fs/nfsd/nfs2acl.c | 17 fs/nfsd/nfs3acl.c | 17 fs/nfsd/nfs4recover.c | 3 fs/nfsd/nfs4xdr.c | 3 fs/ntfs3/xattr.c | 12 fs/ocfs2/suballoc.c | 22 fs/smb/server/smb2pdu.c | 5 fs/smb/server/smbacl.c | 4 include/keys/request_key_auth-type.h | 2 include/linux/kvm_host.h | 7 include/linux/lockdep.h | 14 include/linux/lockdep_types.h | 1 include/linux/ring_buffer.h | 4 include/linux/skmsg.h | 15 include/net/netfilter/nf_tables.h | 6 include/net/phonet/pn_dev.h | 2 include/net/tc_act/tc_pedit.h | 1 kernel/bpf/cgroup.c | 2 kernel/locking/lockdep.c | 28 kernel/locking/rtmutex.c | 3 kernel/locking/rtmutex_api.c | 2 kernel/trace/ring_buffer.c | 67 - kernel/trace/trace.c | 14 kernel/trace/trace_kdb.c | 8 lib/debugobjects.c | 57 + mm/vmscan.c | 13 net/9p/client.c | 3 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 | 64 + net/batman-adv/tp_meter.c | 113 ++- net/batman-adv/translation-table.c | 32 net/batman-adv/tvlv.c | 69 + net/batman-adv/types.h | 21 net/core/filter.c | 27 net/core/skmsg.c | 16 net/ipv4/tcp.c | 4 net/ipv4/tcp_bpf.c | 2 net/ipv4/tcp_input.c | 14 net/ipv4/tcp_minisocks.c | 2 net/ipv4/udp.c | 2 net/ipv4/udp_bpf.c | 2 net/ipv6/ip6_output.c | 4 net/ipv6/ip6_vti.c | 1 net/mac802154/llsec.c | 14 net/mptcp/pm_userspace.c | 13 net/mptcp/protocol.c | 4 net/netfilter/nf_tables_api.c | 74 +- net/netfilter/nft_set_rbtree.c | 43 + net/phonet/pn_dev.c | 12 net/phonet/pn_netlink.c | 23 net/sched/act_pedit.c | 101 +- net/tipc/crypto.c | 9 net/tls/tls_sw.c | 4 net/unix/af_unix.c | 11 security/apparmor/include/policy_unpack.h | 19 security/apparmor/lsm.c | 16 security/apparmor/policy.c | 8 security/keys/internal.h | 2 security/keys/keyctl.c | 24 security/keys/keyctl_pkey.c | 9 security/keys/request_key_auth.c | 33 tools/perf/bench/find-bit-bench.c | 8 tools/perf/util/block-range.c | 6 tools/testing/selftests/bpf/bench.h | 9 tools/testing/selftests/bpf/prog_tests/empty_skb.c | 25 tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c | 8 tools/testing/selftests/bpf/prog_tests/perf_link.c | 15 tools/testing/selftests/bpf/prog_tests/tc_redirect.c | 154 ++-- tools/testing/selftests/bpf/prog_tests/test_tunnel.c | 71 - tools/testing/selftests/bpf/prog_tests/xdp_bonding.c | 40 - tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c | 30 tools/testing/selftests/bpf/prog_tests/xdp_synproxy.c | 41 - tools/testing/selftests/bpf/test_progs.h | 15 tools/testing/selftests/bpf/testing_helpers.h | 10 tools/testing/selftests/ptp/testptp.c | 19 142 files changed, 1796 insertions(+), 1527 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()
Bryam Vargas (1):
apparmor: mediate the implicit connect of TCP fast open sendmsg
Davidlohr Bueso (1):
locking/rtmutex: Skip remove_waiter() when waiter is not enqueued
Dawei Feng (1):
bpf: use kvfree() for replaced sysctl write buffer
Deepak Kumar Singh (1):
rpmsg: char: Add lock to avoid race when rpmsg device is released
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 (2):
ip6_vti: set netns_immutable on the fallback device.
net: annotate data-races around sk->sk_{data_ready,write_space}
Fan Wu (1):
hdlc_ppp: sync per-proto timers before freeing hdlc state
Florian Westphal (2):
netfilter: nf_tables: always increment set element count
netfilter: nf_tables: always walk all pending catchall elements
Gil Portnoy (1):
ksmbd: reject non-VALID session in compound request branch
Giovanni Cabiddu (1):
crypto: qat - remove unused character device and IOCTLs
Greg Kroah-Hartman (1):
Linux 6.1.177
Guannan Wang (1):
NFSD: Fix SECINFO_NO_NAME decode error cleanup
Hangbin Liu (1):
selftests/bpf: move SYS() macro into the test_progs.h
Harry Wentland (1):
drm/amd/display: Bound VBIOS record-chain walk loops
Helen Koike (1):
debugobjects: Do not fill_pool() if pi_blocked_on
Hem Parekh (1):
ksmbd: fix out-of-bounds read in smb_check_perm_dacl()
Herbert Xu (1):
crypto: qat - Return pointer directly in adf_ctl_alloc_resources
Ian Bridges (1):
fbdev: Fix fb_new_modelist to prevent null-ptr-deref in fb_videomode_to_var
Ian Rogers (2):
perf bench: Avoid NDEBUG warning
perf block-range: Move debug code behind ifndef NDEBUG
Ihor Solodrai (1):
selftests/bpf: Check for timeout in perf_link test
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
Jiexun Wang (1):
af_unix: Reject SIOCATMARK on non-stream sockets
Jiri Olsa (1):
selftests/bpf: Move get_time_ns to testing_helpers.h
Joanne Koong (1):
fuse: re-lock request before replacing page cache folio
Jose Ignacio Tornos Martinez (1):
wifi: ath11k: fix warning when unbinding
Koichiro Den (1):
NTB: epf: Avoid pci_iounmap() with offset when PEER_SPAD and CONFIG share BAR
Konstantin Komarov (1):
ntfs3: reject direct userspace writes to reserved $LX* xattrs
Kuniyuki Iwashima (2):
phonet: Pass ifindex to fill_addr().
phonet: Pass net and ifindex to phonet_address_notify().
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
Maíra Canal (2):
drm/v3d: Store the active job inside the queue's state drm/v3d: Skip CSD when it has zeroed workgroups
Michael Bommarito (2):
exfat: fix potential use-after-free in exfat_find_dir_entry() NFSv4/pNFS: reject zero-length r_addr in nfs4_decode_mp_ds_addr
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
Pablo Neira Ayuso (2):
netfilter: nf_tables: fix set size with rbtree backend
netfilter: nf_tables: unconditionally bump set->nelems before insertion
Paolo Abeni (1):
mptcp: fix missing wakeups in edge scenarios
Paolo Bonzini (1):
KVM: x86: Fix shadow paging use-after-free due to unexpected role
Pedro Tammela (3):
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
Peter Zijlstra (1):
debugobjects,locking: Annotate debug_object_fill_pool() wait type violation
Petr Machata (1):
Revert "ptp: add testptp mask test"
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 (2):
media: vidtv: fix NULL pointer dereference in vidtv_mux_push_si
apparmor: fix use-after-free in rawdata dedup loop
Russell King (Oracle) (4):
ARM: group is_permission_fault() with is_translation_fault()
ARM: allow __do_kernel_fault() to report execution of memory faults
ARM: fix hash_name() fault
ARM: fix branch predictor hardening
Santosh Kalluri (1):
net: phonet: free phonet_device after RCU grace period
Sean Christopherson (5):
KVM: VMX: Make vmread_error_trampoline() uncallable from C code
KVM: nVMX: Add a helper to get highest pending from Posted Interrupt vector
KVM: nVMX: Check for pending posted interrupts when looking for nested events
KVM: nVMX: Fold requested virtual interrupt check into has_nested_events()
KVM: x86/mmu: Ensure hugepage is in by slot before checking max mapping level
Sebastian Andrzej Siewior (2):
debugobjects: Allow to refill the pool before SYSTEM_SCHEDULING
debugobjects: Use LD_WAIT_CONFIG instead of LD_WAIT_SLEEP
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
Stepan Ionichev (1):
serial: 8250_dw: unregister 8250 port if clk_notifier_register() fails
Sunmin Jeong (1):
f2fs: fix to round down start offset of fallocate for pin file
Sven Eckelmann (26):
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: ensure bcast is writable before modifying TTL
batman-adv: fix (m|b)cast csum after decrementing TTL
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
Tao Cui (1):
mptcp: pm: fix extra_subflows underflow on userspace PM subflow creation
Thadeu Lima de Souza Cascardo (1):
dlm: prevent NPD when writing a positive value to event_done
Thorsten Blum (2):
hv: utils: handle and propagate errors in kvp_register
crypto: qat - Replace kzalloc() + copy_from_user() with memdup_user()
Waiman Long (1):
debugobjects: Dont call fill_pool() in early boot hardirq context
Weiming Shi (2):
i2c: stub: Reject I2C block transfers with invalid length
net: qualcomm: rmnet: fix endpoint use-after-free in rmnet_dellink()
Wenjie Qi (1):
f2fs: validate compress cache inode only when enabled
Wentao Liang (3):
pNFS: Fix use-after-free in pnfs_update_layout()
fpga: region: fix use-after-free in child_regions_with_firmware()
power: reset: linkstation-poweroff: fix use-after-free in the linkstation_poweroff_init()
Wongi Lee (1):
ipv6: account for fraggap on the paged allocation path
Yi Yang (1):
vc_screen: fix null-ptr-deref in vcs_notifier() during concurrent vcs_write
Yiming Qian (1):
net: skmsg: preserve sg.copy across SG transforms
Yizhou Zhao (1):
9p: avoid putting oldfid in p9_client_walk() error path
Yu Zhao (1):
mm/mglru: skip special VMAs in lru_gen_look_around()
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