From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933682AbbBIRvo (ORCPT ); Mon, 9 Feb 2015 12:51:44 -0500 Received: from terminus.zytor.com ([198.137.202.10]:57820 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932284AbbBIRvn (ORCPT ); Mon, 9 Feb 2015 12:51:43 -0500 Date: Mon, 9 Feb 2015 09:51:32 -0800 From: tip-bot for Jesse Brandeburg Message-ID: Cc: mingo@kernel.org, hpa@zytor.com, jesse.brandeburg@intel.com, yinghai@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org Reply-To: hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org, jesse.brandeburg@intel.com, yinghai@kernel.org, tglx@linutronix.de In-Reply-To: <20150128185739.9689.84588.stgit@jbrandeb-cp2.jf.intel.com> References: <20150128185739.9689.84588.stgit@jbrandeb-cp2.jf.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] genirq: Fix null pointer reference in irq_set_affinity_hint() Git-Commit-ID: 4fe7ffb7e17ca6ad9173b8de35f260c9c8fc2f79 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact 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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 4fe7ffb7e17ca6ad9173b8de35f260c9c8fc2f79 Gitweb: http://git.kernel.org/tip/4fe7ffb7e17ca6ad9173b8de35f260c9c8fc2f79 Author: Jesse Brandeburg AuthorDate: Wed, 28 Jan 2015 10:57:39 -0800 Committer: Ingo Molnar CommitDate: Mon, 9 Feb 2015 18:47:42 +0100 genirq: Fix null pointer reference in irq_set_affinity_hint() The recent set_affinity commit by me introduced some null pointer dereferences on driver unload, because some drivers call this function with a NULL argument. This fixes the issue by just checking for null before setting the affinity mask. Fixes: e2e64a932556 ("genirq: Set initial affinity in irq_set_affinity_hint()") Reported-by: Yinghai Lu Signed-off-by: Jesse Brandeburg CC: netdev@vger.kernel.org Link: http://lkml.kernel.org/r/20150128185739.9689.84588.stgit@jbrandeb-cp2.jf.intel.com Signed-off-by: Ingo Molnar --- kernel/irq/manage.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index f038e58..196a06f 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -244,7 +244,8 @@ int irq_set_affinity_hint(unsigned int irq, const struct cpumask *m) desc->affinity_hint = m; irq_put_desc_unlock(desc, flags); /* set the initial affinity to prevent every interrupt being on CPU0 */ - __irq_set_affinity(irq, m, false); + if (m) + __irq_set_affinity(irq, m, false); return 0; } EXPORT_SYMBOL_GPL(irq_set_affinity_hint);