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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 A9D16C43603 for ; Wed, 4 Dec 2019 18:12:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7DC0720862 for ; Wed, 4 Dec 2019 18:12:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575483162; bh=5jl7WjR50OO6i+g7GO919wc/XN7O/dXxQlD9dBJXDhM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dEpOA9TFU/0NV+vqid8N6KzJ+WoZLgR4/DEPL3dz92uSvQmpxtImliM//e+7hnT09 KAM9XfKD5v9dWDbm5CWIyT2UHksbNwcgQqDCRRqTD8xXjXZK7Wzzzps6hy0gJSofsd s9y4iRtOZleND170RTZrFh9iBQ+1Qgb8HQPrQA3g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730663AbfLDSMl (ORCPT ); Wed, 4 Dec 2019 13:12:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:41306 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731624AbfLDSMh (ORCPT ); Wed, 4 Dec 2019 13:12:37 -0500 Received: from localhost (unknown [217.68.49.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9D4D820674; Wed, 4 Dec 2019 18:12:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575483157; bh=5jl7WjR50OO6i+g7GO919wc/XN7O/dXxQlD9dBJXDhM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s72Wcq9x4Ddc5gopNJZQ4NC1IrDaqtyY1gS70ySexPv33Uj3/MSVhELcyJIXxCHVD ETwznpYTSizz2AIkMOAjvBzrs0H+0EEg+Fbiglo+EXpkTi2KEuIU3tt7ywkAdJGJ7C ksKBGfF7GpF9BUK3Xu1xpIokNlqPpJrVD2rgzsxc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ross Lagerwall , Boris Ostrovsky , Sasha Levin Subject: [PATCH 4.9 038/125] xen/pciback: Check dev_data before using it Date: Wed, 4 Dec 2019 18:55:43 +0100 Message-Id: <20191204175321.291260266@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204175308.377746305@linuxfoundation.org> References: <20191204175308.377746305@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 6331a95691a44..ee5ce9286d613 100644 --- a/drivers/xen/xen-pciback/pci_stub.c +++ b/drivers/xen/xen-pciback/pci_stub.c @@ -106,7 +106,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