Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Wed, 25 Jul 2018 07:20:35 -0700
From:   tip-bot for Yi Wang <tipbot@zytor.com>
Message-ID: <tip-6cd0c583b04b2bd9415e07b51b63ab799949dd66@git.kernel.org>
Cc:     mingo@kernel.org, tglx@linutronix.de, jiang.biao2@zte.com.cn,
        peterz@infradead.org, linux-kernel@vger.kernel.org,
        torvalds@linux-foundation.org, wang.yi59@zte.com.cn, hpa@zytor.com
Reply-To: hpa@zytor.com, wang.yi59@zte.com.cn,
          torvalds@linux-foundation.org, linux-kernel@vger.kernel.org,
          jiang.biao2@zte.com.cn, peterz@infradead.org, mingo@kernel.org,
          tglx@linutronix.de
In-Reply-To: <1532319547-33335-1-git-send-email-wang.yi59@zte.com.cn>
References: <1532319547-33335-1-git-send-email-wang.yi59@zte.com.cn>
To:     linux-tip-commits@vger.kernel.org
Subject: [tip:sched/core] sched/topology: Check variable group before
 dereferencing it
Git-Commit-ID: 6cd0c583b04b2bd9415e07b51b63ab799949dd66
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> to get blacklisted from
 these emails
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Commit-ID:  6cd0c583b04b2bd9415e07b51b63ab799949dd66
Gitweb:     https://git.kernel.org/tip/6cd0c583b04b2bd9415e07b51b63ab799949dd66
Author:     Yi Wang <wang.yi59@zte.com.cn>
AuthorDate: Mon, 23 Jul 2018 12:19:07 +0800
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 25 Jul 2018 11:25:07 +0200

sched/topology: Check variable group before dereferencing it

The 'group' variable in sched_domain_debug_one() is not checked
when firstly used in cpumask_test_cpu(cpu, sched_group_span(group)),
but it might be NULL (it is checked later in the following while loop)
and may cause NULL pointer dereference.

We need to check it before using to avoid NULL dereference.

Signed-off-by: Yi Wang <wang.yi59@zte.com.cn>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Jiang Biao <jiang.biao2@zte.com.cn>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: zhong.weidong@zte.com.cn
Link: http://lkml.kernel.org/r/1532319547-33335-1-git-send-email-wang.yi59@zte.com.cn
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 kernel/sched/topology.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
index 05a831427bc7..56a0fed30c0a 100644
--- a/kernel/sched/topology.c
+++ b/kernel/sched/topology.c
@@ -47,7 +47,7 @@ static int sched_domain_debug_one(struct sched_domain *sd, int cpu, int level,
 	if (!cpumask_test_cpu(cpu, sched_domain_span(sd))) {
 		printk(KERN_ERR "ERROR: domain->span does not contain CPU%d\n", cpu);
 	}
-	if (!cpumask_test_cpu(cpu, sched_group_span(group))) {
+	if (group && !cpumask_test_cpu(cpu, sched_group_span(group))) {
 		printk(KERN_ERR "ERROR: domain->groups does not contain CPU%d\n", cpu);
 	}