Y2038

y2038@lists.linaro.org

1 participants
1127 discussions

[GIT PULL v2 00/27] block, scsi: final compat_ioctl cleanup

by Arnd Bergmann

The following changes since commit e42617b825f8073569da76dc4510bfa019b1c35a: Linux 5.5-rc1 (2019-12-08 14:57:55 -0800) are available in the Git repository at: git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/playground.git tags/block-ioctl-cleanup-5.6 for you to fetch changes up to 3462d5c19dac7c062c5a2db727775116e6d2b28e: Documentation: document ioctl interfaces better (2019-12-17 22:45:18 +0100) ---------------------------------------------------------------- block, scsi: final compat_ioctl cleanup This series concludes the work I did for linux-5.5 on the compat_ioctl() cleanup, killing off fs/compat_ioctl.c and block/compat_ioctl.c by moving everything into drivers. Overall this would be a reduction both in complexity and line count, but as I'm also adding documentation the overall number of lines increases in the end. My plan was originally to keep the SCSI and block parts separate. This did not work easily because of interdependencies: I cannot do the final SCSI cleanup in a good way without first addressing the CDROM ioctls, so this is one series that I hope could be merged through either the block or the scsi git trees, or possibly both if you can pull in the same branch. The series comes in these steps: 1. clean up the sg v3 interface as suggested by Linus. I have talked about this with Doug Gilbert as well, and he would rebase his sg v4 patches on top of "compat: scsi: sg: fix v3 compat read/write interface" 2. Actually moving handlers out of block/compat_ioctl.c and block/scsi_ioctl.c into drivers, mixed in with cleanup patches 3. Document how to do this right. I keep getting asked about this, and it helps to point to some documentation file. The branch is based on another one that fixes a couple of bugs found during the creation of this series. Changes since the original version [1]: - move out the bugfixes into a branch for itself - clean up scsi sg driver further as suggested by Christoph Hellwig - avoid some ifdefs by moving compat_ptr() out of asm/compat.h - split out the blkdev_compat_ptr_ioctl function; bug spotted by Ben Hutchings - Improve formatting of documentation [1] https://lore.kernel.org/linux-block/20191211204306.1207817-1-arnd@arndb.de/… ---------------------------------------------------------------- Arnd Bergmann (22): (plus five from the first pull request) compat: ARM64: always include asm-generic/compat.h compat: provide compat_ptr() on all architectures compat: scsi: sg: fix v3 compat read/write interface compat_ioctl: block: add blkdev_compat_ptr_ioctl compat_ioctl: ubd, aoe: use blkdev_compat_ptr_ioctl compat_ioctl: move CDROM_SEND_PACKET handling into scsi compat_ioctl: move CDROMREADADIO to cdrom.c compat_ioctl: cdrom: handle CDROM_LAST_WRITTEN compat_ioctl: block: handle cdrom compat ioctl in non-cdrom drivers compat_ioctl: add scsi_compat_ioctl compat_ioctl: bsg: add handler compat_ioctl: ide: floppy: add handler compat_ioctl: scsi: move ioctl handling into drivers compat_ioctl: move sys_compat_ioctl() to ioctl.c compat_ioctl: simplify the implementation compat_ioctl: move cdrom commands into cdrom.c compat_ioctl: scsi: handle HDIO commands from drivers compat_ioctl: move HDIO ioctl handling into drivers/ide compat_ioctl: block: move blkdev_compat_ioctl() into ioctl.c compat_ioctl: block: simplify compat_blkpg_ioctl() compat_ioctl: simplify up block/ioctl.c Documentation: document ioctl interfaces better Documentation/core-api/index.rst | 1 + Documentation/core-api/ioctl.rst | 248 +++++++++++++++ arch/arm64/include/asm/compat.h | 22 +- arch/mips/include/asm/compat.h | 18 -- arch/parisc/include/asm/compat.h | 17 - arch/powerpc/include/asm/compat.h | 17 - arch/powerpc/oprofile/backtrace.c | 2 +- arch/s390/include/asm/compat.h | 6 +- arch/sparc/include/asm/compat.h | 17 - arch/um/drivers/ubd_kern.c | 1 + arch/x86/include/asm/compat.h | 17 - block/Makefile | 1 - block/bsg.c | 1 + block/compat_ioctl.c | 411 ------------------------- block/ioctl.c | 319 +++++++++++++++---- block/scsi_ioctl.c | 214 ++++++++----- drivers/ata/libata-scsi.c | 9 + drivers/block/aoe/aoeblk.c | 1 + drivers/block/floppy.c | 3 + drivers/block/paride/pcd.c | 3 + drivers/block/paride/pd.c | 1 + drivers/block/paride/pf.c | 1 + drivers/block/pktcdvd.c | 26 +- drivers/block/sunvdc.c | 1 + drivers/block/virtio_blk.c | 3 + drivers/block/xen-blkfront.c | 1 + drivers/cdrom/cdrom.c | 35 ++- drivers/cdrom/gdrom.c | 3 + drivers/ide/ide-cd.c | 37 +++ drivers/ide/ide-disk.c | 1 + drivers/ide/ide-floppy.c | 4 + drivers/ide/ide-floppy.h | 2 + drivers/ide/ide-floppy_ioctl.c | 35 +++ drivers/ide/ide-gd.c | 14 + drivers/ide/ide-ioctls.c | 44 ++- drivers/ide/ide-tape.c | 11 + drivers/scsi/aic94xx/aic94xx_init.c | 3 + drivers/scsi/ch.c | 9 +- drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 3 + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 3 + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 3 + drivers/scsi/ipr.c | 3 + drivers/scsi/isci/init.c | 3 + drivers/scsi/mvsas/mv_init.c | 3 + drivers/scsi/pm8001/pm8001_init.c | 3 + drivers/scsi/scsi_ioctl.c | 54 +++- drivers/scsi/sd.c | 50 ++- drivers/scsi/sg.c | 170 +++++----- drivers/scsi/sr.c | 53 +++- drivers/scsi/st.c | 51 +-- fs/Makefile | 2 +- fs/compat_ioctl.c | 261 ---------------- fs/internal.h | 6 - fs/ioctl.c | 131 +++++--- include/linux/blkdev.h | 7 + include/linux/compat.h | 18 ++ include/linux/falloc.h | 2 - include/linux/fs.h | 4 - include/linux/ide.h | 2 + include/linux/libata.h | 6 + include/scsi/scsi_ioctl.h | 1 + include/scsi/sg.h | 30 ++ 62 files changed, 1257 insertions(+), 1171 deletions(-) create mode 100644 Documentation/core-api/ioctl.rst delete mode 100644 block/compat_ioctl.c delete mode 100644 fs/compat_ioctl.c -- 2.20.0

4 years, 11 months

[PATCH 00/24] block, scsi: final compat_ioctl cleanup

by Arnd Bergmann

Hi Jens, James and Martin, This series concludes the work I did for linux-5.5 on the compat_ioctl() cleanup, killing off fs/compat_ioctl.c and block/compat_ioctl.c by moving everything into drivers. Overall this would be a reduction both in complexity and line count, but as I'm also adding documentation the overall number of lines increases in the end. My plan was originally to keep the SCSI and block parts separate. This did not work easily because of interdependencies: I cannot do the final SCSI cleanup in a good way without first addressing the CDROM ioctls, so this is one series that I hope could be merged through either the block or the scsi git trees, or possibly both if you can pull in the same branch. The series comes in these steps: 1. clean up the sg v3 interface as suggested by Linus. I have talked about this with Doug Gilbert as well, and he would rebase his sg v4 patches on top of "compat: scsi: sg: fix v3 compat read/write interface" 2. Four patches for missing block compat_ioctl handlers, to be backported into stable kernels. Separate patches because they are needed in different stable versions. 3. Actually moving handlers out of block/compat_ioctl.c and block/scsi_ioctl.c into drivers, mixed in with cleanup patches 4. Document how to do this right. I keep getting asked about this, and it helps to point to some documentation file. The series is avaialable for testing at [1]. Arnd [1] https://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git/log/?h=… Arnd Bergmann (24): compat: ARM64: always include asm-generic/compat.h compat: scsi: sg: fix v3 compat read/write interface compat_ioctl: block: handle BLKREPORTZONE/BLKRESETZONE compat_ioctl: block: handle BLKGETZONESZ/BLKGETNRZONES compat_ioctl: block: handle add zone open, close and finish ioctl compat_ioctl: block: handle Persistent Reservations compaT_ioctl: ubd, aoe: use blkdev_compat_ptr_ioctl compat_ioctl: move CDROM_SEND_PACKET handling into scsi compat_ioctl: move CDROMREADADIO to cdrom.c compat_ioctl: cdrom: handle CDROM_LAST_WRITTEN compat_ioctl: block: handle cdrom compat ioctl in non-cdrom drivers compat_ioctl: add scsi_compat_ioctl compat_ioctl: bsg: add handler compat_ioctl: ide: floppy: add handler compat_ioctl: scsi: move ioctl handling into drivers compat_ioctl: move sys_compat_ioctl() to ioctl.c compat_ioctl: simplify the implementation compat_ioctl: move cdrom commands into cdrom.c compat_ioctl: scsi: handle HDIO commands from drivers compat_ioctl: move HDIO ioctl handling into drivers/ide compat_ioctl: block: move blkdev_compat_ioctl() into ioctl.c compat_ioctl: block: simplify compat_blkpg_ioctl() compat_ioctl: simplify up block/ioctl.c Documentation: document ioctl interfaces better Documentation/core-api/index.rst | 1 + Documentation/core-api/ioctl.rst | 250 +++++++++++++++ arch/arm64/include/asm/compat.h | 5 +- arch/um/drivers/ubd_kern.c | 1 + block/Makefile | 1 - block/bsg.c | 1 + block/compat_ioctl.c | 411 ------------------------- block/ioctl.c | 319 +++++++++++++++---- block/scsi_ioctl.c | 214 ++++++++----- drivers/ata/libata-scsi.c | 9 + drivers/block/aoe/aoeblk.c | 1 + drivers/block/floppy.c | 3 + drivers/block/paride/pcd.c | 3 + drivers/block/paride/pd.c | 1 + drivers/block/paride/pf.c | 1 + drivers/block/pktcdvd.c | 26 +- drivers/block/sunvdc.c | 1 + drivers/block/virtio_blk.c | 3 + drivers/block/xen-blkfront.c | 1 + drivers/cdrom/cdrom.c | 35 ++- drivers/cdrom/gdrom.c | 3 + drivers/ide/ide-cd.c | 40 +++ drivers/ide/ide-disk.c | 3 + drivers/ide/ide-floppy.c | 4 + drivers/ide/ide-floppy.h | 2 + drivers/ide/ide-floppy_ioctl.c | 35 +++ drivers/ide/ide-gd.c | 14 + drivers/ide/ide-ioctls.c | 47 ++- drivers/ide/ide-tape.c | 14 + drivers/scsi/aic94xx/aic94xx_init.c | 3 + drivers/scsi/ch.c | 9 +- drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 3 + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 3 + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 3 + drivers/scsi/ipr.c | 3 + drivers/scsi/isci/init.c | 3 + drivers/scsi/mvsas/mv_init.c | 3 + drivers/scsi/pm8001/pm8001_init.c | 3 + drivers/scsi/scsi_ioctl.c | 54 +++- drivers/scsi/sd.c | 50 ++- drivers/scsi/sg.c | 169 +++++----- drivers/scsi/sr.c | 53 +++- drivers/scsi/st.c | 51 +-- fs/Makefile | 2 +- fs/compat_ioctl.c | 261 ---------------- fs/internal.h | 6 - fs/ioctl.c | 131 +++++--- include/linux/blkdev.h | 7 + include/linux/falloc.h | 2 - include/linux/fs.h | 4 - include/linux/ide.h | 2 + include/linux/libata.h | 6 + include/scsi/scsi_ioctl.h | 1 + include/scsi/sg.h | 30 ++ 54 files changed, 1249 insertions(+), 1062 deletions(-) create mode 100644 Documentation/core-api/ioctl.rst delete mode 100644 block/compat_ioctl.c delete mode 100644 fs/compat_ioctl.c -- 2.20.0 Cc: corbet(a)lwn.net Cc: catalin.marinas(a)arm.com Cc: will(a)kernel.org Cc: jdike(a)addtoit.com Cc: richard(a)nod.at Cc: anton.ivanov(a)cambridgegreys.com Cc: fujita.tomonori(a)lab.ntt.co.jp Cc: justin(a)coraid.com Cc: efremov(a)linux.com Cc: tim(a)cyberelk.net Cc: mst(a)redhat.com Cc: jasowang(a)redhat.com Cc: pbonzini(a)redhat.com Cc: stefanha(a)redhat.com Cc: boris.ostrovsky(a)oracle.com Cc: jgross(a)suse.com Cc: sstabellini(a)kernel.org Cc: konrad.wilk(a)oracle.com Cc: roger.pau(a)citrix.com Cc: bp(a)alien8.de Cc: davem(a)davemloft.net Cc: john.garry(a)huawei.com Cc: brking(a)us.ibm.com Cc: intel-linux-scu(a)intel.com Cc: artur.paszkiewicz(a)intel.com Cc: jinpu.wang(a)cloud.ionos.com Cc: dgilbert(a)interlog.com Cc: Kai.Makisara(a)kolumbus.fi Cc: arnd(a)arndb.de Cc: damien.lemoal(a)hgst.com Cc: hare(a)suse.com Cc: linux-doc(a)vger.kernel.org Cc: linux-kernel(a)vger.kernel.org Cc: linux-block(a)vger.kernel.org Cc: linux-arm-kernel(a)lists.infradead.org Cc: linux-um(a)lists.infradead.org Cc: linux-scsi(a)vger.kernel.org Cc: linux-ide(a)vger.kernel.org Cc: virtualization(a)lists.linux-foundation.org Cc: xen-devel(a)lists.xenproject.org Cc: linux-fsdevel(a)vger.kernel.org

4 years, 11 months

[PATCH v6 0/8] y2038 safety in v4l2

by Arnd Bergmann

4 years, 11 months

[PATCH 00/23] y2038 cleanups

by Arnd Bergmann

This is a series of cleanups for the y2038 work, mostly intended for namespace cleaning: the kernel defines the traditional time_t, timeval and timespec types that often lead to y2038-unsafe code. Even though the unsafe usage is mostly gone from the kernel, having the types and associated functions around means that we can still grow new users, and that we may be missing conversions to safe types that actually matter. As there is no rush on any of these patches, I would either queue them up in linux-next through my y2038 branch, or Thomas could add them to the tip tree if he wants. As mentioned in another series, this is part of a larger effort to fix all the remaining bits and pieces that are not completed yet from the y2038 conversion, and the full set can be found at: https://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git/log/?h=… Maintainers, please review and provide Acks. Let me know if you have any opinion on whether we should do the include last two patches of this series or not. Arnd Arnd Bergmann (23): y2038: remove CONFIG_64BIT_TIME y2038: add __kernel_old_timespec and __kernel_old_time_t y2038: vdso: change timeval to __kernel_old_timeval y2038: vdso: change timespec to __kernel_old_timespec y2038: vdso: change time_t to __kernel_old_time_t y2038: vdso: nds32: open-code timespec_add_ns() y2038: vdso: powerpc: avoid timespec references y2038: ipc: remove __kernel_time_t reference from headers y2038: stat: avoid 'time_t' in 'struct stat' y2038: uapi: change __kernel_time_t to __kernel_old_time_t y2038: rusage: use __kernel_old_timeval y2038: syscalls: change remaining timeval to __kernel_old_timeval y2038: socket: remove timespec reference in timestamping y2038: make ns_to_compat_timeval use __kernel_old_timeval y2038: elfcore: Use __kernel_old_timeval for process times y2038: timerfd: Use timespec64 internally y2038: time: avoid timespec usage in settimeofday() y2038: itimer: compat handling to itimer.c y2038: use compat_{get,set}_itimer on alpha y2038: move itimer reset into itimer.c y2038: itimer: change implementation to timespec64 [RFC] y2038: itimer: use ktime_t internally y2038: allow disabling time32 system calls arch/Kconfig | 11 +- arch/alpha/kernel/osf_sys.c | 67 +----- arch/alpha/kernel/syscalls/syscall.tbl | 4 +- arch/ia64/kernel/asm-offsets.c | 2 +- arch/mips/include/uapi/asm/msgbuf.h | 6 +- arch/mips/include/uapi/asm/sembuf.h | 4 +- arch/mips/include/uapi/asm/shmbuf.h | 6 +- arch/mips/include/uapi/asm/stat.h | 16 +- arch/mips/kernel/binfmt_elfn32.c | 4 +- arch/mips/kernel/binfmt_elfo32.c | 4 +- arch/nds32/kernel/vdso/gettimeofday.c | 61 +++-- arch/parisc/include/uapi/asm/msgbuf.h | 6 +- arch/parisc/include/uapi/asm/sembuf.h | 4 +- arch/parisc/include/uapi/asm/shmbuf.h | 6 +- arch/powerpc/include/asm/asm-prototypes.h | 3 +- arch/powerpc/include/asm/vdso_datapage.h | 6 +- arch/powerpc/include/uapi/asm/msgbuf.h | 6 +- arch/powerpc/include/uapi/asm/sembuf.h | 4 +- arch/powerpc/include/uapi/asm/shmbuf.h | 6 +- arch/powerpc/include/uapi/asm/stat.h | 2 +- arch/powerpc/kernel/asm-offsets.c | 18 +- arch/powerpc/kernel/syscalls.c | 4 +- arch/powerpc/kernel/time.c | 5 +- arch/powerpc/kernel/vdso32/gettimeofday.S | 6 +- arch/powerpc/kernel/vdso64/gettimeofday.S | 8 +- arch/sparc/include/uapi/asm/msgbuf.h | 6 +- arch/sparc/include/uapi/asm/sembuf.h | 4 +- arch/sparc/include/uapi/asm/shmbuf.h | 6 +- arch/sparc/include/uapi/asm/stat.h | 24 +- arch/sparc/vdso/vclock_gettime.c | 36 +-- arch/x86/entry/vdso/vclock_gettime.c | 6 +- arch/x86/entry/vsyscall/vsyscall_64.c | 4 +- arch/x86/include/uapi/asm/msgbuf.h | 6 +- arch/x86/include/uapi/asm/sembuf.h | 4 +- arch/x86/include/uapi/asm/shmbuf.h | 6 +- arch/x86/um/vdso/um_vdso.c | 12 +- fs/aio.c | 2 +- fs/binfmt_elf.c | 12 +- fs/binfmt_elf_fdpic.c | 12 +- fs/compat_binfmt_elf.c | 4 +- fs/select.c | 10 +- fs/timerfd.c | 14 +- fs/utimes.c | 8 +- include/linux/compat.h | 19 +- include/linux/syscalls.h | 16 +- include/linux/time.h | 9 +- include/linux/time32.h | 2 +- include/linux/types.h | 2 +- include/trace/events/timer.h | 29 +-- include/uapi/asm-generic/msgbuf.h | 12 +- include/uapi/asm-generic/posix_types.h | 1 + include/uapi/asm-generic/sembuf.h | 7 +- include/uapi/asm-generic/shmbuf.h | 12 +- include/uapi/linux/cyclades.h | 6 +- include/uapi/linux/elfcore.h | 8 +- include/uapi/linux/errqueue.h | 7 + include/uapi/linux/msg.h | 6 +- include/uapi/linux/ppp_defs.h | 4 +- include/uapi/linux/resource.h | 4 +- include/uapi/linux/sem.h | 4 +- include/uapi/linux/shm.h | 6 +- include/uapi/linux/time.h | 6 +- include/uapi/linux/time_types.h | 5 + include/uapi/linux/utime.h | 4 +- ipc/syscall.c | 2 +- kernel/compat.c | 24 -- kernel/power/power.h | 2 +- kernel/sys.c | 4 +- kernel/sys_ni.c | 23 ++ kernel/time/hrtimer.c | 2 +- kernel/time/itimer.c | 280 ++++++++++++++-------- kernel/time/time.c | 32 ++- lib/vdso/gettimeofday.c | 4 +- net/core/scm.c | 6 +- net/socket.c | 2 +- security/selinux/hooks.c | 10 +- 76 files changed, 501 insertions(+), 504 deletions(-) -- 2.20.0 Cc: rth(a)twiddle.net Cc: tony.luck(a)intel.com Cc: paul.burton(a)mips.com Cc: green.hu(a)gmail.com Cc: deller(a)gmx.de Cc: mpe(a)ellerman.id.au Cc: davem(a)davemloft.net Cc: tglx(a)linutronix.de Cc: x86(a)kernel.org Cc: jdike(a)addtoit.com Cc: richard(a)nod.at Cc: viro(a)zeniv.linux.org.uk Cc: bcrl(a)kvack.org Cc: john.stultz(a)linaro.org Cc: sboyd(a)kernel.org Cc: rostedt(a)goodmis.org Cc: arnd(a)arndb.de Cc: vincenzo.frascino(a)arm.com Cc: paul(a)paul-moore.com Cc: sds(a)tycho.nsa.gov Cc: eparis(a)parisplace.org Cc: peterz(a)infradead.org Cc: will(a)kernel.org Cc: deepa.kernel(a)gmail.com Cc: christian(a)brauner.io Cc: heiko.carstens(a)de.ibm.com Cc: christophe.leroy(a)c-s.fr Cc: ebiederm(a)xmission.com Cc: linux-kernel(a)vger.kernel.org Cc: linux-alpha(a)vger.kernel.org> Cc: linux-ia64(a)vger.kernel.org> Cc: linux-mips(a)vger.kernel.org> Cc: linux-parisc(a)vger.kernel.org> Cc: linuxppc-dev(a)lists.ozlabs.org> Cc: sparclinux(a)vger.kernel.org> Cc: linux-um(a)lists.infradead.org> Cc: linux-fsdevel(a)vger.kernel.org> Cc: linux-aio(a)kvack.org> Cc: linux-api(a)vger.kernel.org> Cc: linux-arch(a)vger.kernel.org> Cc: netdev(a)vger.kernel.org> Cc: selinux(a)vger.kernel.org>

4 years, 11 months

[GIT PULL] y2038: syscall implementation cleanups

by Arnd Bergmann

The following changes since commit a99d8080aaf358d5d23581244e5da23b35e340b9: Linux 5.4-rc6 (2019-11-03 14:07:26 -0800) are available in the Git repository at: git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/playground.git tags/y2038-cleanups-5.5 for you to fetch changes up to b111df8447acdeb4b9220f99d5d4b28f83eb56ad: y2038: alarm: fix half-second cut-off (2019-11-25 21:52:35 +0100) ---------------------------------------------------------------- y2038: syscall implementation cleanups This is a series of cleanups for the y2038 work, mostly intended for namespace cleaning: the kernel defines the traditional time_t, timeval and timespec types that often lead to y2038-unsafe code. Even though the unsafe usage is mostly gone from the kernel, having the types and associated functions around means that we can still grow new users, and that we may be missing conversions to safe types that actually matter. There are still a number of driver specific patches needed to get the last users of these types removed, those have been submitted to the respective maintainers. Link: https://lore.kernel.org/lkml/20191108210236.1296047-1-arnd@arndb.de/ Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> ---------------------------------------------------------------- Arnd Bergmann (26): y2038: remove CONFIG_64BIT_TIME y2038: add __kernel_old_timespec and __kernel_old_time_t y2038: vdso: change timeval to __kernel_old_timeval y2038: vdso: change timespec to __kernel_old_timespec y2038: vdso: change time_t to __kernel_old_time_t y2038: vdso: nds32: open-code timespec_add_ns() y2038: vdso: powerpc: avoid timespec references y2038: ipc: remove __kernel_time_t reference from headers y2038: stat: avoid 'time_t' in 'struct stat' y2038: uapi: change __kernel_time_t to __kernel_old_time_t y2038: rusage: use __kernel_old_timeval y2038: syscalls: change remaining timeval to __kernel_old_timeval y2038: socket: remove timespec reference in timestamping y2038: socket: use __kernel_old_timespec instead of timespec y2038: make ns_to_compat_timeval use __kernel_old_timeval y2038: elfcore: Use __kernel_old_timeval for process times y2038: timerfd: Use timespec64 internally y2038: time: avoid timespec usage in settimeofday() y2038: itimer: compat handling to itimer.c y2038: use compat_{get,set}_itimer on alpha y2038: move itimer reset into itimer.c y2038: itimer: change implementation to timespec64 y2038: allow disabling time32 system calls y2038: fix typo in powerpc vdso "LOPART" y2038: ipc: fix x32 ABI breakage y2038: alarm: fix half-second cut-off arch/Kconfig | 11 +- arch/alpha/kernel/osf_sys.c | 67 +---------- arch/alpha/kernel/syscalls/syscall.tbl | 4 +- arch/ia64/kernel/asm-offsets.c | 2 +- arch/mips/include/uapi/asm/msgbuf.h | 6 +- arch/mips/include/uapi/asm/sembuf.h | 4 +- arch/mips/include/uapi/asm/shmbuf.h | 6 +- arch/mips/include/uapi/asm/stat.h | 16 +-- arch/mips/kernel/binfmt_elfn32.c | 4 +- arch/mips/kernel/binfmt_elfo32.c | 4 +- arch/nds32/kernel/vdso/gettimeofday.c | 61 +++++----- arch/parisc/include/uapi/asm/msgbuf.h | 6 +- arch/parisc/include/uapi/asm/sembuf.h | 4 +- arch/parisc/include/uapi/asm/shmbuf.h | 6 +- arch/powerpc/include/asm/asm-prototypes.h | 3 +- arch/powerpc/include/asm/vdso_datapage.h | 6 +- arch/powerpc/include/uapi/asm/msgbuf.h | 6 +- arch/powerpc/include/uapi/asm/sembuf.h | 4 +- arch/powerpc/include/uapi/asm/shmbuf.h | 6 +- arch/powerpc/include/uapi/asm/stat.h | 2 +- arch/powerpc/kernel/asm-offsets.c | 18 ++- arch/powerpc/kernel/syscalls.c | 4 +- arch/powerpc/kernel/time.c | 5 +- arch/powerpc/kernel/vdso32/gettimeofday.S | 6 +- arch/powerpc/kernel/vdso64/gettimeofday.S | 8 +- arch/sparc/include/uapi/asm/msgbuf.h | 6 +- arch/sparc/include/uapi/asm/sembuf.h | 4 +- arch/sparc/include/uapi/asm/shmbuf.h | 6 +- arch/sparc/include/uapi/asm/stat.h | 24 ++-- arch/sparc/vdso/vclock_gettime.c | 36 +++--- arch/x86/entry/vdso/vclock_gettime.c | 6 +- arch/x86/entry/vsyscall/vsyscall_64.c | 4 +- arch/x86/include/uapi/asm/msgbuf.h | 6 +- arch/x86/include/uapi/asm/sembuf.h | 4 +- arch/x86/include/uapi/asm/shmbuf.h | 6 +- arch/x86/um/vdso/um_vdso.c | 12 +- fs/aio.c | 2 +- fs/binfmt_elf.c | 12 +- fs/binfmt_elf_fdpic.c | 12 +- fs/compat_binfmt_elf.c | 4 +- fs/select.c | 10 +- fs/timerfd.c | 14 +-- fs/utimes.c | 8 +- include/linux/compat.h | 19 +-- include/linux/skbuff.h | 7 +- include/linux/syscalls.h | 16 +-- include/linux/time.h | 9 +- include/linux/time32.h | 2 +- include/linux/types.h | 2 +- include/trace/events/timer.h | 16 +-- include/uapi/asm-generic/msgbuf.h | 12 +- include/uapi/asm-generic/posix_types.h | 1 + include/uapi/asm-generic/sembuf.h | 7 +- include/uapi/asm-generic/shmbuf.h | 12 +- include/uapi/linux/cyclades.h | 6 +- include/uapi/linux/elfcore.h | 8 +- include/uapi/linux/errqueue.h | 7 ++ include/uapi/linux/msg.h | 6 +- include/uapi/linux/ppp_defs.h | 4 +- include/uapi/linux/resource.h | 4 +- include/uapi/linux/sem.h | 4 +- include/uapi/linux/shm.h | 6 +- include/uapi/linux/time.h | 6 +- include/uapi/linux/time_types.h | 5 + include/uapi/linux/utime.h | 4 +- ipc/syscall.c | 2 +- kernel/compat.c | 24 ---- kernel/power/power.h | 2 +- kernel/sys.c | 4 +- kernel/sys_ni.c | 23 ++++ kernel/time/hrtimer.c | 2 +- kernel/time/itimer.c | 189 +++++++++++++++++++++--------- kernel/time/time.c | 32 +++-- lib/vdso/gettimeofday.c | 4 +- net/compat.c | 2 +- net/core/scm.c | 6 +- net/ipv4/tcp.c | 28 +++-- net/socket.c | 4 +- security/selinux/hooks.c | 10 +- 79 files changed, 472 insertions(+), 468 deletions(-)

4 years, 11 months

[GIT PULL] compat_ioctl: remove most of fs/compat_ioctl.c

by Arnd Bergmann

The following changes since commit da0c9ea146cbe92b832f1b0f694840ea8eb33cce: Linux 5.4-rc2 (2019-10-06 14:27:30 -0700) are available in the Git repository at: git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/playground.git tags/compat-ioctl-5.5 for you to fetch changes up to 142b2ac82e31c174936c5719fa12ae28f51a55b7: scsi: sd: enable compat ioctls for sed-opal (2019-10-23 17:23:47 +0200) ---------------------------------------------------------------- compat_ioctl: remove most of fs/compat_ioctl.c As part of the cleanup of some remaining y2038 issues, I came to fs/compat_ioctl.c, which still has a couple of commands that need support for time64_t. In completely unrelated work, I spent time on cleaning up parts of this file in the past, moving things out into drivers instead. After Al Viro reviewed an earlier version of this series and did a lot more of that cleanup, I decided to try to completely eliminate the rest of it and move it all into drivers. This series incorporates some of Al's work and many patches of my own, but in the end stops short of actually removing the last part, which is the scsi ioctl handlers. I have patches for those as well, but they need more testing or possibly a rewrite. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> ---------------------------------------------------------------- Al Viro (8): fix compat handling of FICLONERANGE, FIDEDUPERANGE and FS_IOC_FIEMAP FIGETBSZ: fix compat compat: itanic doesn't have one do_vfs_ioctl(): use saner types compat: move FS_IOC_RESVSP_32 handling to fs/ioctl.c compat_sys_ioctl(): make parallel to do_vfs_ioctl() compat_ioctl: unify copy-in of ppp filters compat_ioctl: move PPPIOCSCOMPRESS to ppp_generic Arnd Bergmann (34): compat_ioctl: add compat_ptr_ioctl() ceph: fix compat_ioctl for ceph_dir_operations compat_ioctl: move rtc handling into drivers/rtc/dev.c compat_ioctl: move drivers to compat_ptr_ioctl compat_ioctl: move more drivers to compat_ptr_ioctl compat_ioctl: use correct compat_ptr() translation in drivers compat_ioctl: move tape handling into drivers compat_ioctl: move ATYFB_CLK handling to atyfb driver compat_ioctl: move isdn/capi ioctl translation into driver compat_ioctl: move rfcomm handlers into driver compat_ioctl: move hci_sock handlers into driver compat_ioctl: remove HCIUART handling compat_ioctl: remove HIDIO translation compat_ioctl: remove translation for sound ioctls compat_ioctl: remove IGNORE_IOCTL() compat_ioctl: remove /dev/random commands compat_ioctl: remove joystick ioctl translation compat_ioctl: remove PCI ioctl translation compat_ioctl: remove /dev/raw ioctl translation compat_ioctl: remove last RAID handling code compat_ioctl: remove unused convert_in_user macro gfs2: add compat_ioctl support fs: compat_ioctl: move FITRIM emulation into file systems compat_ioctl: move WDIOC handling into wdt drivers compat_ioctl: reimplement SG_IO handling af_unix: add compat_ioctl support compat_ioctl: handle SIOCOUTQNSD compat_ioctl: move SIOCOUTQ out of compat_ioctl.c tty: handle compat PPP ioctls compat_ioctl: handle PPPIOCGIDLE for 64-bit time_t compat_ioctl: ppp: move simple commands into ppp_generic.c compat_ioctl: move SG_GET_REQUEST_TABLE handling pktcdvd: add compat_ioctl handler scsi: sd: enable compat ioctls for sed-opal Documentation/networking/ppp_generic.txt | 2 + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 1 + arch/um/drivers/harddog_kern.c | 1 + arch/um/drivers/hostaudio_kern.c | 1 + block/scsi_ioctl.c | 132 +++- drivers/android/binder.c | 2 +- drivers/block/pktcdvd.c | 25 + drivers/char/ipmi/ipmi_watchdog.c | 1 + drivers/char/ppdev.c | 12 +- drivers/char/random.c | 1 + drivers/char/tpm/tpm_vtpm_proxy.c | 12 +- drivers/crypto/qat/qat_common/adf_ctl_drv.c | 2 +- drivers/dma-buf/dma-buf.c | 4 +- drivers/dma-buf/sw_sync.c | 2 +- drivers/dma-buf/sync_file.c | 2 +- drivers/firewire/core-cdev.c | 12 +- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +- drivers/hid/hidraw.c | 4 +- drivers/hid/usbhid/hiddev.c | 11 +- drivers/hwmon/fschmd.c | 1 + drivers/hwmon/w83793.c | 1 + drivers/hwtracing/stm/core.c | 12 +- drivers/ide/ide-tape.c | 27 +- drivers/iio/industrialio-core.c | 2 +- drivers/infiniband/core/uverbs_main.c | 4 +- drivers/isdn/capi/capi.c | 31 + drivers/media/rc/lirc_dev.c | 4 +- drivers/misc/cxl/flash.c | 8 +- drivers/misc/genwqe/card_dev.c | 23 +- drivers/misc/mei/main.c | 22 +- drivers/misc/vmw_vmci/vmci_host.c | 2 +- drivers/mtd/ubi/cdev.c | 36 +- drivers/net/ppp/ppp_generic.c | 245 +++++--- drivers/net/tap.c | 12 +- drivers/nvdimm/bus.c | 4 +- drivers/nvme/host/core.c | 2 +- drivers/pci/switch/switchtec.c | 2 +- drivers/platform/x86/wmi.c | 2 +- drivers/rpmsg/rpmsg_char.c | 4 +- drivers/rtc/dev.c | 33 +- drivers/rtc/rtc-ds1374.c | 1 + drivers/rtc/rtc-m41t80.c | 1 + drivers/rtc/rtc-vr41xx.c | 8 + drivers/s390/char/tape_char.c | 41 +- drivers/sbus/char/display7seg.c | 2 +- drivers/sbus/char/envctrl.c | 4 +- drivers/scsi/3w-xxxx.c | 4 +- drivers/scsi/cxlflash/main.c | 2 +- drivers/scsi/esas2r/esas2r_main.c | 2 +- drivers/scsi/megaraid/megaraid_mm.c | 28 +- drivers/scsi/pmcraid.c | 4 +- drivers/scsi/sd.c | 14 +- drivers/scsi/sg.c | 59 +- drivers/scsi/st.c | 28 +- drivers/staging/android/ion/ion.c | 4 +- drivers/staging/pi433/pi433_if.c | 12 +- drivers/staging/vme/devices/vme_user.c | 2 +- drivers/tee/tee_core.c | 2 +- drivers/tty/tty_io.c | 5 + drivers/usb/class/cdc-wdm.c | 2 +- drivers/usb/class/usbtmc.c | 4 +- drivers/usb/core/devio.c | 16 +- drivers/usb/gadget/function/f_fs.c | 12 +- drivers/vfio/vfio.c | 39 +- drivers/vhost/net.c | 12 +- drivers/vhost/scsi.c | 12 +- drivers/vhost/test.c | 12 +- drivers/vhost/vsock.c | 12 +- drivers/video/fbdev/aty/atyfb_base.c | 12 +- drivers/virt/fsl_hypervisor.c | 2 +- drivers/watchdog/acquirewdt.c | 1 + drivers/watchdog/advantechwdt.c | 1 + drivers/watchdog/alim1535_wdt.c | 1 + drivers/watchdog/alim7101_wdt.c | 1 + drivers/watchdog/ar7_wdt.c | 1 + drivers/watchdog/at91rm9200_wdt.c | 1 + drivers/watchdog/ath79_wdt.c | 1 + drivers/watchdog/bcm63xx_wdt.c | 1 + drivers/watchdog/cpu5wdt.c | 1 + drivers/watchdog/eurotechwdt.c | 1 + drivers/watchdog/f71808e_wdt.c | 1 + drivers/watchdog/gef_wdt.c | 1 + drivers/watchdog/geodewdt.c | 1 + drivers/watchdog/ib700wdt.c | 1 + drivers/watchdog/ibmasr.c | 1 + drivers/watchdog/indydog.c | 1 + drivers/watchdog/intel_scu_watchdog.c | 1 + drivers/watchdog/iop_wdt.c | 1 + drivers/watchdog/it8712f_wdt.c | 1 + drivers/watchdog/ixp4xx_wdt.c | 1 + drivers/watchdog/m54xx_wdt.c | 1 + drivers/watchdog/machzwd.c | 1 + drivers/watchdog/mixcomwd.c | 1 + drivers/watchdog/mtx-1_wdt.c | 1 + drivers/watchdog/mv64x60_wdt.c | 1 + drivers/watchdog/nv_tco.c | 1 + drivers/watchdog/pc87413_wdt.c | 1 + drivers/watchdog/pcwd.c | 1 + drivers/watchdog/pcwd_pci.c | 1 + drivers/watchdog/pcwd_usb.c | 1 + drivers/watchdog/pika_wdt.c | 1 + drivers/watchdog/pnx833x_wdt.c | 1 + drivers/watchdog/rc32434_wdt.c | 1 + drivers/watchdog/rdc321x_wdt.c | 1 + drivers/watchdog/riowd.c | 1 + drivers/watchdog/sa1100_wdt.c | 1 + drivers/watchdog/sb_wdog.c | 1 + drivers/watchdog/sbc60xxwdt.c | 1 + drivers/watchdog/sbc7240_wdt.c | 1 + drivers/watchdog/sbc_epx_c3.c | 1 + drivers/watchdog/sbc_fitpc2_wdt.c | 1 + drivers/watchdog/sc1200wdt.c | 1 + drivers/watchdog/sc520_wdt.c | 1 + drivers/watchdog/sch311x_wdt.c | 1 + drivers/watchdog/scx200_wdt.c | 1 + drivers/watchdog/smsc37b787_wdt.c | 1 + drivers/watchdog/w83877f_wdt.c | 1 + drivers/watchdog/w83977f_wdt.c | 1 + drivers/watchdog/wafer5823wdt.c | 1 + drivers/watchdog/watchdog_dev.c | 1 + drivers/watchdog/wdrtas.c | 1 + drivers/watchdog/wdt.c | 1 + drivers/watchdog/wdt285.c | 1 + drivers/watchdog/wdt977.c | 1 + drivers/watchdog/wdt_pci.c | 1 + fs/btrfs/super.c | 2 +- fs/ceph/dir.c | 1 + fs/ceph/file.c | 2 +- fs/compat_ioctl.c | 917 ++-------------------------- fs/ecryptfs/file.c | 1 + fs/ext4/ioctl.c | 1 + fs/f2fs/file.c | 1 + fs/fat/file.c | 13 +- fs/fuse/dev.c | 2 +- fs/gfs2/file.c | 30 + fs/hpfs/dir.c | 1 + fs/hpfs/file.c | 1 + fs/ioctl.c | 80 ++- fs/nilfs2/ioctl.c | 1 + fs/notify/fanotify/fanotify_user.c | 2 +- fs/ocfs2/ioctl.c | 1 + fs/userfaultfd.c | 2 +- include/linux/blkdev.h | 2 + include/linux/falloc.h | 20 + include/linux/fs.h | 7 + include/linux/mtio.h | 60 ++ include/uapi/linux/ppp-ioctl.h | 2 + include/uapi/linux/ppp_defs.h | 14 + lib/iov_iter.c | 1 + net/bluetooth/hci_sock.c | 21 +- net/bluetooth/rfcomm/sock.c | 14 +- net/rfkill/core.c | 2 +- net/socket.c | 3 + net/unix/af_unix.c | 19 + sound/core/oss/pcm_oss.c | 4 + sound/oss/dmasound/dmasound_core.c | 2 + 156 files changed, 954 insertions(+), 1394 deletions(-) create mode 100644 include/linux/mtio.h

4 years, 11 months

[PATCH] utimes: Clamp the timestamps in notify_change()

by Amir Goldstein

Push clamping timestamps down the call stack into notify_change(), so in-kernel callers like nfsd and overlayfs will get similar timestamp set behavior as utimes. Suggested-by: Miklos Szeredi <mszeredi(a)redhat.com> Fixes: 42e729b9ddbb ("utimes: Clamp the timestamps before update") Cc: stable(a)vger.kernel.org # v5.4 Cc: Deepa Dinamani <deepa.kernel(a)gmail.com> Cc: Jeff Layton <jlayton(a)kernel.org> Signed-off-by: Amir Goldstein <amir73il(a)gmail.com> --- Arnd, This fixes xfstest generic/402 when run with -overlay setup. Note that running the test requires latest xfstests with: acb2ba78 - overlay: support timestamp range check I had previously posted a fix specific for overlayfs [1], but Miklos suggested this more generic fix, which should also serve nfsd and other in-kernel users. I tested this change with test generic/402 on ext4/xfs/btrfs and overlayfs, but not with nfsd. Jeff, could you ack this change is good for nfsd as well? Thanks, Amir. [1] https://lore.kernel.org/linux-fsdevel/20191111073000.2957-1-amir73il@gmail.… fs/attr.c | 5 +++++ fs/utimes.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/fs/attr.c b/fs/attr.c index df28035aa23e..e8de5e636e66 100644 --- a/fs/attr.c +++ b/fs/attr.c @@ -268,8 +268,13 @@ int notify_change(struct dentry * dentry, struct iattr * attr, struct inode **de attr->ia_ctime = now; if (!(ia_valid & ATTR_ATIME_SET)) attr->ia_atime = now; + else + attr->ia_atime = timestamp_truncate(attr->ia_atime, inode); if (!(ia_valid & ATTR_MTIME_SET)) attr->ia_mtime = now; + else + attr->ia_mtime = timestamp_truncate(attr->ia_mtime, inode); + if (ia_valid & ATTR_KILL_PRIV) { error = security_inode_need_killpriv(dentry); if (error < 0) diff --git a/fs/utimes.c b/fs/utimes.c index 1ba3f7883870..090739322463 100644 --- a/fs/utimes.c +++ b/fs/utimes.c @@ -36,14 +36,14 @@ static int utimes_common(const struct path *path, struct timespec64 *times) if (times[0].tv_nsec == UTIME_OMIT) newattrs.ia_valid &= ~ATTR_ATIME; else if (times[0].tv_nsec != UTIME_NOW) { - newattrs.ia_atime = timestamp_truncate(times[0], inode); + newattrs.ia_atime = times[0]; newattrs.ia_valid |= ATTR_ATIME_SET; } if (times[1].tv_nsec == UTIME_OMIT) newattrs.ia_valid &= ~ATTR_MTIME; else if (times[1].tv_nsec != UTIME_NOW) { - newattrs.ia_mtime = timestamp_truncate(times[1], inode); + newattrs.ia_mtime = times[1]; newattrs.ia_valid |= ATTR_MTIME_SET; } /* -- 2.17.1

4 years, 11 months

[PATCH v4 0/8] y2038 safety in v4l2

by Arnd Bergmann

I'm in the process of finishing up the last bits on y2038-unsafe code in the kernel, this series is for v4l2, which has no problem with overflow, but has multiple ioctls that break with user space built against a new 32-bit libc. I posted similar patches as part of a series back in 2015, the new version was rewritten from scratch and I double-checked with the old version to make sure I did not miss anything I had already taken care of before. Hans Verkuil worked on a different patch set in 2017, but this also did not get to the point of being merged. My new version contains compat-ioctl support, which the old one did not and should be complete, but given its size likely contains bugs. I did randconfig build tests, but no runtime test, so careful review as well as testing would be much appreciated. With this version, the newly added code takes care of the existing ABI, while the existing code got moved to the 64-bit time_t interface and is used internally. This means that testing with existing binaries should exercise most of the modifications and if that works and doesn't get shot down in review, we can probably live without testing the new ABI explicitly. I'm not entirely happy with the compat-ioctl implementation that adds quite a bit of code duplication, but I hope this is acceptable anyway, as a better implementation would likely require a larger refactoring of the compat-ioctl file, while my approach simply adds support for the additional data structure variants. This is a minor update compared to version 3 of this series, with bugfixes for small mistakes that I found or that were reported by automated build bots. I updated the tree at [2] to this version now. Arnd [1] https://lwn.net/Articles/657754/ [2] https://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git/log/?h=… Arnd Bergmann (8): media: documentation: fix video_event description media: v4l2: abstract timeval handling in v4l2_buffer media: v4l2-core: compat: ignore native command codes media: v4l2-core: split out data copy from video_usercopy media: v4l2-core: fix VIDIOC_DQEVENT for time64 ABI media: v4l2-core: fix v4l2_buffer handling for time64 ABI media: v4l2-core: fix compat VIDIOC_DQEVENT for time64 ABI media: v4l2-core: fix compat v4l2_buffer handling for time64 ABI .../media/uapi/dvb/video-get-event.rst | 2 +- Documentation/media/uapi/dvb/video_types.rst | 2 +- .../media/common/videobuf2/videobuf2-v4l2.c | 4 +- drivers/media/pci/meye/meye.c | 4 +- drivers/media/usb/cpia2/cpia2_v4l.c | 4 +- drivers/media/usb/stkwebcam/stk-webcam.c | 2 +- drivers/media/usb/usbvision/usbvision-video.c | 4 +- drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 470 +++++++++++++++--- drivers/media/v4l2-core/v4l2-event.c | 5 +- drivers/media/v4l2-core/v4l2-ioctl.c | 188 +++++-- drivers/media/v4l2-core/v4l2-subdev.c | 20 +- drivers/media/v4l2-core/videobuf-core.c | 4 +- include/linux/videodev2.h | 17 +- include/trace/events/v4l2.h | 2 +- include/uapi/linux/videodev2.h | 77 +++ 15 files changed, 669 insertions(+), 136 deletions(-) -- 2.20.0 See below for the changes compared to v3: |diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c |index a13e4849df0c..3bbf47d950e0 100644 |--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c |+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c |@@ -500,7 +500,7 @@ struct v4l2_buffer32_time32 { | __u32 bytesused; | __u32 flags; | __u32 field; /* enum v4l2_field */ |- struct compat_timeval timestamp; |+ struct old_timeval32 timestamp; | struct v4l2_timecode timecode; | __u32 sequence; | |@@ -1290,7 +1290,7 @@ struct v4l2_event32_time32 { | } u; | __u32 pending; | __u32 sequence; |- struct compat_timespec timestamp; |+ struct old_timespec32 timestamp; | __u32 id; | __u32 reserved[8]; | }; |@@ -1482,8 +1482,8 @@ static long do_video_ioctl(struct file *file, unsigned int cmd, unsigned long ar | case VIDIOC_S_EXT_CTRLS32: ncmd = VIDIOC_S_EXT_CTRLS; break; | case VIDIOC_TRY_EXT_CTRLS32: ncmd = VIDIOC_TRY_EXT_CTRLS; break; | #ifdef CONFIG_X86_64 |- case VIDIOC_DQEVENT32: cmd = VIDIOC_DQEVENT; break; |- case VIDIOC_DQEVENT32_TIME32: cmd = VIDIOC_DQEVENT_TIME32; break; |+ case VIDIOC_DQEVENT32: ncmd = VIDIOC_DQEVENT; break; |+ case VIDIOC_DQEVENT32_TIME32: ncmd = VIDIOC_DQEVENT_TIME32; break; | #endif | case VIDIOC_OVERLAY32: ncmd = VIDIOC_OVERLAY; break; | case VIDIOC_STREAMON32: ncmd = VIDIOC_STREAMON; break; |diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c |index cd9a80960289..ad125cd4eb41 100644 |--- a/drivers/media/v4l2-core/v4l2-ioctl.c |+++ b/drivers/media/v4l2-core/v4l2-ioctl.c |@@ -474,7 +474,7 @@ static void v4l_print_buffer(const void *arg, bool write_only) | const struct v4l2_plane *plane; | int i; | |- pr_cont("%02ld:%02d:%02d.%09ld index=%d, type=%s, request_fd=%d, flags=0x%08x, field=%s, sequence=%d, memory=%s", |+ pr_cont("%02d:%02d:%02d.%09ld index=%d, type=%s, request_fd=%d, flags=0x%08x, field=%s, sequence=%d, memory=%s", | (int)p->timestamp.tv_sec / 3600, | ((int)p->timestamp.tv_sec / 60) % 60, | ((int)p->timestamp.tv_sec % 60), |@@ -821,7 +821,7 @@ static void v4l_print_event(const void *arg, bool write_only) | const struct v4l2_event *p = arg; | const struct v4l2_event_ctrl *c; | |- pr_cont("type=0x%x, pending=%u, sequence=%u, id=%u, timestamp=%lu.%9.9lu\n", |+ pr_cont("type=0x%x, pending=%u, sequence=%u, id=%u, timestamp=%llu.%9.9llu\n", | p->type, p->pending, p->sequence, p->id, | p->timestamp.tv_sec, p->timestamp.tv_nsec); | switch (p->type) { |diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h |index 481ee3013b50..4086036e37d5 100644 |--- a/include/linux/videodev2.h |+++ b/include/linux/videodev2.h |@@ -62,7 +62,7 @@ | static inline u64 v4l2_buffer_get_timestamp(const struct v4l2_buffer *buf) | { | return buf->timestamp.tv_sec * NSEC_PER_SEC + |- buf->timestamp.tv_usec * NSEC_PER_USEC; |+ (u32)buf->timestamp.tv_usec * NSEC_PER_USEC; | } | | static inline void v4l2_buffer_set_timestamp(struct v4l2_buffer *buf, |diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h |index 4275d6e92dae..ca10828328a5 100644 |--- a/include/uapi/linux/videodev2.h |+++ b/include/uapi/linux/videodev2.h |@@ -1001,7 +1001,12 @@ struct v4l2_buffer { | /* match glibc timeval64 format */ | struct { | long long tv_sec; |+# if defined(__sparc__) && defined(__arch64__) |+ int tv_usec; |+ int __pad; |+# else | long long tv_usec; |+# endif | } timestamp; | #else | struct timeval timestamp; |

4 years, 12 months

[PATCH 0/8] y2038: bug fixes from y2038 work

by Arnd Bergmann

I've gone through the remaining uses of time_t etc and come up with a set of 90 patches of varying complexity and importance, to the point of being able to remove the old time_t/timeval/timespec from the kernel headers completely. This set includes the eight patches that I think should be merged right away and backported into stable kernels if possible. Please apply individual patches to the respective maintainer trees for either v5.4 or v5.5 as appropriate. For reference, the full series of 90 patches can be found at https://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git/log/?h=… Arnd Arnd Bergmann (8): y2038: timex: remove incorrect time_t truncation timekeeping: optimize ns_to_timespec64 powerpc: fix vdso32 for ppc64le ipmi: kill off 'timespec' usage again netfilter: xt_time: use time64_t lp: fix sparc64 LPSETTIMEOUT ioctl ppdev: fix PPGETTIME/PPSETTIME ioctls Input: input_event: fix struct padding on sparc64 arch/powerpc/kernel/vdso32/gettimeofday.S | 2 +- drivers/char/ipmi/ipmi_si_intf.c | 40 ++++++++--------------- drivers/char/lp.c | 4 +++ drivers/char/ppdev.c | 16 ++++++--- drivers/input/evdev.c | 3 ++ drivers/input/misc/uinput.c | 3 ++ include/uapi/linux/input.h | 1 + kernel/time/ntp.c | 2 +- kernel/time/time.c | 21 +++++++----- net/netfilter/xt_time.c | 19 ++++++----- 10 files changed, 61 insertions(+), 50 deletions(-) Cc: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Michael Ellerman <mpe(a)ellerman.id.au> Cc: Corey Minyard <minyard(a)acm.org> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: Sudip Mukherjee <sudipm.mukherjee(a)gmail.com> Cc: Dmitry Torokhov <dmitry.torokhov(a)gmail.com> Cc: John Stultz <john.stultz(a)linaro.org> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: Stephen Boyd <sboyd(a)kernel.org> Cc: Pablo Neira Ayuso <pablo(a)netfilter.org> Cc: Jozsef Kadlecsik <kadlec(a)netfilter.org> Cc: Florian Westphal <fw(a)strlen.de> Cc: "David S. Miller" <davem(a)davemloft.net> Cc: linuxppc-dev(a)lists.ozlabs.org Cc: linux-kernel(a)vger.kernel.org Cc: openipmi-developer(a)lists.sourceforge.net Cc: linux-input(a)vger.kernel.org Cc: netfilter-devel(a)vger.kernel.org Cc: coreteam(a)netfilter.org Cc: netdev(a)vger.kernel.org Cc: sparclinux(a)vger.kernel.org -- 2.20.0

5 years

[PATCH] time: Zerofy padding in __kernel_timespec on 32-bit

by Dmitry Safonov

On compat interfaces, the high order bits of nanoseconds should be zeroed out. This is because the application code or the libc do not guarantee zeroing of these. If used without zeroing, kernel might be at risk of using timespec values incorrectly. Originally it was handled correctly, but lost during is_compat_syscall() cleanup. Revert the condition back to check CONFIG_64BIT. Reported-by: Ben Hutchings <ben.hutchings(a)codethink.co.uk> Fixes: 98f76206b335 ("compat: Cleanup in_compat_syscall() callers") Cc: Arnd Bergmann <arnd(a)arndb.de> Cc: Ben Hutchings <ben.hutchings(a)codethink.co.uk> Cc: John Stultz <john.stultz(a)linaro.org> Cc: Stephen Boyd <sboyd(a)kernel.org> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: y2038(a)lists.linaro.org Cc: stable(a)vger.kernel.org # v4.20+ Signed-off-by: Dmitry Safonov <dima(a)arista.com> --- kernel/time/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/time/time.c b/kernel/time/time.c index 5c54ca632d08..1cb045c5c97e 100644 --- a/kernel/time/time.c +++ b/kernel/time/time.c @@ -881,7 +881,7 @@ int get_timespec64(struct timespec64 *ts, ts->tv_sec = kts.tv_sec; /* Zero out the padding for 32 bit systems or in compat mode */ - if (IS_ENABLED(CONFIG_64BIT_TIME) && in_compat_syscall()) + if (IS_ENABLED(CONFIG_64BIT_TIME) && (!IS_ENABLED(CONFIG_64BIT) || in_compat_syscall())) kts.tv_nsec &= 0xFFFFFFFFUL; ts->tv_nsec = kts.tv_nsec; -- 2.24.0

5 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

Y2038