Commit fd25438f authored by Sergey Shtylyov's avatar Sergey Shtylyov Committed by Liao Chen
Browse files

genirq/ipi: Fix NULL pointer deref in irq_data_get_affinity_mask() 

mainline inclusion
from mainline-v6.3-rc1
commit feabecaf
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9OZI6

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=feabecaff5902f896531dde90646ca5dfa9d4f7d



--------------------------------

If ipi_send_{mask|single}() is called with an invalid interrupt number, all
the local variables there will be NULL. ipi_send_verify() which is invoked
from these functions does verify its 'data' parameter, resulting in a
kernel oops in irq_data_get_affinity_mask() as the passed NULL pointer gets
dereferenced.

Add a missing NULL pointer check in ipi_send_verify()...

Found by Linux Verification Center (linuxtesting.org) with the SVACE static
analysis tool.

Fixes: 3b8e29a8 ("genirq: Implement ipi_send_mask/single()")
Signed-off-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/b541232d-c2b6-1fe9-79b4-a7129459e4d0@omp.ru


Conflicts:
	kernel/irq/ipi.c
[lc: adjust context]
Signed-off-by: default avatarLiao Chen <liaochen4@huawei.com>
parent 0982dad0

kernel/irq/ipi.c

+6 −2
Original line number Diff line number Diff line
@@ -186,9 +186,9 @@ EXPORT_SYMBOL_GPL(ipi_get_hwirq); 
static int ipi_send_verify(struct irq_chip *chip, struct irq_data *data,

			   const struct cpumask *dest, unsigned int cpu)

{

	struct cpumask *ipimask = irq_data_get_affinity_mask(data);

	struct cpumask *ipimask;



	if (!chip || !ipimask)

	if (!chip || !data)

		return -EINVAL;



	if (!chip->ipi_send_single && !chip->ipi_send_mask)
@@ -197,6 +197,10 @@ static int ipi_send_verify(struct irq_chip *chip, struct irq_data *data, 
	if (cpu >= nr_cpu_ids)

		return -EINVAL;



	ipimask = irq_data_get_affinity_mask(data);

	if (!ipimask)

		return -EINVAL;



	if (dest) {

		if (!cpumask_subset(dest, ipimask))

			return -EINVAL;