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,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 C97D5C43603 for ; Wed, 11 Dec 2019 15:20:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9ACD0208C3 for ; Wed, 11 Dec 2019 15:20:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077638; bh=1xSY9jCPlfXG4Gzkm4kdzMo4hdl0dW8Kuh9oik0A7+I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bZMCsfk+JM2ZuXqnSfwalKgKqLKv+K8lzP9DIIxcGlGb/oiU0Ux+PWKGlsUPcbka6 Zx3dxTOnBe049RO/m9NlwfpaZNn2Q59i+KmWfYOHcgsHdIvR7ghrfiwuBpD+V1KPB1 dc2V8A7KB5xicAFFZDwnXH2Pk0MdMdTLlIJULb0w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732214AbfLKPUh (ORCPT ); Wed, 11 Dec 2019 10:20:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:49984 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732348AbfLKPUe (ORCPT ); Wed, 11 Dec 2019 10:20:34 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 7CA8A22527; Wed, 11 Dec 2019 15:20:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077634; bh=1xSY9jCPlfXG4Gzkm4kdzMo4hdl0dW8Kuh9oik0A7+I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y5fcwWboaxKmYSc6NtrAQIYmB1dsFnOaDujt/Jjkk74kjsJcu9UuTfVtgW0WGCOy3 SDAGS888LXtFnWcM6xsp5OJ0tYJj3d9czVx6RAUNNPzFcrgjBJEp8J3aFAJg+8cfEG Au+1LgcdBJ+PBuZ15yfhNDaQukbfP1NRXFj5UAAM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bruce Allan , Anirudh Venkataramanan , Andrew Bowers , Jeff Kirsher , Sasha Levin Subject: [PATCH 4.19 074/243] ice: Fix possible NULL pointer de-reference Date: Wed, 11 Dec 2019 16:03:56 +0100 Message-Id: <20191211150344.096155673@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191211150339.185439726@linuxfoundation.org> References: <20191211150339.185439726@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: Bruce Allan [ Upstream commit f25dad19ba70f7cc135da78ec013325042cd8c52 ] A recent update to smatch is causing it to report the error "we previously assumed 'm_entry->vsi_list_info' could be null". Fix that. Signed-off-by: Bruce Allan Signed-off-by: Anirudh Venkataramanan Tested-by: Andrew Bowers Signed-off-by: Jeff Kirsher Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/ice/ice_switch.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c index 4012adbab0112..1bfc59dff51f7 100644 --- a/drivers/net/ethernet/intel/ice/ice_switch.c +++ b/drivers/net/ethernet/intel/ice/ice_switch.c @@ -1023,6 +1023,9 @@ ice_handle_vsi_list_mgmt(struct ice_hw *hw, u16 vsi_id = new_fltr->fwd_id.vsi_id; enum ice_adminq_opc opcode; + if (!m_entry->vsi_list_info) + return ICE_ERR_CFG; + /* A rule already exists with the new VSI being added */ if (test_bit(vsi_id, m_entry->vsi_list_info->vsi_map)) return 0; -- 2.20.1