linux-kernel - Re: [PATCH v3 2/4] block: partitions: populate fwnode

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] [thread-next>] [day] [month] [year] [list]

Date: Wed, 26 Jun 2024 20:58:08 +0100
From: Daniel Golle <daniel@...rotopia.org>
To: Jens Axboe <axboe@...nel.dk>
Cc: Rob Herring <robh@...nel.org>, Krzysztof Kozlowski <krzk+dt@...nel.org>,
	Conor Dooley <conor+dt@...nel.org>,
	Ulf Hansson <ulf.hansson@...aro.org>,
	Hauke Mehrtens <hauke@...ke-m.de>, Felix Fietkau <nbd@....name>,
	Srinivas Kandagatla <srinivas.kandagatla@...aro.org>,
	Dave Chinner <dchinner@...hat.com>, Jan Kara <jack@...e.cz>,
	Christian Brauner <brauner@...nel.org>,
	Thomas Weißschuh <linux@...ssschuh.net>,
	Al Viro <viro@...iv.linux.org.uk>,
	Li Lingfeng <lilingfeng3@...wei.com>,
	Christian Heusel <christian@...sel.eu>,
	Min Li <min15.li@...sung.com>, Avri Altman <avri.altman@....com>,
	Adrian Hunter <adrian.hunter@...el.com>,
	Hannes Reinecke <hare@...e.de>,
	Mikko Rapeli <mikko.rapeli@...aro.org>, Yeqi Fu <asuk4.q@...il.com>,
	Victor Shih <victor.shih@...esyslogic.com.tw>,
	Christophe JAILLET <christophe.jaillet@...adoo.fr>,
	Li Zhijian <lizhijian@...itsu.com>,
	"Ricardo B. Marliere" <ricardo@...liere.net>,
	devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
	linux-mmc@...r.kernel.org, linux-block@...r.kernel.org
Subject: Re: [PATCH v3 2/4] block: partitions: populate fwnode

On Wed, Jun 26, 2024 at 01:43:49PM -0600, Jens Axboe wrote:
> On 6/25/24 8:50 PM, Daniel Golle wrote:
> > diff --git a/block/partitions/core.c b/block/partitions/core.c
> > index ab76e64f0f6c..f88829e254e6 100644
> > --- a/block/partitions/core.c
> > +++ b/block/partitions/core.c
> > @@ -10,6 +10,8 @@
> >  #include <linux/ctype.h>
> >  #include <linux/vmalloc.h>
> >  #include <linux/raid/detect.h>
> > +#include <linux/property.h>
> > +
> >  #include "check.h"
> >  
> >  static int (*const check_part[])(struct parsed_partitions *) = {
> > @@ -281,6 +283,42 @@ static ssize_t whole_disk_show(struct device *dev,
> >  }
> >  static const DEVICE_ATTR(whole_disk, 0444, whole_disk_show, NULL);
> >  
> > +static struct fwnode_handle *find_partition_fwnode(struct block_device *bdev)
> > +{
> > +	struct fwnode_handle *fw_parts, *fw_part;
> > +	struct device *ddev = disk_to_dev(bdev->bd_disk);
> > +	const char *partname, *uuid;
> > +	u32 partno;
> > +
> > +	fw_parts = device_get_named_child_node(ddev, "partitions");
> > +	if (!fw_parts)
> > +		fw_parts = device_get_named_child_node(ddev->parent, "partitions");
> > +
> > +	if (!fw_parts)
> > +		return NULL;
> 
> That last if check should to inside the previous one.

Actually the previous one should have been removed entirely. I somehow
forgot to 'git add' that change.

> 
> > +	fwnode_for_each_child_node(fw_parts, fw_part) {
> > +		if (!fwnode_property_read_string(fw_part, "uuid", &uuid) &&
> > +		    (!bdev->bd_meta_info || strlen(uuid) > PARTITION_META_INFO_UUIDLTH ||
> > +		     strncmp(uuid, bdev->bd_meta_info->uuid, PARTITION_META_INFO_UUIDLTH)))
> > +			continue;
> > +
> > +		if (!fwnode_property_read_string(fw_part, "partname", &partname) &&
> > +		    (!bdev->bd_meta_info || strlen(uuid) > PARTITION_META_INFO_VOLNAMELTH ||
> > +		     strncmp(partname, bdev->bd_meta_info->volname,
> > +			     PARTITION_META_INFO_VOLNAMELTH)))
> > +			continue;
> 
> This is pretty hard to make sense of...

I'll add comments explaining it. Or should I use another syntax, e.g. several
nested if-clauses, instead?