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:   Thu, 17 Jan 2019 15:45:56 -0800
From:   tip-bot for Huacai Chen <tipbot@zytor.com>
Message-ID: <tip-12fee4cd5be2c4a73cc13d7ad76eb2d2feda8a71@git.kernel.org>
Cc:     hpa@zytor.com, chenhc@lemote.com, zhangfx@lemote.com,
        douliyangs@gmail.com, tglx@linutronix.de, wuzhangjin@gmail.com,
        chenhuacai@gmail.com, linux-kernel@vger.kernel.org,
        mingo@kernel.org
Reply-To: chenhuacai@gmail.com, wuzhangjin@gmail.com, tglx@linutronix.de,
          mingo@kernel.org, linux-kernel@vger.kernel.org,
          chenhc@lemote.com, hpa@zytor.com, zhangfx@lemote.com,
          douliyangs@gmail.com
In-Reply-To: <1547694009-16261-1-git-send-email-chenhc@lemote.com>
References: <1547694009-16261-1-git-send-email-chenhc@lemote.com>
To:     linux-tip-commits@vger.kernel.org
Subject: [tip:irq/urgent] genirq/irqdesc: Fix double increment in
 alloc_descs()
Git-Commit-ID: 12fee4cd5be2c4a73cc13d7ad76eb2d2feda8a71
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:  12fee4cd5be2c4a73cc13d7ad76eb2d2feda8a71
Gitweb:     https://git.kernel.org/tip/12fee4cd5be2c4a73cc13d7ad76eb2d2feda8a71
Author:     Huacai Chen <chenhc@lemote.com>
AuthorDate: Thu, 17 Jan 2019 11:00:09 +0800
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Fri, 18 Jan 2019 00:43:09 +0100

genirq/irqdesc: Fix double increment in alloc_descs()

The recent rework of alloc_descs() introduced a double increment of the
loop counter. As a consequence only every second affinity mask is
validated.

Remove it.

[ tglx: Massaged changelog ]

Fixes: c410abbbacb9 ("genirq/affinity: Add is_managed to struct irq_affinity_desc")
Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Fuxin Zhang <zhangfx@lemote.com>
Cc: Zhangjin Wu <wuzhangjin@gmail.com>
Cc: Huacai Chen <chenhuacai@gmail.com>
Cc: Dou Liyang <douliyangs@gmail.com>
Link: https://lkml.kernel.org/r/1547694009-16261-1-git-send-email-chenhc@lemote.com

---
 kernel/irq/irqdesc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c
index ee062b7939d3..ef8ad36cadcf 100644
--- a/kernel/irq/irqdesc.c
+++ b/kernel/irq/irqdesc.c
@@ -457,7 +457,7 @@ static int alloc_descs(unsigned int start, unsigned int cnt, int node,
 
 	/* Validate affinity mask(s) */
 	if (affinity) {
-		for (i = 0; i < cnt; i++, i++) {
+		for (i = 0; i < cnt; i++) {
 			if (cpumask_empty(&affinity[i].mask))
 				return -EINVAL;
 		}