linux-kernel - [tip:irq/urgent] irqchip/atmel-aic: Fix wrong bit operation for IRQ priority

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-49f34134aea74f19ca016f055d25ee55ec359dee@git.kernel.org>
Date:	Wed, 27 Jan 2016 03:57:31 -0800
From:	tip-bot for Milo Kim <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	nicolas.ferre@...el.com, milo.kim@...com, mingo@...nel.org,
	linux-kernel@...r.kernel.org, jason@...edaemon.net, hpa@...or.com,
	tglx@...utronix.de, boris.brezillon@...e-electrons.com,
	marc.zyngier@....com, ludovic.desroches@...el.com
Subject: [tip:irq/urgent] irqchip/atmel-aic:
  Fix wrong bit operation for IRQ priority

Commit-ID:  49f34134aea74f19ca016f055d25ee55ec359dee
Gitweb:     http://git.kernel.org/tip/49f34134aea74f19ca016f055d25ee55ec359dee
Author:     Milo Kim <milo.kim@...com>
AuthorDate: Wed, 13 Jan 2016 16:19:50 +0900
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Wed, 27 Jan 2016 12:54:33 +0100

irqchip/atmel-aic: Fix wrong bit operation for IRQ priority

Atmel AIC has common structure for SMR (Source Mode Register).

  bit[6:5] Interrupt source type
  bit[2:0] Priority level
  Other bits are unused.

To update new priority value, bit[2:0] should be cleared first and then
new priority level can be written. However, aic_common_set_priority()
helper clears source type bits instead of priority bits.
This patch fixes wrong mask bit operation.

Fixes: b1479ebb7720 "irqchip: atmel-aic: Add atmel AIC/AIC5 drivers"
Signed-off-by: Milo Kim <milo.kim@...com>
Acked-by: Boris Brezillon <boris.brezillon@...e-electrons.com>
Cc: Jason Cooper <jason@...edaemon.net>
Cc: Marc Zyngier <marc.zyngier@....com>
Cc: Ludovic Desroches <ludovic.desroches@...el.com>
Cc: Nicholas Ferre <nicolas.ferre@...el.com>
Cc: stable@...r.kernel.org #v3.17+
Link: http://lkml.kernel.org/r/1452669592-3401-2-git-send-email-milo.kim@ti.com
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
 drivers/irqchip/irq-atmel-aic-common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-atmel-aic-common.c b/drivers/irqchip/irq-atmel-aic-common.c
index b12a5d5..37199b9 100644
--- a/drivers/irqchip/irq-atmel-aic-common.c
+++ b/drivers/irqchip/irq-atmel-aic-common.c
@@ -86,7 +86,7 @@ int aic_common_set_priority(int priority, unsigned *val)
 	    priority > AT91_AIC_IRQ_MAX_PRIORITY)
 		return -EINVAL;
 
-	*val &= AT91_AIC_PRIOR;
+	*val &= ~AT91_AIC_PRIOR;
 	*val |= priority;
 
 	return 0;