From: Kees Cook <keescook@chromium.org>
To: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Hans de Goede <hdegoede@redhat.com>,
Azeem Shaikh <azeemshaikh38@gmail.com>,
LKML <linux-kernel@vger.kernel.org>,
linux-hardening@vger.kernel.org,
"Gustavo A. R. Silva" <gustavoars@kernel.org>
Subject: Re: Crash in VirtualBox virtual machines running kernel 6.5
Date: Wed, 19 Jul 2023 08:36:53 -0700 [thread overview]
Message-ID: <202307190835.752D710D@keescook> (raw)
In-Reply-To: <202307190823.086EFD42D9@keescook>
Okay, please try:
diff --git a/fs/vboxsf/shfl_hostintf.h b/fs/vboxsf/shfl_hostintf.h
index aca829062c12..902fe3224453 100644
--- a/fs/vboxsf/shfl_hostintf.h
+++ b/fs/vboxsf/shfl_hostintf.h
@@ -68,12 +68,11 @@ struct shfl_string {
/** UTF-8 or UTF-16 string. Nul terminated. */
union {
- u8 utf8[2];
- u16 utf16[1];
- u16 ucs2[1]; /* misnomer, use utf16. */
+ DECLARE_FLEX_ARRAY(u8, utf8);
+ DECLARE_FLEX_ARRAY(u16, utf16);
} string;
};
-VMMDEV_ASSERT_SIZE(shfl_string, 6);
+VMMDEV_ASSERT_SIZE(shfl_string, 4);
/* The size of shfl_string w/o the string part. */
#define SHFLSTRING_HEADER_SIZE 4
The size assert doesn't seem to be used anywhere else, but I can do a
more careful binary analysis later today...
--
Kees Cook
next prev parent reply other threads:[~2023-07-19 15:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-19 15:02 Crash in VirtualBox virtual machines running kernel 6.5 Larry Finger
2023-07-19 15:31 ` Kees Cook
2023-07-19 15:34 ` Kees Cook
2023-07-19 15:36 ` Kees Cook [this message]
2023-07-19 21:24 ` Larry Finger
2023-07-19 22:37 ` Kees Cook
2023-07-20 14:51 ` Larry Finger
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=202307190835.752D710D@keescook \
--to=keescook@chromium.org \
--cc=Larry.Finger@lwfinger.net \
--cc=azeemshaikh38@gmail.com \
--cc=gustavoars@kernel.org \
--cc=hdegoede@redhat.com \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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