From: Jeongjun Park <aha310510@gmail.com>
To: dlemoal@kernel.org, cassel@kernel.org
Cc: syzbot+37757dc11ee77ef850bb@syzkaller.appspotmail.com,
linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org,
Jeongjun Park <aha310510@gmail.com>
Subject: [PATCH] ata: libata: fix ALL_SUB_MPAGES not to be performed when CDL is not supported
Date: Sat, 21 Sep 2024 21:41:17 +0900 [thread overview]
Message-ID: <20240921124117.82156-1-aha310510@gmail.com> (raw)
In the previous commit 602bcf212637 ("ata: libata: Improve CDL resource
management"), the ata_cdl structure was added and the ata_cdl structure
memory was allocated with kzalloc(). Because of this, if CDL is not
supported, dev->cdl is a NULL pointer, so additional work should never
be done.
However, even if CDL is not supported now, if spg is ALL_SUB_MPAGES,
dereferencing dev->cdl will result in a NULL pointer dereference.
Therefore, I think it is appropriate to check dev->flags in
ata_scsiop_mode_sense() if spg is ALL_SUB_MPAGES to see if CDL is supported.
Reported-by: syzbot+37757dc11ee77ef850bb@syzkaller.appspotmail.com
Tested-by: syzbot+37757dc11ee77ef850bb@syzkaller.appspotmail.com
Fixes: 602bcf212637 ("ata: libata: Improve CDL resource management")
Signed-off-by: Jeongjun Park <aha310510@gmail.com>
---
drivers/ata/libata-scsi.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 3328a6febc13..6f5527f12b0e 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -2442,7 +2442,9 @@ static unsigned int ata_scsiop_mode_sense(struct ata_scsi_args *args, u8 *rbuf)
if (spg) {
switch (spg) {
case ALL_SUB_MPAGES:
- break;
+ if (dev->flags & ATA_DFLAG_CDL)
+ break;
+ fallthrough;
case CDL_T2A_SUB_MPAGE:
case CDL_T2B_SUB_MPAGE:
case ATA_FEATURE_SUB_MPAGE:
--
next reply other threads:[~2024-09-21 12:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-21 12:41 Jeongjun Park [this message]
2024-09-23 8:49 ` [PATCH] ata: libata: fix ALL_SUB_MPAGES not to be performed when CDL is not supported Damien Le Moal
2024-09-23 11:15 ` Jeongjun Park
2024-09-23 11:24 ` Jeongjun Park
2024-09-23 13:07 ` Damien Le Moal
2024-09-23 13:22 ` Jeongjun Park
2024-09-23 13:24 ` Damien Le Moal
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=20240921124117.82156-1-aha310510@gmail.com \
--to=aha310510@gmail.com \
--cc=cassel@kernel.org \
--cc=dlemoal@kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=syzbot+37757dc11ee77ef850bb@syzkaller.appspotmail.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