From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4DAEFC432C0 for ; Fri, 22 Nov 2019 06:13:44 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1EC142071B for ; Fri, 22 Nov 2019 06:13:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="e9yxVGV6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1EC142071B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iY2C8-0003q6-6t; Fri, 22 Nov 2019 06:13:28 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iY2C7-0003q1-Js for xen-devel@lists.xenproject.org; Fri, 22 Nov 2019 06:13:27 +0000 X-Inumbo-ID: 3233f800-0cef-11ea-a345-12813bfff9fa Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 3233f800-0cef-11ea-a345-12813bfff9fa; Fri, 22 Nov 2019 06:13:27 +0000 (UTC) Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C14B820715; Fri, 22 Nov 2019 06:13:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574403206; bh=2GEVP+XTklP07ZP2wt7K2gymaaWsRpRrMdsz26QNACk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e9yxVGV6etFCcrlE0QxGvJuFO2sExIgiIyPSFvk3K3sxHexPVSimmdcgBt3LK0ucv NReO5d5DylOUU2LJ+bXw0qFC1YiYscIanvS771/6JomSPnpF+6iaCiS901mhQzDnt3 r+glLUl53UWw9bXdliw4FXzhdRY8i1gSFDrdzjqM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Date: Fri, 22 Nov 2019 01:12:15 -0500 Message-Id: <20191122061301.4947-21-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191122061301.4947-1-sashal@kernel.org> References: <20191122061301.4947-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Subject: [Xen-devel] [PATCH AUTOSEL 4.4 22/68] xen/pciback: Check dev_data before using it X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , Ross Lagerwall , Boris Ostrovsky , xen-devel@lists.xenproject.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" RnJvbTogUm9zcyBMYWdlcndhbGwgPHJvc3MubGFnZXJ3YWxsQGNpdHJpeC5jb20+CgpbIFVwc3Ry ZWFtIGNvbW1pdCAxNjY5OTA3ZTNkMWFiZmEzZjc1ODZlMmQ1NWRiYmMxMTdiNWFkYmEyIF0KCklm IHBjaXN0dWJfaW5pdF9kZXZpY2UgZmFpbHMsIHRoZSByZWxlYXNlIGZ1bmN0aW9uIHdpbGwgYmUg Y2FsbGVkIHdpdGgKZGV2X2RhdGEgc2V0IHRvIE5VTEwuICBDaGVjayBpdCBiZWZvcmUgdXNpbmcg aXQgdG8gYXZvaWQgYSBOVUxMIHBvaW50ZXIKZGVyZWZlcmVuY2UuCgpTaWduZWQtb2ZmLWJ5OiBS b3NzIExhZ2Vyd2FsbCA8cm9zcy5sYWdlcndhbGxAY2l0cml4LmNvbT4KUmV2aWV3ZWQtYnk6IEJv cmlzIE9zdHJvdnNreSA8Ym9yaXMub3N0cm92c2t5QG9yYWNsZS5jb20+ClNpZ25lZC1vZmYtYnk6 IEJvcmlzIE9zdHJvdnNreSA8Ym9yaXMub3N0cm92c2t5QG9yYWNsZS5jb20+ClNpZ25lZC1vZmYt Ynk6IFNhc2hhIExldmluIDxzYXNoYWxAa2VybmVsLm9yZz4KLS0tCiBkcml2ZXJzL3hlbi94ZW4t cGNpYmFjay9wY2lfc3R1Yi5jIHwgMyArKy0KIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMo KyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3hlbi94ZW4tcGNpYmFjay9w Y2lfc3R1Yi5jIGIvZHJpdmVycy94ZW4veGVuLXBjaWJhY2svcGNpX3N0dWIuYwppbmRleCAyNThi N2MzMjU2NDk5Li40N2M2ZGY1M2NhYmZiIDEwMDY0NAotLS0gYS9kcml2ZXJzL3hlbi94ZW4tcGNp YmFjay9wY2lfc3R1Yi5jCisrKyBiL2RyaXZlcnMveGVuL3hlbi1wY2liYWNrL3BjaV9zdHViLmMK QEAgLTEwNCw3ICsxMDQsOCBAQCBzdGF0aWMgdm9pZCBwY2lzdHViX2RldmljZV9yZWxlYXNlKHN0 cnVjdCBrcmVmICprcmVmKQogCSAqIGlzIGNhbGxlZCBmcm9tICJ1bmJpbmQiIHdoaWNoIHRha2Vz IGEgZGV2aWNlX2xvY2sgbXV0ZXguCiAJICovCiAJX19wY2lfcmVzZXRfZnVuY3Rpb25fbG9ja2Vk KGRldik7Ci0JaWYgKHBjaV9sb2FkX2FuZF9mcmVlX3NhdmVkX3N0YXRlKGRldiwgJmRldl9kYXRh LT5wY2lfc2F2ZWRfc3RhdGUpKQorCWlmIChkZXZfZGF0YSAmJgorCSAgICBwY2lfbG9hZF9hbmRf ZnJlZV9zYXZlZF9zdGF0ZShkZXYsICZkZXZfZGF0YS0+cGNpX3NhdmVkX3N0YXRlKSkKIAkJZGV2 X2luZm8oJmRldi0+ZGV2LCAiQ291bGQgbm90IHJlbG9hZCBQQ0kgc3RhdGVcbiIpOwogCWVsc2UK IAkJcGNpX3Jlc3RvcmVfc3RhdGUoZGV2KTsKLS0gCjIuMjAuMQoKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVu LWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcv bWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E368C432C0 for ; Fri, 22 Nov 2019 06:17:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1B99720707 for ; Fri, 22 Nov 2019 06:17:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574403461; bh=2GEVP+XTklP07ZP2wt7K2gymaaWsRpRrMdsz26QNACk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HvyYwHjSMImx3QjiP9E1G93s7xoMrpOPiSBpYHtIFbKSEpzXTfk2HrKO3PAQq4/7U t4TSVUl0fjOzCfkI/HClBag/oPovMUjVFgqmnWJ5OCl7X3ssEB7/LWQ5oyUQw8IXd0 mzCjl6JUTq79FtjYY70RASrwEOW8SJ8vWCWox2Vo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729664AbfKVGRg (ORCPT ); Fri, 22 Nov 2019 01:17:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:50674 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729269AbfKVGN0 (ORCPT ); Fri, 22 Nov 2019 01:13:26 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C14B820715; Fri, 22 Nov 2019 06:13:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574403206; bh=2GEVP+XTklP07ZP2wt7K2gymaaWsRpRrMdsz26QNACk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e9yxVGV6etFCcrlE0QxGvJuFO2sExIgiIyPSFvk3K3sxHexPVSimmdcgBt3LK0ucv NReO5d5DylOUU2LJ+bXw0qFC1YiYscIanvS771/6JomSPnpF+6iaCiS901mhQzDnt3 r+glLUl53UWw9bXdliw4FXzhdRY8i1gSFDrdzjqM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ross Lagerwall , Boris Ostrovsky , Sasha Levin , xen-devel@lists.xenproject.org Subject: [PATCH AUTOSEL 4.4 22/68] xen/pciback: Check dev_data before using it Date: Fri, 22 Nov 2019 01:12:15 -0500 Message-Id: <20191122061301.4947-21-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191122061301.4947-1-sashal@kernel.org> References: <20191122061301.4947-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ross Lagerwall [ Upstream commit 1669907e3d1abfa3f7586e2d55dbbc117b5adba2 ] If pcistub_init_device fails, the release function will be called with dev_data set to NULL. Check it before using it to avoid a NULL pointer dereference. Signed-off-by: Ross Lagerwall Reviewed-by: Boris Ostrovsky Signed-off-by: Boris Ostrovsky Signed-off-by: Sasha Levin --- drivers/xen/xen-pciback/pci_stub.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/xen/xen-pciback/pci_stub.c b/drivers/xen/xen-pciback/pci_stub.c index 258b7c3256499..47c6df53cabfb 100644 --- a/drivers/xen/xen-pciback/pci_stub.c +++ b/drivers/xen/xen-pciback/pci_stub.c @@ -104,7 +104,8 @@ static void pcistub_device_release(struct kref *kref) * is called from "unbind" which takes a device_lock mutex. */ __pci_reset_function_locked(dev); - if (pci_load_and_free_saved_state(dev, &dev_data->pci_saved_state)) + if (dev_data && + pci_load_and_free_saved_state(dev, &dev_data->pci_saved_state)) dev_info(&dev->dev, "Could not reload PCI state\n"); else pci_restore_state(dev); -- 2.20.1