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

Commit dc74eaad authored by Lachlan McIlroy's avatar Lachlan McIlroy Committed by Tim Shimmin
Browse files

[XFS] Prevent buffer overrun in cmn_err(). 



The message buffer used by cmn_err() is only 256 bytes and some CXFS
messages were exceeding this length. Since we were using vsprintf() and
not checking for buffer overruns we were clobbering memory beyond the
buffer. The size of the buffer has been increased to 1024 bytes so we can
capture these larger messages and we are now using vsnprintf() to prevent
overrunning the buffer size.

SGI-PV: 958599
SGI-Modid: xfs-linux-melb:xfs-kern:27561a

Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
Signed-off-by: default avatarGeoffrey Wehrman <gwehrman@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 585e6d88

fs/xfs/support/debug.c

+13 −10
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include "debug.h"

#include "debug.h"

#include "spin.h"

#include "spin.h"





static char		message[256];	/* keep it off the stack */

static char		message[1024];	/* keep it off the stack */

static DEFINE_SPINLOCK(xfs_err_lock);

static DEFINE_SPINLOCK(xfs_err_lock);





/* Translate from CE_FOO to KERN_FOO, err_level(CE_FOO) == KERN_FOO */

/* Translate from CE_FOO to KERN_FOO, err_level(CE_FOO) == KERN_FOO */
@@ -44,13 +44,14 @@ cmn_err(register int level, char *fmt, ...) 
	spin_lock_irqsave(&xfs_err_lock,flags);

	spin_lock_irqsave(&xfs_err_lock,flags);

	va_start(ap, fmt);

	va_start(ap, fmt);

	if (*fmt == '!') fp++;

	if (*fmt == '!') fp++;

	len = vsprintf(message, fp, ap);

	len = vsnprintf(message, sizeof(message), fp, ap);

	if (level != CE_DEBUG && message[len-1] != '\n')

	if (len >= sizeof(message))

		strcat(message, "\n");

		len = sizeof(message) - 1;

	printk("%s%s", err_level[level], message);

	if (message[len-1] == '\n')

		message[len-1] = 0;

	printk("%s%s\n", err_level[level], message);

	va_end(ap);

	va_end(ap);

	spin_unlock_irqrestore(&xfs_err_lock,flags);

	spin_unlock_irqrestore(&xfs_err_lock,flags);



	BUG_ON(level == CE_PANIC);

	BUG_ON(level == CE_PANIC);

}

}
@@ -64,11 +65,13 @@ icmn_err(register int level, char *fmt, va_list ap) 
	if(level > XFS_MAX_ERR_LEVEL)

	if(level > XFS_MAX_ERR_LEVEL)

		level = XFS_MAX_ERR_LEVEL;

		level = XFS_MAX_ERR_LEVEL;

	spin_lock_irqsave(&xfs_err_lock,flags);

	spin_lock_irqsave(&xfs_err_lock,flags);

	len = vsprintf(message, fmt, ap);

	len = vsnprintf(message, sizeof(message), fmt, ap);

	if (level != CE_DEBUG && message[len-1] != '\n')

	if (len >= sizeof(message))

		strcat(message, "\n");

		len = sizeof(message) - 1;

	if (message[len-1] == '\n')

		message[len-1] = 0;

	printk("%s%s\n", err_level[level], message);

	spin_unlock_irqrestore(&xfs_err_lock,flags);

	spin_unlock_irqrestore(&xfs_err_lock,flags);

	printk("%s%s", err_level[level], message);

	BUG_ON(level == CE_PANIC);

	BUG_ON(level == CE_PANIC);

}

}