From patchwork Mon Nov 27 15:49:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Cassel X-Patchwork-Id: 10077165 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 363AD6028E for ; Mon, 27 Nov 2017 15:50:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 289B228AB0 for ; Mon, 27 Nov 2017 15:50:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1CC0928EC5; Mon, 27 Nov 2017 15:50:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D3BF728AB0 for ; Mon, 27 Nov 2017 15:50:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752920AbdK0PuW (ORCPT ); Mon, 27 Nov 2017 10:50:22 -0500 Received: from bastet.se.axis.com ([195.60.68.11]:40346 "EHLO bastet.se.axis.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752844AbdK0PuV (ORCPT ); Mon, 27 Nov 2017 10:50:21 -0500 Received: from localhost (localhost [127.0.0.1]) by bastet.se.axis.com (Postfix) with ESMTP id EE8251830E; Mon, 27 Nov 2017 16:50:19 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at bastet.se.axis.com Received: from bastet.se.axis.com ([IPv6:::ffff:127.0.0.1]) by localhost (bastet.se.axis.com [::ffff:127.0.0.1]) (amavisd-new, port 10024) with LMTP id xqTGqgteLVfY; Mon, 27 Nov 2017 16:50:19 +0100 (CET) Received: from boulder02.se.axis.com (boulder02.se.axis.com [10.0.8.16]) by bastet.se.axis.com (Postfix) with ESMTPS id 309C8182DC; Mon, 27 Nov 2017 16:50:19 +0100 (CET) Received: from boulder02.se.axis.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1DF301A075; Mon, 27 Nov 2017 16:50:19 +0100 (CET) Received: from boulder02.se.axis.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 12BB51A063; Mon, 27 Nov 2017 16:50:19 +0100 (CET) Received: from thoth.se.axis.com (unknown [10.0.2.173]) by boulder02.se.axis.com (Postfix) with ESMTP; Mon, 27 Nov 2017 16:50:19 +0100 (CET) Received: from lnxartpec1.se.axis.com (lnxartpec1.se.axis.com [10.88.4.10]) by thoth.se.axis.com (Postfix) with ESMTP id 067D91B73; Mon, 27 Nov 2017 16:50:19 +0100 (CET) Received: by lnxartpec1.se.axis.com (Postfix, from userid 20283) id 01C1040102; Mon, 27 Nov 2017 16:50:18 +0100 (CET) From: Niklas Cassel To: Kishon Vijay Abraham I , Lorenzo Pieralisi , Bjorn Helgaas Cc: Niklas Cassel , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/3] PCI: endpoint: Fix find_first_zero_bit() usage Date: Mon, 27 Nov 2017 16:49:55 +0100 Message-Id: <20171127154955.22214-4-niklas.cassel@axis.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171127154955.22214-1-niklas.cassel@axis.com> References: <20171127154955.22214-1-niklas.cassel@axis.com> X-TM-AS-GCONF: 00 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP find_first_zero_bit()'s parameter 'size' is defined in bits, not in bytes. Calling find_first_zero_bit() with the wrong size unit will lead to insidious bugs. Fix this by calling find_first_zero_bit() with size BITS_PER_LONG, rather than sizeof(). Also add proper error handling for find_first_zero_bit(), since this was missing. Fixes: d74679911610 ("PCI: endpoint: Introduce configfs entry for configuring EP functions") Signed-off-by: Niklas Cassel Acked-by: Lorenzo Pieralisi --- drivers/pci/endpoint/pci-ep-cfs.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/pci/endpoint/pci-ep-cfs.c b/drivers/pci/endpoint/pci-ep-cfs.c index e1f5adc9e113..0a22a7976580 100644 --- a/drivers/pci/endpoint/pci-ep-cfs.c +++ b/drivers/pci/endpoint/pci-ep-cfs.c @@ -109,7 +109,12 @@ static int pci_epc_epf_link(struct config_item *epc_item, return ret; func_no = find_first_zero_bit(&epc_group->function_num_map, - sizeof(epc_group->function_num_map)); + BITS_PER_LONG); + if (func_no >= BITS_PER_LONG) { + ret = -EINVAL; + dev_err(&epc->dev, "failed to link endpoint function device\n"); + goto err_func_no; + } set_bit(func_no, &epc_group->function_num_map); epf->func_no = func_no; @@ -121,6 +126,7 @@ static int pci_epc_epf_link(struct config_item *epc_item, err_epf_bind: clear_bit(func_no, &epc_group->function_num_map); +err_func_no: pci_epc_remove_epf(epc, epf); return ret;