From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
To: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>,
linux-hardening@vger.kernel.org, keescook@chromium.org,
gustavoars@kernel.org, Bryan Tan <bryantan@vmware.com>,
Vishnu Dasa <vdasa@vmware.com>,
VMware PV-Drivers Reviewers <pv-drivers@vmware.com>,
Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-kernel@vger.kernel.org
Cc: vegard.nossum@oracle.com, darren.kenny@oracle.com,
syzkaller <syzkaller@googlegroups.com>
Subject: Re: [RFC PATCH] VMCI: Silence memcpy() run-time false positive warning
Date: Mon, 1 Jan 2024 11:43:42 -0600 [thread overview]
Message-ID: <cc8d5ac1-99b6-480d-86ca-f76ed9c324c3@embeddedor.com> (raw)
In-Reply-To: <20240101130828.3666251-1-harshit.m.mogalapalli@oracle.com>
On 1/1/24 07:08, Harshit Mogalapalli wrote:
> Syzkaller hit 'WARNING in dg_dispatch_as_host' bug.
>
> memcpy: detected field-spanning write (size 56) of single field "&dg_info->msg"
> at drivers/misc/vmw_vmci/vmci_datagram.c:237 (size 24)
This is not a 'false postive warning.' This is a legitimately warning
coming from the fortified memcpy().
Under FORTIFY_SOURCE we should not copy data across multiple members
in a structure. For that we alternatives like struct_group(), or as
in this case, splitting memcpy(), or as I suggest below, a mix of
direct assignment and memcpy().
>
> WARNING: CPU: 0 PID: 1555 at drivers/misc/vmw_vmci/vmci_datagram.c:237
> dg_dispatch_as_host+0x88e/0xa60 drivers/misc/vmw_vmci/vmci_datagram.c:237
>
> Some code commentry, based on my understanding:
>
> 544 #define VMCI_DG_SIZE(_dg) (VMCI_DG_HEADERSIZE + (size_t)(_dg)->payload_size)
> /// This is 24 + payload_size
>
> memcpy(&dg_info->msg, dg, dg_size);
> Destination = dg_info->msg ---> this is a 24 byte
> structure(struct vmci_datagram)
> Source = dg --> this is a 24 byte structure (struct vmci_datagram)
> Size = dg_size = 24 + payload_size
>
>
> {payload_size = 56-24 =32} -- Syzkaller managed to set payload_size to 32.
>
> 35 struct delayed_datagram_info {
> 36 struct datagram_entry *entry;
> 37 struct work_struct work;
> 38 bool in_dg_host_queue;
> 39 /* msg and msg_payload must be together. */
> 40 struct vmci_datagram msg;
> 41 u8 msg_payload[];
> 42 };
>
> So those extra bytes of payload are copied into msg_payload[], so there
> is no bug, but a run time warning is seen while fuzzing with Syzkaller.
>
> One possible way to silence the warning is to split the memcpy() into
> two parts -- one -- copying the msg and second taking care of payload.
>
> Reported-by: syzkaller <syzkaller@googlegroups.com>
> Suggested-by: Vegard Nossum <vegard.nossum@oracle.com>
> Signed-off-by: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>
> ---
> This patch is only tested with the C reproducer, not any testing
> specific to driver is done.
> ---
> drivers/misc/vmw_vmci/vmci_datagram.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/misc/vmw_vmci/vmci_datagram.c b/drivers/misc/vmw_vmci/vmci_datagram.c
> index f50d22882476..b43661590f56 100644
> --- a/drivers/misc/vmw_vmci/vmci_datagram.c
> +++ b/drivers/misc/vmw_vmci/vmci_datagram.c
> @@ -216,6 +216,7 @@ static int dg_dispatch_as_host(u32 context_id, struct vmci_datagram *dg)
> if (dst_entry->run_delayed ||
> dg->src.context == VMCI_HOST_CONTEXT_ID) {
> struct delayed_datagram_info *dg_info;
> + size_t payload_size = dg_size - VMCI_DG_HEADERSIZE;
This seems to be the same as `dg->payload_size`, so I don't think a new
variable is necessary.
>
> if (atomic_add_return(1, &delayed_dg_host_queue_size)
> == VMCI_MAX_DELAYED_DG_HOST_QUEUE_SIZE) {
> @@ -234,7 +235,8 @@ static int dg_dispatch_as_host(u32 context_id, struct vmci_datagram *dg)
>
> dg_info->in_dg_host_queue = true;
> dg_info->entry = dst_entry;
> - memcpy(&dg_info->msg, dg, dg_size);
> + memcpy(&dg_info->msg, dg, VMCI_DG_HEADERSIZE);
> + memcpy(&dg_info->msg_payload, dg + 1, payload_size);
I think a direct assignment and a call to memcpy() is better in this case,
something like this:
dg_info->msg = *dg;
memcpy(&dg_info->msg_payload, dg + 1, dg->payload_size);
However, that `dg + 1` thing is making my eyes twitch. Where exactly are we
making sure that `dg` actually points to an area in memory bigger than
`sizeof(*dg)`?...
Also, we could also use struct_size() during allocation, some lines above:
- dg_info = kmalloc(sizeof(*dg_info) +
- (size_t) dg->payload_size, GFP_ATOMIC);
+ dg_info = kmalloc(struct_size(dg_info, msg_payload, dg->payload_size),
+ GFP_ATOMIC);
--
Gustavo
>
> INIT_WORK(&dg_info->work, dg_delayed_dispatch);
> schedule_work(&dg_info->work);
next prev parent reply other threads:[~2024-01-01 17:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-01 13:08 Harshit Mogalapalli
2024-01-01 13:55 ` Greg Kroah-Hartman
2024-01-02 18:34 ` Harshit Mogalapalli
2024-01-04 18:31 ` Vegard Nossum
2024-01-04 19:02 ` Gustavo A. R. Silva
2024-01-01 17:43 ` Gustavo A. R. Silva [this message]
2024-01-02 18:37 ` Harshit Mogalapalli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cc8d5ac1-99b6-480d-86ca-f76ed9c324c3@embeddedor.com \
--to=gustavo@embeddedor.com \
--cc=arnd@arndb.de \
--cc=bryantan@vmware.com \
--cc=darren.kenny@oracle.com \
--cc=gregkh@linuxfoundation.org \
--cc=gustavoars@kernel.org \
--cc=harshit.m.mogalapalli@oracle.com \
--cc=keescook@chromium.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pv-drivers@vmware.com \
--cc=syzkaller@googlegroups.com \
--cc=vdasa@vmware.com \
--cc=vegard.nossum@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®