[PATCH] lsblk: improve error reporting for invalid device paths

[PATCH] lsblk: improve error reporting for invalid device paths

[sina-abroshan]

Differentiate stat() failures from non-block-device cases,
so users get accurate errno-based error messages.

Signed-off-by: sina-abroshan <sina.abroshan@gmail.com>
---
 misc-utils/lsblk.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index 3d2bc21a6..4a0d7c70e 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -1793,14 +1793,20 @@ static int __process_one_device(struct lsblk_devtree *tr, char *devname, dev_t d
 	int real_part = 0, rc = -EINVAL;
 
 	if (devno == 0 && devname) {
-		struct stat st;
+    	struct stat st;
 
-		DBG(DEV, ul_debug("%s: reading alone device", devname));
+    	DBG(DEV, ul_debug("%s: reading alone device", devname));
 
-		if (stat(devname, &st) || !S_ISBLK(st.st_mode)) {
+		if (stat(devname, &st) != 0) {
+			warn(_("%s"), devname);
+			goto leave;
+		}
+
+		if (!S_ISBLK(st.st_mode)) {
 			warnx(_("%s: not a block device"), devname);
 			goto leave;
 		}
+
 		devno = st.st_rdev;
 	} else if (devno) {
 		DBG(DEV, ul_debug("%d:%d: reading alone device", major(devno), minor(devno)));
-- 
2.34.1

Re: [PATCH] lsblk: improve error reporting for invalid device paths

[Benno Schulenberg]

[-- Attachment #1.1: Type: text/plain, Size: 553 bytes --]


Op 12-02-2026 om 12:24 schreef sina-abroshan:
> -		struct stat st;
> +    	struct stat st;
>   
> -		DBG(DEV, ul_debug("%s: reading alone device", devname));
> +    	DBG(DEV, ul_debug("%s: reading alone device", devname));

Why these whitespace changes?  There should be tabs there, not spaces.

> -		if (stat(devname, &st) || !S_ISBLK(st.st_mode)) {
> +		if (stat(devname, &st) != 0) {
> +			warn(_("%s"), devname);
Gettextizing a message that contains nothing translatable is pointless.
In other words: drop the _() call.


Benno


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]

[PATCH] lsblk: improve error reporting for invalid device paths

[sina-abroshan]

From: Sina Abroshan <sina.abroshan@gmail.com>

Differentiate stat() failures from non-block-device cases,
so users get accurate errno-based error messages.

Signed-off-by: Sina Abroshan <sina.abroshan@gmail.com>

---
v2:
 - Use tabs instead of spaces
 - Drop unnecessary _() around "%s"
---
 misc-utils/lsblk.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index 3d2bc21a6..6a8769bc7 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -1797,7 +1797,12 @@ static int __process_one_device(struct lsblk_devtree *tr, char *devname, dev_t d
 
 		DBG(DEV, ul_debug("%s: reading alone device", devname));
 
-		if (stat(devname, &st) || !S_ISBLK(st.st_mode)) {
+		if (stat(devname, &st) != 0) {
+			warn("%s", devname);
+			goto leave;
+		}
+
+		if (!S_ISBLK(st.st_mode)) {
 			warnx(_("%s: not a block device"), devname);
 			goto leave;
 		}
-- 
2.34.1

Re: [PATCH] lsblk: improve error reporting for invalid device paths

[Karel Zak]

On Sun, Feb 15, 2026 at 12:04:17PM +0330, sina-abroshan wrote:
>  misc-utils/lsblk.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)

Applied, thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com