pstore/ram: Fix possible NULL dereference

We can dereference 'cxt->cprz' if console and dump logging are disabled
(which is unlikely, but still possible to do). This patch fixes the issue
by changing the code so that we don't dereference przs at all, we can
just calculate bufsize from console_size and record_size values.

Plus, while at it, the patch improves the buffer size calculation.

After Kay's printk rework, we know the optimal buffer size for console
logging -- it is LOG_LINE_MAX (defined privately in printk.c). Previously,
if only console logging was enabled, we would allocate unnecessary large
buffer in pstore, while we only need LOG_LINE_MAX. (Pstore console logging
is still capable of handling buffers > LOG_LINE_MAX, it will just do
multiple calls to psinfo->write).

Note that I don't export the constant, since we will do even a better
thing soon: we will switch console logging to a new write_buf API, which
will eliminate the need for the additional buffer; and so we won't need
the constant.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Acked-by: Kees Cook <keescook@chromium.org>

diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 0b311bc18916ab137c31d59aa2228c71a2a285c7..bcd1bbd425985e0848ab4144f117c8432d9ee26e 100644 (file)
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -414,13 +414,14 @@ static int __devinit ramoops_probe(struct platform_device *pdev)
 
        cxt->pstore.data = cxt;
        /*
-        * Console can handle any buffer size, so prefer dumps buffer
-        * size since usually it is smaller.
+        * Console can handle any buffer size, so prefer LOG_LINE_MAX. If we
+        * have to handle dumps, we must have at least record_size buffer. And
+        * for ftrace, bufsize is irrelevant (if bufsize is 0, buf will be
+        * ZERO_SIZE_PTR).
         */
-       if (cxt->przs)
-               cxt->pstore.bufsize = cxt->przs[0]->buffer_size;
-       else
-               cxt->pstore.bufsize = cxt->cprz->buffer_size;
+       if (cxt->console_size)
+               cxt->pstore.bufsize = 1024; /* LOG_LINE_MAX */
+       cxt->pstore.bufsize = max(cxt->record_size, cxt->pstore.bufsize);
        cxt->pstore.buf = kmalloc(cxt->pstore.bufsize, GFP_KERNEL);
        spin_lock_init(&cxt->pstore.buf_lock);
        if (!cxt->pstore.buf) {