]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
reiserfs: make sure va_end() is always called after va_start().
authorJesper Juhl <jj@chaosbits.net>
Thu, 13 Jan 2011 01:00:27 +0000 (17:00 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Jan 2011 16:03:15 +0000 (08:03 -0800)
A call to va_start() must always be followed by a call to va_end() in the
same function.  In fs/reiserfs/prints.c::print_block() this is not always
the case.  If 'bh' is NULL we'll return without calling va_end().

One could add a call to va_end() before the 'return' statement, but it's
nicer to just move the call to va_start() after the test for 'bh' being
NULL.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Acked-by: Edward Shishkin <edward.shishkin@gmail.com>
Cc: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/reiserfs/prints.c

index adbc6f538515e15f7d7982d97ab1d3fb30728551..45de98b5946626f1f82c4386c9ad4d91ec163899 100644 (file)
@@ -586,13 +586,13 @@ void print_block(struct buffer_head *bh, ...)     //int print_mode, int first, int l
        va_list args;
        int mode, first, last;
 
-       va_start(args, bh);
-
        if (!bh) {
                printk("print_block: buffer is NULL\n");
                return;
        }
 
+       va_start(args, bh);
+
        mode = va_arg(args, int);
        first = va_arg(args, int);
        last = va_arg(args, int);