linux-kernel - RE: [PATCH] HID: hyperv: avoid struct memcpy overrun warning

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <BYAPR21MB16880FB07E1632DCA991A59BD732A@BYAPR21MB1688.namprd21.prod.outlook.com>
Date:   Sat, 8 Jul 2023 14:37:28 +0000
From:   "Michael Kelley (LINUX)" <mikelley@...rosoft.com>
To:     Arnd Bergmann <arnd@...nel.org>, Jiri Kosina <jikos@...nel.org>,
        Benjamin Tissoires <benjamin.tissoires@...hat.com>
CC:     Arnd Bergmann <arnd@...db.de>, KY Srinivasan <kys@...rosoft.com>,
        Haiyang Zhang <haiyangz@...rosoft.com>,
        Wei Liu <wei.liu@...nel.org>, Dexuan Cui <decui@...rosoft.com>,
        Paulo Miguel Almeida <paulo.miguel.almeida.rodenas@...il.com>,
        Dawei Li <set_pte_at@...look.com>,
        Yang Yingliang <yangyingliang@...wei.com>,
        Thomas Weißschuh <linux@...ssschuh.net>,
        "linux-hyperv@...r.kernel.org" <linux-hyperv@...r.kernel.org>,
        "linux-input@...r.kernel.org" <linux-input@...r.kernel.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: RE: [PATCH] HID: hyperv: avoid struct memcpy overrun warning

From: Arnd Bergmann <arnd@...nel.org> Sent: Wednesday, July 5, 2023 7:02 AM
> 
> A previous patch addressed the fortified memcpy warning for most
> builds, but I still see this one with gcc-9:
> 
> In file included from include/linux/string.h:254,
>                  from drivers/hid/hid-hyperv.c:8:
> In function 'fortify_memcpy_chk',
>     inlined from 'mousevsc_on_receive' at drivers/hid/hid-hyperv.c:272:3:
> include/linux/fortify-string.h:583:4: error: call to '__write_overflow_field' declared with
> attribute warning: detected write beyond size of field (1st parameter); maybe use
> struct_group()? [-Werror=attribute-warning]
>   583 |    __write_overflow_field(p_size_field, size);
>       |    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 
> My guess is that the WARN_ON() itself is what confuses gcc, so it no
> longer sees that there is a correct range check. Rework the code in a
> way that helps readability and avoids the warning.
> 
> Fixes: 542f25a944715 ("HID: hyperv: Replace one-element array with flexible-array member")
> Signed-off-by: Arnd Bergmann <arnd@...db.de>
> ---
>  drivers/hid/hid-hyperv.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/hid/hid-hyperv.c b/drivers/hid/hid-hyperv.c
> index 49d4a26895e76..f33485d83d24f 100644
> --- a/drivers/hid/hid-hyperv.c
> +++ b/drivers/hid/hid-hyperv.c
> @@ -258,19 +258,17 @@ static void mousevsc_on_receive(struct hv_device *device,
> 
>  	switch (hid_msg_hdr->type) {
>  	case SYNTH_HID_PROTOCOL_RESPONSE:
> +		len = struct_size(pipe_msg, data, pipe_msg->size);
> +
>  		/*
>  		 * While it will be impossible for us to protect against
>  		 * malicious/buggy hypervisor/host, add a check here to
>  		 * ensure we don't corrupt memory.
>  		 */
> -		if (struct_size(pipe_msg, data, pipe_msg->size)
> -			> sizeof(struct mousevsc_prt_msg)) {
> -			WARN_ON(1);
> +		if (WARN_ON(len > sizeof(struct mousevsc_prt_msg)))
>  			break;
> -		}
> 
> -		memcpy(&input_dev->protocol_resp, pipe_msg,
> -				struct_size(pipe_msg, data, pipe_msg->size));
> +		memcpy(&input_dev->protocol_resp, pipe_msg, len);
>  		complete(&input_dev->wait_event);
>  		break;
> 
> --
> 2.39.2

Reviewed-by: Michael Kelley <mikelley@...rosoft.com>