linux-kernel - [PATCH 4/6] Fixup tangox_dma_sbox

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]

Date:   Wed, 23 Nov 2016 17:51:53 +0100
From:   Marc Gonzalez <marc_gonzalez@...madesigns.com>
To:     Mans Rullgard <mans@...sr.com>, Vinod Koul <vinod.koul@...el.com>
CC:     <dmaengine@...r.kernel.org>, LKML <linux-kernel@...r.kernel.org>,
        Sebastian Frias <sf84@...oste.net>, Mason <slash.tmp@...e.fr>,
        Thibaud Cornic <thibaud_cornic@...madesigns.com>
Subject: [PATCH 4/6] Fixup tangox_dma_sbox_map

---
 drivers/dma/tango-dma.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/dma/tango-dma.c b/drivers/dma/tango-dma.c
index 6a32d234ffb0..5250c053a7b9 100644
--- a/drivers/dma/tango-dma.c
+++ b/drivers/dma/tango-dma.c
@@ -108,11 +108,11 @@ static struct tangox_dma_desc *tangox_dma_alloc_desc(unsigned int num_sgs)
 
 static void tangox_dma_sbox_map(struct tangox_dma_device *dev, int src, int dst)
 {
-	void __iomem *addr = dev->sbox_base + 8;
+	void __iomem *addr = dev->sbox_base + SBOX_ROUTE;
 	int shift = (dst - 1) * 4;
 
-	if (shift > 31) {
-		addr += 4;
+	if (dst > 8) {
+		addr = dev->sbox_base + SBOX_ROUTE2;
 		shift -= 32;
 	}
 
-- 
2.9.0