Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4776ae32 authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman
Browse files

xfs: Use scnprintf() for avoiding potential buffer overflow 



commit 17bb60b74124e9491d593e2601e3afe14daa2f57 upstream.

Since snprintf() returns the would-be-output size instead of the
actual output size, the succeeding calls may go beyond the given
buffer limit.  Fix it by replacing with scnprintf().

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Acked-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarChandan Babu R <chandan.babu@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2f55a038

fs/xfs/xfs_stats.c

+5 −5
Original line number Diff line number Diff line
@@ -57,13 +57,13 @@ int xfs_stats_format(struct xfsstats __percpu *stats, char *buf) 
	/* Loop over all stats groups */



	for (i = j = 0; i < ARRAY_SIZE(xstats); i++) {

		len += snprintf(buf + len, PATH_MAX - len, "%s",

		len += scnprintf(buf + len, PATH_MAX - len, "%s",

				xstats[i].desc);

		/* inner loop does each group */

		for (; j < xstats[i].endpoint; j++)

			len += snprintf(buf + len, PATH_MAX - len, " %u",

			len += scnprintf(buf + len, PATH_MAX - len, " %u",

					counter_val(stats, j));

		len += snprintf(buf + len, PATH_MAX - len, "\n");

		len += scnprintf(buf + len, PATH_MAX - len, "\n");

	}

	/* extra precision counters */

	for_each_possible_cpu(i) {
@@ -72,9 +72,9 @@ int xfs_stats_format(struct xfsstats __percpu *stats, char *buf) 
		xs_read_bytes += per_cpu_ptr(stats, i)->s.xs_read_bytes;

	}



	len += snprintf(buf + len, PATH_MAX-len, "xpc %Lu %Lu %Lu\n",

	len += scnprintf(buf + len, PATH_MAX-len, "xpc %Lu %Lu %Lu\n",

			xs_xstrat_bytes, xs_write_bytes, xs_read_bytes);

	len += snprintf(buf + len, PATH_MAX-len, "debug %u\n",

	len += scnprintf(buf + len, PATH_MAX-len, "debug %u\n",

#if defined(DEBUG)

		1);

#else