mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: tip-bot for James Custer <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: hpa@zytor.com, jcuster@sgi.com, tglx@linutronix.de, rja@sgi.com,
	mingo@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip:x86/uv] x86: UV BAU: Avoid NULL pointer reference in ptc_seq_show
Date: Mon, 3 Nov 2014 04:51:33 -0800	[thread overview]
Message-ID: <tip-fa2a79ce6aef5de35a4d50487da35deb6b634944@git.kernel.org> (raw)
In-Reply-To: <1414952199-185319-2-git-send-email-jcuster@sgi.com>

Commit-ID:  fa2a79ce6aef5de35a4d50487da35deb6b634944
Gitweb:     http://git.kernel.org/tip/fa2a79ce6aef5de35a4d50487da35deb6b634944
Author:     James Custer <jcuster@sgi.com>
AuthorDate: Sun, 2 Nov 2014 12:16:39 -0600
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Mon, 3 Nov 2014 13:49:24 +0100

x86: UV BAU: Avoid NULL pointer reference in ptc_seq_show

In init_per_cpu(), when get_cpu_topology() fails, init_per_cpu_tunables()
is not called afterwards. This means that bau_control->statp is NULL.
If a user then reads /proc/sgi_uv/ptc_statistics ptc_seq_show() references
a NULL pointer. Therefore, since uv_bau_init calls set_bau_off when
init_per_cpu() fails, we add code that detects when the bau is off in
ptc_seq_show() to avoid referencing a NULL pointer.

Signed-off-by: James Custer <jcuster@sgi.com>
Cc: Russ Anderson <rja@sgi.com>
Link: http://lkml.kernel.org/r/1414952199-185319-2-git-send-email-jcuster@sgi.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/x86/platform/uv/tlb_uv.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
index 3968d67..570b1b1 100644
--- a/arch/x86/platform/uv/tlb_uv.c
+++ b/arch/x86/platform/uv/tlb_uv.c
@@ -1384,6 +1384,10 @@ static int ptc_seq_show(struct seq_file *file, void *data)
 	}
 	if (cpu < num_possible_cpus() && cpu_online(cpu)) {
 		bcp = &per_cpu(bau_control, cpu);
+		if (bcp->nobau) {
+			seq_printf(file, "cpu %d bau disabled\n", cpu);
+			return 0;
+		}
 		stat = bcp->statp;
 		/* source side statistics */
 		seq_printf(file,

  reply	other threads:[~2014-11-03 12:51 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-02 18:16 [PATCH 1/2] x86: UV BAU Increase maximum CPUs per socket/hub James Custer
2014-11-02 18:16 ` [PATCH 2/2] x86: UV BAU Avoid NULL pointer reference in ptc_seq_show James Custer
2014-11-03 12:51   ` tip-bot for James Custer [this message]
2014-11-03 12:51 ` [tip:x86/uv] x86: UV BAU: Increase maximum CPUs per socket/hub tip-bot for James Custer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-fa2a79ce6aef5de35a4d50487da35deb6b634944@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=hpa@zytor.com \
    --cc=jcuster@sgi.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=rja@sgi.com \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome