February 2023 - linux-morello - op-lists.linaro.org

[PATCH 00/18] Addressing remaining GCC warnings

by Kevin Brodsky

Hi, Following up on Luca's series addressing ioctl-related GCC warnings, this series takes care of the remaining warnings reported by GCC (but not Clang). The patches are all straightforward, except patch 13 (see below). Some notes: - Patch 1-3 fix up small oversights in our own commits (see Fixes: tags). - Patch 9-10 are about creating user pointers in cases where it is unavoidable, such cases are not concerning. - Patch 11-12 and 14-18 are about creating user pointers because of uapi deficiencies (i.e. user pointers represented as __u64 in structs). They should therefore be viewed as a stopgap while waiting for a full solution (uapi change and compat handling); this is tracked by the following tickets: * Patch 11: https://git.morello-project.org/morello/kernel/linux/-/issues/48 * Patch 12: https://git.morello-project.org/morello/kernel/linux/-/issues/47 * Patch 14: https://git.morello-project.org/morello/kernel/linux/-/issues/46 * Patch 15: https://git.morello-project.org/morello/kernel/linux/-/issues/50 * Patch 16: https://git.morello-project.org/morello/kernel/linux/-/issues/51 * Patch 17-18: https://git.morello-project.org/morello/kernel/linux/-/issues/52 - Patch 13 is upstreamable and is written in that spirit. Fixing up the msg_control/msg_control_user split required grepping all uses, as only a few misuses actually lead to warnings in PCuABI. Note that as an exceptional bending of the rules, this patch introduces a warning (both with Clang and GCC), which is impossible to avoid in a patch for upstream. The next patch (14) fixes the warnings so it should not be an issue in practice. With these patches and Luca's, only a handful of genuine GCC warnings are left: - A few in fs/aio.c, tracked by https://git.morello-project.org/morello/kernel/linux/-/issues/49 - A few under kernel/bpf/, should be addressed by https://git.morello-project.org/morello/kernel/linux/-/issues/4 Other warnings are Morello GCC defects and have been reported. Thanks, Kevin Kevin Brodsky (18): arm64: signal: Avoid unnecessary capability arithmetic drivers/android/binder: Cast to (void *) when printing %p drivers/android/binder: Cast user_uintptr_t arg when printing math.h: Make round_{up,down} capability-friendly asm-generic/cacheflush.h: Use appropriate user pointer conversion kernel: signal: Use appropriate user pointer conversion perf/core: Use appropriate user pointer conversion compat: Fix shift warning in compat64 audit: Explicitly create user pointer coredump: Explicitly create user pointer kernel/futex: Explicitly create user pointer rseq: Explicitly create user pointers net: Finish up ->msg_control{,_user} split tcp: Explicitly create user pointers Input: evdev: Explicitly create user pointers mmc: block: Explicitly create user pointers drm: Explicitly create user pointers drm/panfrost: Explicitly create user pointers arch/arm64/kernel/signal.c | 6 +++-- drivers/android/binder.c | 4 ++-- drivers/android/binder_alloc.c | 25 +++++++++++---------- drivers/gpu/drm/drm_atomic_uapi.c | 8 +++---- drivers/gpu/drm/drm_color_mgmt.c | 12 +++++----- drivers/gpu/drm/drm_connector.c | 8 +++---- drivers/gpu/drm/drm_crtc.c | 2 +- drivers/gpu/drm/drm_framebuffer.c | 2 +- drivers/gpu/drm/drm_lease.c | 4 ++-- drivers/gpu/drm/drm_mode_object.c | 4 ++-- drivers/gpu/drm/drm_plane.c | 2 +- drivers/gpu/drm/panfrost/panfrost_drv.c | 4 ++-- drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 2 +- drivers/input/evdev.c | 4 ++-- drivers/mmc/core/block.c | 6 ++--- fs/coredump.c | 2 +- include/asm-generic/cacheflush.h | 6 ++--- include/linux/math.h | 5 +++++ kernel/auditsc.c | 2 +- kernel/compat.c | 4 ++-- kernel/events/core.c | 2 +- kernel/futex/waitwake.c | 2 +- kernel/rseq.c | 4 ++-- kernel/signal.c | 2 +- net/compat.c | 13 ++++++----- net/core/scm.c | 9 +++++--- net/ipv4/tcp.c | 8 +++---- 27 files changed, 82 insertions(+), 70 deletions(-) -- 2.38.1

1 year, 9 months

6
38
0 0

[PATCH 0/1] Add appropriate pointer conversions to compat fcntl handler

by Luca Vizzarro

Hi all, This patch series addresses the issue reported in the following issue: https://git.morello-project.org/morello/kernel/linux/-/issues/43 Changes available at: https://git.morello-project.org/Sevenarth/linux/-/commits/morello/6.1-compa… Luca Vizzarro (1): fs/fcntl: Fix pointer conversion in compat fs/fcntl.c | 7 +++++++ 1 file changed, 7 insertions(+) -- 2.34.1

1 year, 9 months

2
2
0 0

[PATCH v2 0/5] Handling of int arguments in fcntl()

by Luca Vizzarro

Hi all, This patch series addresses the issue reported in the following issue: https://git.morello-project.org/morello/kernel/linux/-/issues/42 Changes available at: https://git.morello-project.org/Sevenarth/linux/-/commits/morello/6.1-fix-f… v2: - added a new argi variable which performs explicit int casting - updated all of the commands with int argument to use argi explicitly - updated signatures for the abstract generic_setlease and vfs_setlease with int argument Luca Vizzarro (5): fs/fcntl: Fix F_SETLEASE argument type fs/fcntl: Fix F_SETSIG argument type fs/fcntl: Fix F_SETPIPE_SZ argument type fs/fcntl: Fix F_ADD_SEALS argument type fs/fcntl: Update commands with argi fs/cifs/cifsfs.c | 2 +- fs/fcntl.c | 23 ++++++++++++----------- fs/libfs.c | 2 +- fs/locks.c | 22 +++++++++++----------- fs/nfs/nfs4file.c | 2 +- fs/nfs/nfs4proc.c | 4 ++-- fs/pipe.c | 6 +++--- include/linux/fs.h | 16 ++++++++-------- include/linux/memfd.h | 4 ++-- include/linux/pipe_fs_i.h | 4 ++-- mm/memfd.c | 6 +----- 11 files changed, 44 insertions(+), 47 deletions(-) -- 2.34.1

1 year, 9 months

3
11
0 0

[PATCH v3 0/4]

by Luca Vizzarro

Hi all, This patch series addresses the issue reported in the following issue: https://git.morello-project.org/morello/kernel/linux/-/issues/42 Changes available at: https://git.morello-project.org/Sevenarth/linux/-/commits/morello/6.1-fix-f… v3: - move the explicit cast change before updating the interfaces - fix typos v2: - added a new argi variable which performs explicit int casting - updated all of the commands with int argument to use argi explicitly - updated signatures for the abstract generic_setlease and vfs_setlease with int argument Luca Vizzarro (4): fs/fcntl: Cast commands with int args explicitly fs/fcntl: Fix F_SETLEASE helper functions fs/fcntl: Fix F_SETPIPE_SZ helper functions fs/fcntl: Fix F_ADD_SEALS helper functions fs/cifs/cifsfs.c | 2 +- fs/fcntl.c | 23 ++++++++++++----------- fs/libfs.c | 2 +- fs/locks.c | 22 +++++++++++----------- fs/nfs/nfs4file.c | 2 +- fs/nfs/nfs4proc.c | 4 ++-- fs/pipe.c | 6 +++--- include/linux/fs.h | 16 ++++++++-------- include/linux/memfd.h | 4 ++-- include/linux/pipe_fs_i.h | 4 ++-- mm/memfd.c | 6 +----- 11 files changed, 44 insertions(+), 47 deletions(-) -- 2.34.1

1 year, 9 months

3
8
0 0

Re: [PATCH bpf-next] selftests/bpf: Cross-compile bpftool

by Zachary Leaf

On 13/02/2023 14:30, Björn Töpel wrote: > Björn Töpel <bjorn(a)kernel.org> writes: > >> From: Björn Töpel <bjorn(a)rivosinc.com> >> >> When the BPF selftests are cross-compiled, only the a host version of >> bpftool is built. This version of bpftool is used to generate various >> intermediates, e.g., skeletons. >> >> The test runners are also using bpftool. The Makefile will symlink >> bpftool from the selftest/bpf root, where the test runners will look >> for the tool: >> >> | ... >> | $(Q)ln -sf $(if $2,..,.)/tools/build/bpftool/bootstrap/bpftool \ >> | $(OUTPUT)/$(if $2,$2/)bpftool >> >> There are two issues for cross-compilation builds: >> >> 1. There is no native (cross-compilation target) build of bpftool >> 2. The bootstrap variant of bpftool is never cross-compiled (by >> design) >> >> Make sure that a native/cross-compiled version of bpftool is built, >> and if CROSS_COMPILE is set, symlink to the native/non-bootstrap >> version. > > ...and the grand master plan is to add BPF CI support for riscv64, where > this patch a prerequisite to [1]. I would suspect that other platforms > might benefit from cross-compilation builds as well. Similar use case. There also seems to be a lot of issues building these tests out of tree. I have some potential fixes up to 6.1 but linux-next seems to have introduced a few more issues on top. > > [1] https://github.com/kernel-patches/vmtest/pull/194

1 year, 9 months

2
1
0 0

Re: [PATCH bpf-next] selftests/bpf: Cross-compile bpftool

by Zachary Leaf

Hi Bjorn, Thanks for the patch, I've tested it and it works for me. I have a minor suggestion but otherwise happy to see this getting fixed. On 10/02/2023 08:43, Björn Töpel wrote: > From: Björn Töpel <bjorn(a)rivosinc.com> > > When the BPF selftests are cross-compiled, only the a host version of > bpftool is built. This version of bpftool is used to generate various > intermediates, e.g., skeletons. > > The test runners are also using bpftool. The Makefile will symlink > bpftool from the selftest/bpf root, where the test runners will look > for the tool: > > | ... > | $(Q)ln -sf $(if $2,..,.)/tools/build/bpftool/bootstrap/bpftool \ > | $(OUTPUT)/$(if $2,$2/)bpftool > > There are two issues for cross-compilation builds: > > 1. There is no native (cross-compilation target) build of bpftool > 2. The bootstrap variant of bpftool is never cross-compiled (by > design) > > Make sure that a native/cross-compiled version of bpftool is built, > and if CROSS_COMPILE is set, symlink to the native/non-bootstrap > version. > > Signed-off-by: Björn Töpel <bjorn(a)rivosinc.com> > --- > tools/testing/selftests/bpf/Makefile | 28 +++++++++++++++++++++++++--- > 1 file changed, 25 insertions(+), 3 deletions(-) > > diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile > index b2eb3201b85a..b706750f71e2 100644 > --- a/tools/testing/selftests/bpf/Makefile > +++ b/tools/testing/selftests/bpf/Makefile > @@ -157,8 +157,9 @@ $(notdir $(TEST_GEN_PROGS) \ > $(TEST_CUSTOM_PROGS)): %: $(OUTPUT)/% ; > > # sort removes libbpf duplicates when not cross-building > -MAKE_DIRS := $(sort $(BUILD_DIR)/libbpf $(HOST_BUILD_DIR)/libbpf \ > - $(HOST_BUILD_DIR)/bpftool $(HOST_BUILD_DIR)/resolve_btfids \ > +MAKE_DIRS := $(sort $(BUILD_DIR)/libbpf $(HOST_BUILD_DIR)/libbpf \ > + $(BUILD_DIR)/bpftool $(HOST_BUILD_DIR)/bpftool \ > + $(HOST_BUILD_DIR)/resolve_btfids \ > $(RUNQSLOWER_OUTPUT) $(INCLUDE_DIR)) > $(MAKE_DIRS): > $(call msg,MKDIR,,$@) > @@ -208,6 +209,14 @@ $(OUTPUT)/bpf_testmod.ko: $(VMLINUX_BTF) $(wildcard bpf_testmod/Makefile bpf_tes > $(Q)cp bpf_testmod/bpf_testmod.ko $@ > > DEFAULT_BPFTOOL := $(HOST_SCRATCH_DIR)/sbin/bpftool > +ifneq ($(CROSS_COMPILE),) > +CROSS_BPFTOOL := $(SCRATCH_DIR)/sbin/bpftool > +TRUNNER_BPFTOOL := $(CROSS_BPFTOOL) > +USE_BOOTSTRAP := "" > +else > +TRUNNER_BPFTOOL := $(DEFAULT_BPFTOOL) > +USE_BOOTSTRAP := "bootstrap" > +endif > > $(OUTPUT)/runqslower: $(BPFOBJ) | $(DEFAULT_BPFTOOL) $(RUNQSLOWER_OUTPUT) > $(Q)$(MAKE) $(submake_extras) -C $(TOOLSDIR)/bpf/runqslower \ ... -TEST_GEN_PROGS_EXTENDED += $(DEFAULT_BPFTOOL) +TEST_GEN_PROGS_EXTENDED += $(TRUNNER_BPFTOOL) Ensure the target arch bpftool is copied into the kselftest_bpf_install dir by selftests/lib.mk instead of always the default/host version. Thanks, Zach > @@ -255,6 +264,18 @@ $(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) \ > LIBBPF_DESTDIR=$(HOST_SCRATCH_DIR)/ \ > prefix= DESTDIR=$(HOST_SCRATCH_DIR)/ install-bin > > +ifneq ($(CROSS_COMPILE),) > +$(CROSS_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) \ > + $(BPFOBJ) | $(BUILD_DIR)/bpftool > + $(Q)$(MAKE) $(submake_extras) -C $(BPFTOOLDIR) \ > + ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) \ > + EXTRA_CFLAGS='-g -O0' \ > + OUTPUT=$(BUILD_DIR)/bpftool/ \ > + LIBBPF_OUTPUT=$(BUILD_DIR)/libbpf/ \ > + LIBBPF_DESTDIR=$(SCRATCH_DIR)/ \ > + prefix= DESTDIR=$(SCRATCH_DIR)/ install-bin > +endif > + > all: docs > > docs: > @@ -518,11 +539,12 @@ endif > $(OUTPUT)/$(TRUNNER_BINARY): $(TRUNNER_TESAT_OBJS) \ > $(TRUNNER_EXTRA_OBJS) $$(BPFOBJ) \ > $(RESOLVE_BTFIDS) related to \ > + $(TRUNNER_BPFTOOL) \ > | $(TRUNNER_BINARY)-extras > $$(call msg,BINARY,,$$@) > $(Q)$$(CC) $$(CFLAGS) $$(filter %.a %.o,$$^) $$(LDLIBS) -o $$@ > $(Q)$(RESOLVE_BTFIDS) --btf $(TRUNNER_OUTPUT)/btf_data.bpf.o $$@ > - $(Q)ln -sf $(if $2,..,.)/tools/build/bpftool/bootstrap/bpftool \ > + $(Q)ln -sf $(if $2,..,.)/tools/build/bpftool/$(USE_BOOTSTRAP)/bpftool \> $(OUTPUT)/$(if $2,$2/)bpftool > > endef > > base-commit: 06744f24696e1e7598412c3df61a538b57ebec22

1 year, 9 months

2
1
0 0

[PATCH v3 00/10] Update in kselftests for Gcc

by Amit Daniel Kachhap

Hi All, This series are modifications in kselftests required to compile with alpha version of Morello Gnu toochain recently released [1]. The whole series can also be found here [2]. Changes in v3 as reviewed by Kevin: * Patch 4 modified to fix the comment message. * Patch 5 modified to define INT_MAX inside freestanding.h. * Dropped patch 6 from v2 as the issue is reported to Morello GCC team. * Patch 8 modified to add macros to create capability and not rely on clearing selective permissions. * Patch 9 modified to add memcpy/memmove optimized routine in a new file. * Patch 10 modified to all allow LLVM definitions from user to swith to clang build. Thanks, Amit Daniel [1]: https://developer.arm.com/downloads/-/arm-gnu-toolchain-for-morello-downloa… [2]: git@git.morello-project.org:amitdaniel/linux.git gcc_kselftests_support_v3 Amit Daniel Kachhap (10): kselftests/arm64: morello: Fix inline assembly syntax kselftests/arm64: morello: Define uintcap_t for GCC kselftests/arm64: morello: Fix the -Wcast-function-type warnings kselftests/arm64: morello: Fix the fallthrough warning kselftests/arm64: morello: Avoid limits.h for Gcc kselftests/arm64: morello: clone: Initialize the local variable kselftests/arm64: morello: clone: Guard if clause to avoid warning kselftests/arm64: morello: Process the dynamic relocations kselftests/arm64: morello: Add optimized routine for memcpy kselftests/arm64: morello: Enable Gcc toolchain support .../testing/selftests/arm64/morello/Makefile | 20 +- .../selftests/arm64/morello/bootstrap.c | 7 +- tools/testing/selftests/arm64/morello/clone.c | 6 +- .../selftests/arm64/morello/freestanding.h | 7 + .../arm64/morello/freestanding_init_globals.c | 133 ++++- .../arm64/morello/freestanding_start.S | 5 +- .../selftests/arm64/morello/morello_memcpy.S | 533 ++++++++++++++++++ .../testing/selftests/arm64/morello/signal.c | 4 +- 8 files changed, 693 insertions(+), 22 deletions(-) create mode 100644 tools/testing/selftests/arm64/morello/morello_memcpy.S -- 2.25.1

1 year, 9 months

2
14
0 0

[PATCH v2 00/11] Update in kselftests for Gcc

by Amit Daniel Kachhap

Hi All, This series are modifications in kselftests required to compile with alpha version of Morello Gnu toochain recently released [1]. The whole series can also be found here [2]. Changes in v2: Rebased and tested on Morello 6.1 kernel. 1) "kselftests/arm64: morello: Fix inline assembly syntax" - Commit log change as suggested by Kevin. 2) "kselftests/arm64: morello: Define uintcap_t for GCC" - Used "#ifndef __clang__" instead of "#ifndef uintcap_t" 3) "kselftests/arm64: morello: Fix the -Wcast-function-type warnings" - New patch to fix cast function type warnings. 4) "kselftests/arm64: morello: Fix the fallthrough warning" - New patch to fix fallthrough warning 5) "kselftests/arm64: morello: Avoid limits.h for Gcc" - New patch to fix the compilation of non-existing limits.h 6) "kselftests/arm64: morello: Fix the field initializer warnings" - New patch 7) "kselftests/arm64: morello: clone: Initialize the local variable" - New patch to fix an uninitialized variable. 8) "kselftests/arm64: morello: clone: Guard if clause to avoid warning" - New patch 9) "kselftests/arm64: morello: Process the dynamic relocations" - Code re-structered and macros to create explicit capabilities. Now the logic to create R/RW/RX is simpilfied and inspired from dyn. relocations in CheriBSD. - Fixed position of __attribute__((may_alias)) in the pointer. - Removed compiler barrier instruction. - Functions renamed from __morello_init_{cap/dynamic}_relocs to __morello_process_{cap/dynamic}_relocs*. - Implemented several minor suggestions from Kevin. 10) "kselftests/arm64: morello: Add optimized routine for memcpy" - New patch to add memcpy/memmove assembly routines as suggested by Kevin. 11) "kselftests/arm64: morello: Enable Gcc toolchain support" - Removed -integrated-as and --target clang flags as they are added in 6.1 kernel as suggested by Kevin. Thanks, Amit Daniel [1]: https://developer.arm.com/downloads/-/arm-gnu-toolchain-for-morello-downloa… [2]: git@git.morello-project.org:amitdaniel/linux.git gcc_kselftests_support_v2 Amit Daniel Kachhap (11): kselftests/arm64: morello: Fix inline assembly syntax kselftests/arm64: morello: Define uintcap_t for GCC kselftests/arm64: morello: Fix the -Wcast-function-type warnings kselftests/arm64: morello: Fix the fallthrough warning kselftests/arm64: morello: Avoid limits.h for Gcc kselftests/arm64: morello: Fix the field initializer warnings kselftests/arm64: morello: clone: Initialize the local variable kselftests/arm64: morello: clone: Guard if clause to avoid warning kselftests/arm64: morello: Process the dynamic relocations kselftests/arm64: morello: Add optimized routine for memcpy kselftests/arm64: morello: Enable Gcc toolchain support .../testing/selftests/arm64/morello/Makefile | 12 +- .../selftests/arm64/morello/bootstrap.c | 7 +- tools/testing/selftests/arm64/morello/clone.c | 58 +- .../selftests/arm64/morello/freestanding.h | 3 + .../arm64/morello/freestanding_init_globals.c | 114 +++- .../arm64/morello/freestanding_start.S | 525 +++++++++++++++++- .../testing/selftests/arm64/morello/signal.c | 4 +- 7 files changed, 689 insertions(+), 34 deletions(-) -- 2.25.1

1 year, 9 months

2
23
0 0

[PATCH v4 0/8] Address ioctl-related GCC warnings

by Luca Vizzarro

Hi all, This patch series addresses the issue reported in the following issue: https://git.morello-project.org/morello/kernel/linux/-/issues/45 Changes available at: https://git.morello-project.org/Sevenarth/linux/-/commits/morello/6.1-ioctl… v4: - adjusted Fixes tag - reworded commit v3: - fixed casting of ptr from unsigned long to int - reworded commits and added Fixes tag where opportune - fixed compat ioctl handler for net - changed copy_from_user to copy_from_user_with_ptr for br_dev_read_uargs, only for non-compat - removed redundant #ifdef for compat mode - rearranged commits order v2: - discarded the posix_clock_compat_ioctl handler and replaced with the compat_ptr_ioctl helper function Luca Vizzarro (8): ptp: Modify ptp_ioctl to use user_uintptr_t posix_clocks: Use compat_ptr_ioctl helper tty: Modify ioctl to use user_uintptr_t fs: Fix user_uinptr_t behaviour with ioctl net: Modify ioctl to use user_uintptr_t net: socket: Fix compat ioctl handler net: bridge: Modify br_dev_read_uargs to accept user_uintptr_t net: bridge: Support 64-bit pointers in compat drivers/ptp/ptp_chardev.c | 2 +- drivers/ptp/ptp_private.h | 2 +- drivers/tty/n_tty.c | 2 +- drivers/tty/pty.c | 4 ++-- drivers/tty/serial/serial_core.c | 2 +- drivers/tty/tty_ioctl.c | 2 +- drivers/tty/vt/keyboard.c | 2 +- drivers/tty/vt/vt.c | 2 +- drivers/tty/vt/vt_ioctl.c | 8 ++++---- fs/autofs/root.c | 2 +- fs/ext4/ioctl.c | 4 ++-- include/linux/net.h | 2 +- include/linux/posix-clock.h | 2 +- include/linux/tty.h | 4 ++-- include/linux/tty_driver.h | 2 +- include/linux/tty_ldisc.h | 2 +- include/linux/vt_kern.h | 4 ++-- include/net/inet_common.h | 2 +- include/net/ipv6.h | 2 +- include/net/sock.h | 2 +- include/net/tcp.h | 2 +- include/net/udp.h | 2 +- kernel/time/posix-clock.c | 23 +---------------------- net/bridge/br_ioctl.c | 14 +++++++------- net/ipv4/af_inet.c | 2 +- net/ipv4/raw.c | 2 +- net/ipv4/tcp.c | 2 +- net/ipv4/udp.c | 2 +- net/ipv6/af_inet6.c | 2 +- net/ipv6/raw.c | 2 +- net/netlink/af_netlink.c | 2 +- net/packet/af_packet.c | 2 +- net/socket.c | 6 +++--- net/unix/af_unix.c | 4 ++-- 34 files changed, 50 insertions(+), 71 deletions(-) -- 2.34.1

1 year, 9 months

2
9
0 0

[PATCH v4] drm/compat: Fix types for compat to allow for non-32bit

by carsten.haitzler＠foss.arm.com

From: Carsten Haitzler <carsten.haitzler(a)arm.com> DRM compat code totally assumes compat is 32bit. This is not always the case. This allows for compat to be defined universally to typedefed types like compat_ulong_t and so on. This converts some of the drm compat handling for ioctl's to use these types. Signed-off-by: Carsten Haitzler <Carsten.Haitzler(a)arm.com> --- drivers/gpu/drm/drm_ioc32.c | 57 +++++++++++++++++++------------------ include/drm/drm_ioctl.h | 2 +- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c index 5d82891c3222..7d8a2ac8d79e 100644 --- a/drivers/gpu/drm/drm_ioc32.c +++ b/drivers/gpu/drm/drm_ioc32.c @@ -80,16 +80,16 @@ typedef struct drm_version_32 { int version_major; /* Major version */ int version_minor; /* Minor version */ int version_patchlevel; /* Patch level */ - u32 name_len; /* Length of name buffer */ - u32 name; /* Name of driver */ - u32 date_len; /* Length of date buffer */ - u32 date; /* User-space buffer to hold date */ - u32 desc_len; /* Length of desc buffer */ - u32 desc; /* User-space buffer to hold desc */ + compat_size_t name_len; /* Length of name buffer */ + compat_uptr_t name; /* Name of driver */ + compat_size_t date_len; /* Length of date buffer */ + compat_uptr_t date; /* User-space buffer to hold date */ + compat_size_t desc_len; /* Length of desc buffer */ + compat_uptr_t desc; /* User-space buffer to hold desc */ } drm_version32_t; static int compat_drm_version(struct file *file, unsigned int cmd, - unsigned long arg) + user_uintptr_t arg) { drm_version32_t v32; struct drm_version v; @@ -125,12 +125,12 @@ static int compat_drm_version(struct file *file, unsigned int cmd, } typedef struct drm_unique32 { - u32 unique_len; /* Length of unique */ - u32 unique; /* Unique name for driver instantiation */ + compat_size_t unique_len; /* Length of unique */ + compat_uptr_t unique; /* Unique name for driver instantiation */ } drm_unique32_t; static int compat_drm_getunique(struct file *file, unsigned int cmd, - unsigned long arg) + user_uintptr_t arg) { drm_unique32_t uq32; struct drm_unique uq; @@ -157,7 +157,7 @@ static int compat_drm_getunique(struct file *file, unsigned int cmd, } static int compat_drm_setunique(struct file *file, unsigned int cmd, - unsigned long arg) + user_uintptr_t arg) { /* it's dead */ return -EINVAL; @@ -250,16 +250,16 @@ static int compat_drm_rmmap(struct file *file, unsigned int cmd, #endif typedef struct drm_client32 { - int idx; /* Which client desired? */ - int auth; /* Is client authenticated? */ - u32 pid; /* Process ID */ - u32 uid; /* User ID */ - u32 magic; /* Magic */ - u32 iocs; /* Ioctl count */ + int idx; /* Which client desired? */ + int auth; /* Is client authenticated? */ + compat_ulong_t pid; /* Process ID */ + compat_ulong_t uid; /* User ID */ + compat_ulong_t magic; /* Magic */ + compat_ulong_t iocs; /* Ioctl count */ } drm_client32_t; static int compat_drm_getclient(struct file *file, unsigned int cmd, - unsigned long arg) + user_uintptr_t arg) { drm_client32_t c32; drm_client32_t __user *argp = (void __user *)arg; @@ -290,15 +290,15 @@ static int compat_drm_getclient(struct file *file, unsigned int cmd, } typedef struct drm_stats32 { - u32 count; + compat_ulong_t count; struct { - u32 value; + compat_ulong_t value; enum drm_stat_type type; } data[15]; } drm_stats32_t; static int compat_drm_getstats(struct file *file, unsigned int cmd, - unsigned long arg) + user_uintptr_t arg) { drm_stats32_t __user *argp = (void __user *)arg; @@ -823,14 +823,14 @@ static int compat_drm_update_draw(struct file *file, unsigned int cmd, struct drm_wait_vblank_request32 { enum drm_vblank_seq_type type; unsigned int sequence; - u32 signal; + compat_ulong_t signal; }; struct drm_wait_vblank_reply32 { enum drm_vblank_seq_type type; unsigned int sequence; - s32 tval_sec; - s32 tval_usec; + compat_ulong_t tval_sec; + compat_ulong_t tval_usec; }; typedef union drm_wait_vblank32 { @@ -839,7 +839,7 @@ typedef union drm_wait_vblank32 { } drm_wait_vblank32_t; static int compat_drm_wait_vblank(struct file *file, unsigned int cmd, - unsigned long arg) + user_uintptr_t arg) { drm_wait_vblank32_t __user *argp = (void __user *)arg; drm_wait_vblank32_t req32; @@ -974,24 +974,25 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) struct drm_file *file_priv = filp->private_data; drm_ioctl_compat_t *fn; int ret; + user_uintptr_t argp = (user_uintptr_t)compat_ptr(arg); /* Assume that ioctls without an explicit compat routine will just * work. This may not always be a good assumption, but it's better * than always failing. */ if (nr >= ARRAY_SIZE(drm_compat_ioctls)) - return drm_ioctl(filp, cmd, arg); + return drm_ioctl(filp, cmd, argp); fn = drm_compat_ioctls[nr].fn; if (!fn) - return drm_ioctl(filp, cmd, arg); + return drm_ioctl(filp, cmd, argp); DRM_DEBUG("comm=\"%s\", pid=%d, dev=0x%lx, auth=%d, %s\n", current->comm, task_pid_nr(current), (long)old_encode_dev(file_priv->minor->kdev->devt), file_priv->authenticated, drm_compat_ioctls[nr].name); - ret = (*fn)(filp, cmd, arg); + ret = (*fn)(filp, cmd, argp); if (ret) DRM_DEBUG("ret = %d\n", ret); return ret; diff --git a/include/drm/drm_ioctl.h b/include/drm/drm_ioctl.h index 26d5c31aefa9..a7fd12d09268 100644 --- a/include/drm/drm_ioctl.h +++ b/include/drm/drm_ioctl.h @@ -65,7 +65,7 @@ typedef int drm_ioctl_t(struct drm_device *dev, void *data, * structures and hence never need this. */ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd, - unsigned long arg); + user_uintptr_t arg); #define DRM_IOCTL_NR(n) _IOC_NR(n) #define DRM_IOCTL_TYPE(n) _IOC_TYPE(n) -- 2.25.1

1 year, 9 months

3
3
0 0

2024

2023

2022

linux-morello February 2023