[PATCH] xfs_scrub: fix null pointer crash in scrub_render_ino_descr

[PATCH] xfs_scrub: fix null pointer crash in scrub_render_ino_descr

[Darrick J. Wong]

From: Darrick J. Wong <djwong@kernel.org>

Starting in Debian 13's libc6, passing a NULL format string to vsnprintf
causes the program to segfault.  Prior to this, the null format string
would be ignored.  Because @format is optional, let's explicitly steer
around the vsnprintf if there is no format string.  Also tidy whitespace
in the comment.

Found by generic/45[34] on Debian 13.

Cc: <linux-xfs@vger.kernel.org> # v6.10.0
Fixes: 9a8b09762f9a52 ("xfs_scrub: use parent pointers when possible to report file operations")
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
---
 scrub/common.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/scrub/common.c b/scrub/common.c
index a50c810a7bd5a1..49f13466d389c1 100644
--- a/scrub/common.c
+++ b/scrub/common.c
@@ -404,7 +404,7 @@ within_range(
 /*
  * Render an inode number into a buffer in a format suitable for use in
  * log messages. The buffer will be filled with:
- * 	"inode <inode number> (<ag number>/<ag inode number>)"
+ *	"inode <inode number> (<ag number>/<ag inode number>)"
  * If the @format argument is non-NULL, it will be rendered into the buffer
  * after the inode representation and a single space.
  */
@@ -506,8 +506,11 @@ scrub_render_ino_descr(
 	pathlen = ret;
 
 report_format:
-	va_start(args, format);
-	pathlen += vsnprintf(buf + pathlen, buflen - pathlen, format, args);
-	va_end(args);
+	if (format) {
+		va_start(args, format);
+		pathlen += vsnprintf(buf + pathlen, buflen - pathlen, format,
+				args);
+		va_end(args);
+	}
 	return pathlen;
 }

Re: [PATCH] xfs_scrub: fix null pointer crash in scrub_render_ino_descr

[Andrey Albershteyn]

On 2025-11-21 08:39:37, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
> 
> Starting in Debian 13's libc6, passing a NULL format string to vsnprintf
> causes the program to segfault.  Prior to this, the null format string
> would be ignored.  Because @format is optional, let's explicitly steer
> around the vsnprintf if there is no format string.  Also tidy whitespace
> in the comment.
> 
> Found by generic/45[34] on Debian 13.
> 
> Cc: <linux-xfs@vger.kernel.org> # v6.10.0
> Fixes: 9a8b09762f9a52 ("xfs_scrub: use parent pointers when possible to report file operations")
> Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
> ---
>  scrub/common.c |   11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/scrub/common.c b/scrub/common.c
> index a50c810a7bd5a1..49f13466d389c1 100644
> --- a/scrub/common.c
> +++ b/scrub/common.c
> @@ -404,7 +404,7 @@ within_range(
>  /*
>   * Render an inode number into a buffer in a format suitable for use in
>   * log messages. The buffer will be filled with:
> - * 	"inode <inode number> (<ag number>/<ag inode number>)"
> + *	"inode <inode number> (<ag number>/<ag inode number>)"
>   * If the @format argument is non-NULL, it will be rendered into the buffer
>   * after the inode representation and a single space.
>   */
> @@ -506,8 +506,11 @@ scrub_render_ino_descr(
>  	pathlen = ret;
>  
>  report_format:
> -	va_start(args, format);
> -	pathlen += vsnprintf(buf + pathlen, buflen - pathlen, format, args);
> -	va_end(args);
> +	if (format) {
> +		va_start(args, format);
> +		pathlen += vsnprintf(buf + pathlen, buflen - pathlen, format,
> +				args);
> +		va_end(args);
> +	}
>  	return pathlen;
>  }
> 

lgtm
Reviewed-by: Andrey Albershteyn <aalbersh@kernel.org>

-- 
- Andrey

Re: [PATCH] xfs_scrub: fix null pointer crash in scrub_render_ino_descr

[Christoph Hellwig]

Looks good:

Reviewed-by: Christoph Hellwig <hch@lst.de>