linux-kernel - Re: [PATCH 06/16] rbd: convert timeouts to secs_to

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAOi1vP_UTjuF5y5oEVquk45udBZ41WqxQpHufD5oK2wbQkobhA@mail.gmail.com>
Date: Mon, 3 Feb 2025 22:19:23 +0100
From: Ilya Dryomov <idryomov@...il.com>
To: Easwar Hariharan <eahariha@...ux.microsoft.com>
Cc: Andrew Morton <akpm@...ux-foundation.org>, Dongsheng Yang <dongsheng.yang@...ystack.cn>, 
	Jens Axboe <axboe@...nel.dk>, ceph-devel@...r.kernel.org, linux-block@...r.kernel.org, 
	Yaron Avizrat <yaron.avizrat@...el.com>, Oded Gabbay <ogabbay@...nel.org>, 
	Julia Lawall <Julia.Lawall@...ia.fr>, Nicolas Palix <nicolas.palix@...g.fr>, 
	James Smart <james.smart@...adcom.com>, Dick Kennedy <dick.kennedy@...adcom.com>, 
	"James E.J. Bottomley" <James.Bottomley@...senpartnership.com>, 
	"Martin K. Petersen" <martin.petersen@...cle.com>, Jaroslav Kysela <perex@...ex.cz>, 
	Takashi Iwai <tiwai@...e.com>, Chris Mason <clm@...com>, Josef Bacik <josef@...icpanda.com>, 
	David Sterba <dsterba@...e.com>, Xiubo Li <xiubli@...hat.com>, 
	Damien Le Moal <dlemoal@...nel.org>, Niklas Cassel <cassel@...nel.org>, Carlos Maiolino <cem@...nel.org>, 
	"Darrick J. Wong" <djwong@...nel.org>, Sebastian Reichel <sre@...nel.org>, Keith Busch <kbusch@...nel.org>, 
	Christoph Hellwig <hch@....de>, Sagi Grimberg <sagi@...mberg.me>, Frank Li <Frank.Li@....com>, 
	Mark Brown <broonie@...nel.org>, Shawn Guo <shawnguo@...nel.org>, 
	Sascha Hauer <s.hauer@...gutronix.de>, Pengutronix Kernel Team <kernel@...gutronix.de>, 
	Fabio Estevam <festevam@...il.com>, Shyam Sundar S K <Shyam-sundar.S-k@....com>, 
	Hans de Goede <hdegoede@...hat.com>, Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>, 
	Henrique de Moraes Holschuh <hmh@....eng.br>, Selvin Xavier <selvin.xavier@...adcom.com>, 
	Kalesh AP <kalesh-anakkur.purayil@...adcom.com>, Jason Gunthorpe <jgg@...pe.ca>, 
	Leon Romanovsky <leon@...nel.org>, cocci@...ia.fr, linux-kernel@...r.kernel.org, 
	linux-scsi@...r.kernel.org, dri-devel@...ts.freedesktop.org, 
	linux-sound@...r.kernel.org, linux-btrfs@...r.kernel.org, 
	linux-ide@...r.kernel.org, linux-xfs@...r.kernel.org, 
	linux-pm@...r.kernel.org, linux-nvme@...ts.infradead.org, 
	linux-spi@...r.kernel.org, imx@...ts.linux.dev, 
	linux-arm-kernel@...ts.infradead.org, platform-driver-x86@...r.kernel.org, 
	ibm-acpi-devel@...ts.sourceforge.net, linux-rdma@...r.kernel.org
Subject: Re: [PATCH 06/16] rbd: convert timeouts to secs_to_jiffies()

On Wed, Jan 29, 2025 at 10:03 PM Easwar Hariharan
<eahariha@...ux.microsoft.com> wrote:
>
> On 1/28/2025 10:21 AM, Easwar Hariharan wrote:
> > Commit b35108a51cf7 ("jiffies: Define secs_to_jiffies()") introduced
> > secs_to_jiffies().  As the value here is a multiple of 1000, use
> > secs_to_jiffies() instead of msecs_to_jiffies to avoid the multiplication.
> >
> > This is converted using scripts/coccinelle/misc/secs_to_jiffies.cocci with
> > the following Coccinelle rules:
> >
> > @depends on patch@
> > expression E;
> > @@
> >
> > -msecs_to_jiffies
> > +secs_to_jiffies
> > (E
> > - * \( 1000 \| MSEC_PER_SEC \)
> > )
> >
> > Signed-off-by: Easwar Hariharan <eahariha@...ux.microsoft.com>
> > ---
> >  drivers/block/rbd.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >
>
> <snip>
>
> > @@ -6283,9 +6283,9 @@ static int rbd_parse_param(struct fs_parameter *param,
> >               break;
> >       case Opt_lock_timeout:
> >               /* 0 is "wait forever" (i.e. infinite timeout) */
> > -             if (result.uint_32 > INT_MAX / 1000)
> > +             if (result.uint_32 > INT_MAX)
> >                       goto out_of_range;
> > -             opt->lock_timeout = msecs_to_jiffies(result.uint_32 * 1000);
> > +             opt->lock_timeout = secs_to_jiffies(result.uint_32);
> >               break;
> >       case Opt_pool_ns:
> >               kfree(pctx->spec->pool_ns);
> >
>
> Hi Ilya, Dongsheng, Jens, others,
>
> Could you please review this hunk and confirm the correct range check
> here? I figure this is here because of the multiplier to
> msecs_to_jiffies() and therefore unneeded after the conversion. If so, I

Hi Easwar,

I'm not sure why INT_MAX / 1000 was used for an option which is defined
as fsparam_u32 and accessed through result.uint_32, but yes, this check
appears to be unneeded after the conversion to me.

> noticed patch 07 has similar range checks that I neglected to fix and
> can do in a v2.

Go ahead but note that two of them also reject 0 -- that part needs to
stay ;)

Thanks,

                Ilya