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;
From:   "Sverdlin, Alexander (Nokia - DE/Ulm)" <alexander.sverdlin@nokia.com>
To:     Marc Zyngier <maz@kernel.org>,
        Thomas Gleixner <tglx@linutronix.de>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Grant Likely <grant.likely@secretlab.ca>
CC:     "Sverdlin, Alexander (Nokia - DE/Ulm)" <alexander.sverdlin@nokia.com>,
        Mark Brown <broonie@opensource.wolfsonmicro.com>,
        Jon Hunter <jonathanh@nvidia.com>,
        "Glavinic-Pecotic, Matija (EXT - DE/Ulm)" 
        <matija.glavinic-pecotic.ext@nokia.com>,
        "Adamski, Krzysztof (Nokia - PL/Wroclaw)" 
        <krzysztof.adamski@nokia.com>,
        "stable@vger.kernel.org" <stable@vger.kernel.org>
Subject: [PATCH 1/3] genirq/irqdomain: Check for existing mapping in
 irq_domain_associate()
Thread-Topic: [PATCH 1/3] genirq/irqdomain: Check for existing mapping in
 irq_domain_associate()
Thread-Index: AQHVaU6fbsvmL4kmNUmeKw2Ifb7zFw==
Date:   Thu, 12 Sep 2019 09:44:07 +0000
Message-ID: <20190912094343.5480-2-alexander.sverdlin@nokia.com>
References: <20190912094343.5480-1-alexander.sverdlin@nokia.com>
In-Reply-To: <20190912094343.5480-1-alexander.sverdlin@nokia.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-messagesentrepresentingtype: 1
x-ms-publictraffictype: Email
x-ms-office365-filtering-correlation-id: edaf5580-a0a9-4ac9-5e02-08d73765c179
x-ms-office365-filtering-ht: Tenant
x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600166)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020);SRVR:AM6PR0702MB3654;
x-ms-traffictypediagnostic: AM6PR0702MB3654:
x-ms-exchange-transport-forked: True
x-microsoft-antispam-prvs: <AM6PR0702MB365414556B6E5CFE7FB4DC4D88B00@AM6PR0702MB3654.eurprd07.prod.outlook.com>
x-ms-oob-tlc-oobclassifiers: OLM:7691;
x-forefront-prvs: 01583E185C
x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(4636009)(376002)(39860400002)(366004)(396003)(136003)(346002)(199004)(189003)(64756008)(2501003)(6116002)(110136005)(5660300002)(53936002)(486006)(66066001)(386003)(6506007)(86362001)(6512007)(102836004)(186003)(26005)(316002)(76176011)(446003)(8676002)(11346002)(476003)(81156014)(2616005)(81166006)(6436002)(50226002)(3846002)(256004)(14444005)(6486002)(54906003)(1076003)(71190400001)(25786009)(66946007)(8936002)(2906002)(66556008)(66446008)(99286004)(4326008)(14454004)(36756003)(52116002)(71200400001)(305945005)(66476007)(478600001)(7736002);DIR:OUT;SFP:1102;SCL:1;SRVR:AM6PR0702MB3654;H:AM6PR0702MB3527.eurprd07.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1;
received-spf: None (protection.outlook.com: nokia.com does not designate
 permitted sender hosts)
x-ms-exchange-senderadcheck: 1
x-microsoft-antispam-message-info: zt+DAR0KpwV+6VWbHDjcHfx0ryjgvpUhydEMFWNVpDYMGcUKz69LgYukVlpzt4J0Uf2JrZIsccKW/GwdlynwRX5sD+lx++Gti7hwyszv0B0sd4UsV7OzyCa3Ml6DQ9mJ2brpOjd+71CJnJOBc2XD+70E4ZzUhe66MKfsFkHvVOGBW50+8xLk00iywEJ5FI0jDoIrpWhSlzz/aBc/wb/fwxWWvpM3c5YqGd5svXU6SMrmIKsQo0Cs+N60AE0RY5r1JEShEDMB7NKSTTCe/cx58kryGo0Sj5kLIZS5WI6zkVfvU7Au4Ks16WyfnzD7KDqpjKMxvjxmF4k+t8GaXk0vHGMSjb73mafnwG7Y3kIabAtfGjrThHUwv3EmS6cInZHfRMSmbD7zyKLkGBJ555UuHYpbgX1cBx0g6SMg+VsBGEA=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: nokia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: edaf5580-a0a9-4ac9-5e02-08d73765c179
X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Sep 2019 09:44:07.5114
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 5d471751-9675-428d-917b-70f44f9630b0
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: svDLqBUDASaJxx9w0XI2HLum7ctvNZVYxlBmtc3Yw+Fs6pf7Us6MYL6YRyY/NSqf4gC/jr6EQHIl3zACh/ATtRkReGbUuqCIy9rMEOI9m6g=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0702MB3654
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Alexander Sverdlin <alexander.sverdlin@nokia.com>

irq_domain_associate() is the only place where irq_find_mapping() can be
used reliably (under irq_domain_mutex) to make a decision if the mapping
shall be created or not. Other calls to irq_find_mapping() (not under
any lock) cannot be used for this purpose and lead to race conditions in
particular inside irq_create_mapping().

Give the callers of irq_domain_associate() an ability to detect existing
domain reliably by examining the return value.

Cc: stable@vger.kernel.org
Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
---
 kernel/irq/irqdomain.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 3078d0e..7bc07b6 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -532,6 +532,7 @@ int irq_domain_associate(struct irq_domain *domain, uns=
igned int virq,
 			 irq_hw_number_t hwirq)
 {
 	struct irq_data *irq_data =3D irq_get_irq_data(virq);
+	unsigned int eirq;
 	int ret;
=20
 	if (WARN(hwirq >=3D domain->hwirq_max,
@@ -543,6 +544,16 @@ int irq_domain_associate(struct irq_domain *domain, un=
signed int virq,
 		return -EINVAL;
=20
 	mutex_lock(&irq_domain_mutex);
+
+	/* Check if mapping already exists */
+	eirq =3D irq_find_mapping(domain, hwirq);
+	if (eirq) {
+		mutex_unlock(&irq_domain_mutex);
+		pr_debug("%s: conflicting mapping for hwirq 0x%x\n",
+			 domain->name, (int)hwirq);
+		return -EBUSY;
+	}
+
 	irq_data->hwirq =3D hwirq;
 	irq_data->domain =3D domain;
 	if (domain->ops->map) {
--=20
2.4.6