From: Phillip Potter <phil@philpotter.co.uk>
To: Justin Stitt <justinstitt@google.com>
Cc: Phillip Potter <phil@philpotter.co.uk>,
Nathan Chancellor <nathan@kernel.org>,
Bill Wendling <morbo@google.com>,
linux-kernel@vger.kernel.org, llvm@lists.linux.dev,
linux-hardening@vger.kernel.org,
Justin Stitt <justinstitt@google.com>
Subject: Re: [PATCH] cdrom: rearrange last_media_change check to avoid unintentional overflow
Date: Tue, 7 May 2024 21:53:37 +0100 [thread overview]
Message-ID: <ZjqU0fbzHrlnad8D@equinox> (raw)
In-Reply-To: <20240507-b4-sio-ata1-v1-1-810ffac6080a@google.com>
On Tue, May 07, 2024 at 04:54:04AM +0000, Justin Stitt wrote:
> When running syzkaller with the newly reintroduced signed integer wrap
> sanitizer we encounter this splat:
>
> [ 366.015950] UBSAN: signed-integer-overflow in ../drivers/cdrom/cdrom.c:2361:33
> [ 366.021089] -9223372036854775808 - 346321 cannot be represented in type '__s64' (aka 'long long')
> [ 366.025894] program syz-executor.4 is using a deprecated SCSI ioctl, please convert it to SG_IO
> [ 366.027502] CPU: 5 PID: 28472 Comm: syz-executor.7 Not tainted 6.8.0-rc2-00035-gb3ef86b5a957 #1
> [ 366.027512] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.3-debian-1.16.3-2 04/01/2014
> [ 366.027518] Call Trace:
> [ 366.027523] <TASK>
> [ 366.027533] dump_stack_lvl+0x93/0xd0
> [ 366.027899] handle_overflow+0x171/0x1b0
> [ 366.038787] ata1.00: invalid multi_count 32 ignored
> [ 366.043924] cdrom_ioctl+0x2c3f/0x2d10
> [ 366.063932] ? __pm_runtime_resume+0xe6/0x130
> [ 366.071923] sr_block_ioctl+0x15d/0x1d0
> [ 366.074624] ? __pfx_sr_block_ioctl+0x10/0x10
> [ 366.077642] blkdev_ioctl+0x419/0x500
> [ 366.080231] ? __pfx_blkdev_ioctl+0x10/0x10
> ...
>
> Historically, the signed integer overflow sanitizer did not work in the
> kernel due to its interaction with `-fwrapv` but this has since been
> changed [1] in the newest version of Clang. It was re-enabled in the
> kernel with Commit 557f8c582a9ba8ab ("ubsan: Reintroduce signed overflow
> sanitizer").
>
> Let's rearrange the check to not perform any arithmetic, thus not
> tripping the sanitizer.
> ...
Hi Justin,
Thanks for the patch, looks good to me and seems like a sensible change.
Reviewed and build/runtime tested, I will send on for inclusion.
Reviewed-by: Phillip Potter <phil@philpotter.co.uk>
Regards,
Phil
next prev parent reply other threads:[~2024-05-07 20:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-07 4:54 [PATCH] cdrom: rearrange last_media_change check to avoid unintentional overflow Justin Stitt
2024-05-07 20:53 ` Phillip Potter [this message]
2024-05-08 0:09 ` Kees Cook
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=ZjqU0fbzHrlnad8D@equinox \
--to=phil@philpotter.co.uk \
--cc=justinstitt@google.com \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=morbo@google.com \
--cc=nathan@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.