From: Christoph Heiss <c.heiss@proxmox.com>
To: Wolfgang Bumiller <w.bumiller@proxmox.com>
Cc: pve-devel@lists.proxmox.com
Subject: Re: [pve-devel] [PATCH installer 5/6] sys: block: fix possible use of `undef`-value when detecting disk sizes
Date: Wed, 23 Aug 2023 10:49:18 +0200 [thread overview]
Message-ID: <otmco7ftl6i4c7icy4bpzwi4bn37wzedurfiasiuec6ffvy33r@rykpcpjtdhfg> (raw)
In-Reply-To: <stl4lo547os5kbtaa2v5nby2gmpr7e2rkeuqq7lidf7dyhk5zh@jpauv25ztnno>
On Wed, Aug 23, 2023 at 10:31:29AM +0200, Wolfgang Bumiller wrote:
>
> On Wed, Aug 09, 2023 at 03:44:24PM +0200, Christoph Heiss wrote:
> > [..]
> > diff --git a/Proxmox/Sys/Block.pm b/Proxmox/Sys/Block.pm
> > index 26085e3..f76e0f1 100644
> > --- a/Proxmox/Sys/Block.pm
> > +++ b/Proxmox/Sys/Block.pm
> > @@ -90,10 +90,10 @@ my sub hd_list {
> > }
> >
> > my $size = file_read_firstline("$bd/size");
> > + next if !$size;
> > chomp $size;
> > - $size = undef if !($size && $size =~ m/^\d+$/);
> > + next if $size !~ m/^\d+$/;
> > $size = int($size);
> > - next if !$size;
>
> ^ not sure it makes sense to remove this, but OTOH, file_read_firstline
> already chomps, so the first one already catches at least the zero-sized
> device case
Yeah, that was my thought here as well. It's chomped and the regex
should take care of empty values / anything that is not some integer in
any case.
> (which btw. is easily reproducible by simply plugging in a card reader
> without a card inserted ;-) )
I was wondering how such a case could even happen - makes sense tho, TIL
:^)
next prev parent reply other threads:[~2023-08-23 8:49 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-09 13:44 [pve-devel] [PATCH installer 0/6] some small, assorted fixes & cleanups Christoph Heiss
2023-08-09 13:44 ` [pve-devel] [PATCH installer 1/6] tui: drop some leftover, commented-out code Christoph Heiss
2023-08-09 13:44 ` [pve-devel] [PATCH installer 2/6] tui: password: include minimum password length in error message Christoph Heiss
2023-08-09 13:44 ` [pve-devel] [PATCH installer 3/6] tui: network: select matching NIC for IP configuration Christoph Heiss
2023-08-09 13:44 ` [pve-devel] [PATCH installer 4/6] tui: setup: fix disk size for 4Kn block devices Christoph Heiss
2023-08-09 13:44 ` [pve-devel] [PATCH installer 5/6] sys: block: fix possible use of `undef`-value when detecting disk sizes Christoph Heiss
2023-08-23 8:31 ` Wolfgang Bumiller
2023-08-23 8:49 ` Christoph Heiss [this message]
2023-08-09 13:44 ` [pve-devel] [PATCH installer 6/6] tui: setup: handle missing disk block size gracefully Christoph Heiss
2023-08-23 8:30 ` [pve-devel] applied-series: [PATCH installer 0/6] some small, assorted fixes & cleanups Wolfgang Bumiller
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=otmco7ftl6i4c7icy4bpzwi4bn37wzedurfiasiuec6ffvy33r@rykpcpjtdhfg \
--to=c.heiss@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
--cc=w.bumiller@proxmox.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 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.