Skip to contentSkip to conversation

dax: use correct dev_t value

PATCH In review Arnd Bergmann 2 participants 3 messages Sep 8, 2016 Device direct access (DAX)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dax: use correct dev_t value

The dev_t variable in devm_create_dax_dev() is used before it's first set:

drivers/dax/dax.c: In function 'devm_create_dax_dev':
drivers/dax/dax.c:205:39: error: 'dev_t' may be used uninitialized in this function [-Werror=maybe-uninitialized]
inode = iget5_locked(dax_superblock, hash_32(devt + DAXFS_MAGIC, 31),

                                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

drivers/dax/dax.c:688:8: note: 'dev_t' was declared here

This reorders the code to how it looks correct to me.

Fixes 3bc52c45bac2 ("dax: define a unified inode/address_space for device-dax mappings")
---
 drivers/dax/dax.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/dax/dax.c +2 -2
index 68bb5e35b639..98dbbc12055f 100644
@@ -731,6 +731,8 @@ struct dax_dev *devm_create_dax_dev(struct dax_region *dax_region,
 		goto err_minor;
 	}
 
+	dev_t = MKDEV(MAJOR(dax_devt), minor);
+	dev = &dax_dev->dev;
 	dax_dev->inode = dax_inode_get(&dax_dev->cdev, dev_t);
 	if (!dax_dev->inode) {
 		rc = -ENOMEM;
@@ -738,8 +740,6 @@ struct dax_dev *devm_create_dax_dev(struct dax_region *dax_region,
 	}
 
 	/* device_initialize() so cdev can reference kobj parent */
-	dev_t = MKDEV(MAJOR(dax_devt), minor);
-	dev = &dax_dev->dev;
 	device_initialize(dev);
 
 	cdev = &dax_dev->cdev;
Signature · 1 line
2.9.0
#1 lore raw

[ adding 0day robot ]

Quoted 31 lines · Arnd Bergmann

The dev_t variable in devm_create_dax_dev() is used before it's first set:

drivers/dax/dax.c: In function 'devm_create_dax_dev':
drivers/dax/dax.c:205:39: error: 'dev_t' may be used uninitialized in this function [-Werror=maybe-uninitialized]
inode = iget5_locked(dax_superblock, hash_32(devt + DAXFS_MAGIC, 31),

                                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

drivers/dax/dax.c:688:8: note: 'dev_t' was declared here

This reorders the code to how it looks correct to me.

Fixes 3bc52c45bac2 ("dax: define a unified inode/address_space for device-dax mappings")
---
 drivers/dax/dax.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/dax/dax.c +2 -0
index 68bb5e35b639..98dbbc12055f 100644
@@ -731,6 +731,8 @@ struct dax_dev *devm_create_dax_dev(struct dax_region *dax_region,
                goto err_minor;
        }
 
+       dev_t = MKDEV(MAJOR(dax_devt), minor);
+       dev = &dax_dev->dev;
        dax_dev->inode = dax_inode_get(&dax_dev->cdev, dev_t);
        if (!dax_dev->inode) {
                rc = -ENOMEM;

drivers/dax/dax.c struct dax_dev *devm_create_dax_dev(struct dax_region *dax_region, · line 745

Quoted 8 lines
drivers/dax/dax.c +0 -2
@@ -738,8 +740,6 @@ struct dax_dev *devm_create_dax_dev(struct dax_region *dax_region,
        }
 
        /* device_initialize() so cdev can reference kobj parent */
-       dev_t = MKDEV(MAJOR(dax_devt), minor);
-       dev = &dax_dev->dev;
        device_initialize(dev);
 
        cdev = &dax_dev->cdev;

Looks good to me.

Strange, I don't see this error with gcc-5.3.1, I assume 0day missed it for a similar reason?

#2 lore raw
Quoted 10 lines · CEST Dan Williams
Quoted 9 lines · Arnd Bergmann

The dev_t variable in devm_create_dax_dev() is used before it's first set:

drivers/dax/dax.c: In function 'devm_create_dax_dev':
drivers/dax/dax.c:205:39: error: 'dev_t' may be used uninitialized in this function [-Werror=maybe-uninitialized]
inode = iget5_locked(dax_superblock, hash_32(devt + DAXFS_MAGIC, 31),

                                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

drivers/dax/dax.c:688:8: note: 'dev_t' was declared here

Quoted 7 lines
Quoted 2 lines

This reorders the code to how it looks correct to me.

Looks good to me.

Strange, I don't see this error with gcc-5.3.1, I assume 0day missed it for a similar reason?

No, the warning is disabled by now since 6e8d666e9253 ("Disable "maybe-uninitialized" warning globally"), which I have reverted locally.

You can also build with -Wmaybe-uninitialized, but that causes many false positives if any of these options are enabled:

CONFIG_CC_OPTIMIZE_FOR_SIZE
CONFIG_PROFILE_ALL_BRANCHES
CONFIG_UBSAN_SANITIZE_ALL
CONFIG_GCOV_PROFILE_ALL

I'm still trying to come up with a way to get the warning to be useful again without annoying Linus too much.

Arnd