linux-kernel - Re: linux-next: manual merge of the hid tree with the mm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20240719094532.20fd065d@canb.auug.org.au>
Date: Fri, 19 Jul 2024 09:45:32 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jiri Kosina <jikos@...nel.org>, Benjamin Tissoires
 <benjamin.tissoires@...hat.com>, Andrew Morton <akpm@...ux-foundation.org>
Cc: Benjamin Tissoires <bentiss@...nel.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Suren Baghdasaryan <surenb@...gle.com>
Subject: Re: linux-next: manual merge of the hid tree with the mm tree

Hi all,

On Tue, 9 Jul 2024 11:25:44 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the hid tree got a conflict in:
> 
>   include/linux/hid_bpf.h
> 
> between commit:
> 
>   bad8443fbbca ("mm: add comments for allocation helpers explaining why they are macros")
> 
> from the mm-unstable branch of the mm tree and commit:
> 
>   6cd735f0e57a ("HID: bpf: protect HID-BPF prog_list access by a SRCU")
> 
> from the hid tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> diff --cc include/linux/hid_bpf.h
> index 99a3edb6cf07,9ca96fc90449..000000000000
> --- a/include/linux/hid_bpf.h
> +++ b/include/linux/hid_bpf.h
> @@@ -151,12 -227,7 +227,12 @@@ static inline int dispatch_hid_bpf_outp
>   static inline int hid_bpf_connect_device(struct hid_device *hdev) { return 0; }
>   static inline void hid_bpf_disconnect_device(struct hid_device *hdev) {}
>   static inline void hid_bpf_destroy_device(struct hid_device *hid) {}
> - static inline void hid_bpf_device_init(struct hid_device *hid) {}
> + static inline int hid_bpf_device_init(struct hid_device *hid) { return 0; }
>  +/*
>  + * This specialized allocator has to be a macro for its allocations to be
>  + * accounted separately (to have a separate alloc_tag). The typecast is
>  + * intentional to enforce typesafety.
>  + */
>   #define call_hid_bpf_rdesc_fixup(_hdev, _rdesc, _size)	\
>   		((u8 *)kmemdup(_rdesc, *(_size), GFP_KERNEL))
>   

This is now a conflict between the mm-stable branch of the mm tree
and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped