From patchwork Fri Nov 2 17:17:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 10665913 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 22D0813B5 for ; Fri, 2 Nov 2018 17:18:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 042922BEC0 for ; Fri, 2 Nov 2018 17:18:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EC9EE2BEEC; Fri, 2 Nov 2018 17:18:46 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 91E302BEC0 for ; Fri, 2 Nov 2018 17:18:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=dMLr1Sg1p0UeDiMK3CtRokWTBjVStap5PEo4ASkSrjs=; b=YNg64/uMjp/pGz pdiYGxcQAjVbU5n39QKCV1UUyj4eynHQqGRxC/+AYepEaAE6s3iNFzixbf6QRvn/A4O/UrOlVbANV 0BNwvkw89Fq/dtUj6nZFs9Y1Znp6wNdGAnD5az+ZR4h2VR2TSl961tZde/laxVL+ZcJ4ADexSSrqy MwyasYOuzvJbkgFyXPaY8qAPdbgUnungwYsSw5+BM71lHnpHRrGdIrUqb79SZd8WVlj9Gweaf5l/m SEKIeT6d9qOvt8ypMZTno5ZFQtM/g1ZjnFkKBcRC1HZnLO/wbz89+NyUQNP/Gcr2sWz+46dWenbi8 /OARmjOImk16HjSzpPRQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gId5n-0002ML-UD; Fri, 02 Nov 2018 17:18:43 +0000 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gId5l-0002Ju-2i for ath10k@lists.infradead.org; Fri, 02 Nov 2018 17:18:42 +0000 Received: by mail-pl1-x643.google.com with SMTP id t6-v6so1301023plo.9 for ; Fri, 02 Nov 2018 10:18:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qddL7HZd/lZK+Srg7fwIVx8jlZhLuoxjkC7Np29U/7Q=; b=SyljX0FvhHDK1Kre7YLubwVo8ngPk+byge563qS3IquXVDihRS/12F7vggTP9CXfjf xU1t1lTPDcObldTrz/zN5s8kOlsTIBaCFhLAoW20i2e7cPy3jQK+BnBOyyORvg5qVTSJ UJip3C+Ho/ZoST0Nr8mQfj9xTgRs0jQnnXiNU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qddL7HZd/lZK+Srg7fwIVx8jlZhLuoxjkC7Np29U/7Q=; b=Z5XpnKIn/7OWR8Hp5ukfFFUwyi6XiuuMCYE246CP7yD7iivT2qG7mvAnxeyM1lcEsC 5qrlEMrH/lZN76rONn+miGGdRwYg4N6r99BTamADPNxmjkEnNBOv/fjMH0YaCrw4sfAF p/ZBD5L3zvo5tWyT4eSRi2DynoM2JIBEib8RQl9AnffPWshcofhkZkDMDMtmxJtx9CZy 6/rzu393zV3Ddt/SQei6dOEV4E0Cu+NrLgBF1oJ7Yuydfoz5MZXiDtLjEit5IH86lPLB 0t29znLOS5YzNZIY8oeCreAQt1iMyyZDy+at7zcu0CuwlJh7UGesnhRMKCNapByX8oTz I8fQ== X-Gm-Message-State: AGRZ1gJTS5iVADZ69ofoQVB5QXKMb7wgV0LbF5hTdgqolFJ8T4m9Cu/r sXHAY6yy7zkGktTwV+c7iZ4WWbu6KjY= X-Google-Smtp-Source: AJdET5eWUGzz3fWsIniTrLX8U7yKATPA2/eBtlWSpIUcgJ66SbfD3yB8ftUcH0I34p1BY4pAglkcFQ== X-Received: by 2002:a17:902:9009:: with SMTP id a9-v6mr12606518plp.134.1541179110162; Fri, 02 Nov 2018 10:18:30 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:1:299d:6b87:5478:d28a]) by smtp.gmail.com with ESMTPSA id d5-v6sm19222675pfo.131.2018.11.02.10.18.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Nov 2018 10:18:28 -0700 (PDT) From: Brian Norris To: ath10k@lists.infradead.org Subject: [PATCH 2/3] ath10k: don't assume this is a PCI dev in generic code Date: Fri, 2 Nov 2018 10:17:48 -0700 Message-Id: <20181102171749.38680-2-briannorris@chromium.org> X-Mailer: git-send-email 2.19.1.930.g4563a0d9d0-goog In-Reply-To: <20181102171749.38680-1-briannorris@chromium.org> References: <20181102171749.38680-1-briannorris@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181102_101841_117481_CE2DD813 X-CRM114-Status: GOOD ( 13.37 ) X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Govind Singh , Brian Norris , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Rakesh Pillai Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Not all devices using this driver are backed by a PCI device, so it's not fair to assume 'to_pci_dev()' is valid. Fortunately, we only were using this to convert straight back to a bare 'device', which means we were only doing no-op pointer arithmetic, and not actually accessing potentially out-of-bounds memory. But this is still bad practice. Just use 'ar->dev' directly, since that's really all we're looking for. Fixes: 209b2a68de76 ("ath10k: add platform regulatory domain support") Signed-off-by: Brian Norris --- drivers/net/wireless/ath/ath10k/mac.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index a1c2801ded10..5c4ee66382d9 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -8313,7 +8313,6 @@ static u32 ath10k_mac_wrdd_get_mcc(struct ath10k *ar, union acpi_object *wrdd) static int ath10k_mac_get_wrdd_regulatory(struct ath10k *ar, u16 *rd) { - struct pci_dev __maybe_unused *pdev = to_pci_dev(ar->dev); acpi_handle root_handle; acpi_handle handle; struct acpi_buffer wrdd = {ACPI_ALLOCATE_BUFFER, NULL}; @@ -8321,7 +8320,7 @@ static int ath10k_mac_get_wrdd_regulatory(struct ath10k *ar, u16 *rd) u32 alpha2_code; char alpha2[3]; - root_handle = ACPI_HANDLE(&pdev->dev); + root_handle = ACPI_HANDLE(ar->dev); if (!root_handle) return -EOPNOTSUPP;