[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <b3c621ee-1729-e631-3dd5-3b4792dd1927@acm.org>
Date: Fri, 6 Aug 2021 20:17:56 -0700
From: Bart Van Assche <bvanassche@....org>
To: Kevin Mitchell <kevmitch@...sta.com>
Cc: Kees Cook <keescook@...omium.org>, Arnd Bergmann <arnd@...db.de>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Hannes Reinecke <hare@...e.de>, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] lkdtm: move SCSI_DISPATCH_CMD to scsi_queue_rq
On 8/6/21 3:59 PM, Kevin Mitchell wrote:
> When scsi_dispatch_cmd was moved to scsi_lib.c and made static, some
> compilers (i.e., at least gcc 8.4.0) decided to compile this
> inline. This is a problem for lkdtm.ko, which needs to insert a kprobe
> on this function for the SCSI_DISPATCH_CMD crashpoint.
>
> Move this crashpoint one function up the call chain to
> scsi_queue_rq. Though this is also a static function, it should never be
> inlined because it is assigned as a structure entry. Therefore,
> kprobe_register should always be able to find it. Since there is already
> precedent for crashpoint names not exactly matching their probed
> functions, keep the name of the crashpoint the same for backwards
> compatibility.
>
> Fixes: 82042a2cdb55 ("scsi: move scsi_dispatch_cmd to scsi_lib.c")
> Signed-off-by: Kevin Mitchell <kevmitch@...sta.com>
> ---
> drivers/misc/lkdtm/core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/misc/lkdtm/core.c b/drivers/misc/lkdtm/core.c
> index 97803f213..2612f214d 100644
> --- a/drivers/misc/lkdtm/core.c
> +++ b/drivers/misc/lkdtm/core.c
> @@ -81,7 +81,7 @@ static struct crashpoint crashpoints[] = {
> CRASHPOINT("FS_DEVRW", "ll_rw_block"),
> CRASHPOINT("MEM_SWAPOUT", "shrink_inactive_list"),
> CRASHPOINT("TIMERADD", "hrtimer_start"),
> - CRASHPOINT("SCSI_DISPATCH_CMD", "scsi_dispatch_cmd"),
> + CRASHPOINT("SCSI_DISPATCH_CMD", "scsi_queue_rq"),
> CRASHPOINT("IDE_CORE_CP", "generic_ide_ioctl"),
> #endif
> };
Please send SCSI patches to the linux-scsi mailing list. See also the
MAINTAINERS file.
Thanks,
Bart.
Powered by blists - more mailing lists