adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 04:06:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

reiserfs: add locking around error buffer

Browse source 
The formatting of the error buffer is race prone. It uses static buffers
for both formatting and output. While overwriting the error buffer
can product garbled output, overwriting the format buffer with incompatible
% directives can cause crashes.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jeff Mahoney 2009-03-30 14:02:24 -04:00 committed by Linus Torvalds
parent fd7cb031ef
commit 78b6513d28
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs/reiserfs/prints.c
View file

@ -184,7 +184,7 @@ static char *is_there_reiserfs_struct(char *fmt, int *what)
printk ("bad key %lu %lu %lu %lu", key->k_dir_id, key->k_objectid, printk ("bad key %lu %lu %lu %lu", key->k_dir_id, key->k_objectid,
key->k_offset, key->k_uniqueness); key->k_offset, key->k_uniqueness);
*/ */
static DEFINE_SPINLOCK(error_lock);
static void prepare_error_buf(const char *fmt, va_list args) static void prepare_error_buf(const char *fmt, va_list args)
{ {
char *fmt1 = fmt_buf; char *fmt1 = fmt_buf;
@ -192,6 +192,8 @@ static void prepare_error_buf(const char *fmt, va_list args)
char *p = error_buf; char *p = error_buf;
int what; int what;
spin_lock(&error_lock);
strcpy(fmt1, fmt); strcpy(fmt1, fmt);
while ((k = is_there_reiserfs_struct(fmt1, &what)) != NULL) { while ((k = is_there_reiserfs_struct(fmt1, &what)) != NULL) {
@ -237,6 +239,7 @@ static void prepare_error_buf(const char *fmt, va_list args)
fmt1 = k + 2; fmt1 = k + 2;
} }
vsprintf(p, fmt1, args); vsprintf(p, fmt1, args);
spin_unlock(&error_lock);
} }