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 17B40C41514 for ; Wed, 14 Aug 2019 17:21:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D53BD206C2 for ; Wed, 14 Aug 2019 17:21:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565803268; bh=sXqJwjOchb0CiV97OvPL1wdjoasWXfavi5nSr1y8FQ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Eaak0KtwazwoWTO6dlqfsNzESIdbGgGoEARRddmnugiUuwicjX7GUyqKDtX1xTBbY Ps6KGPT9QbdqcukiOVutVq3IXk4Lri3Rb9dh/LxG+6Vda3YPmQcc8v6KcYAMNfapho r+xdmAUliZzNXq6CdIeHb5NDANuy5Fq7YbIXOHFA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728350AbfHNRKO (ORCPT ); Wed, 14 Aug 2019 13:10:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:60810 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730099AbfHNRKG (ORCPT ); Wed, 14 Aug 2019 13:10:06 -0400 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 45AB5208C2; Wed, 14 Aug 2019 17:10:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565802605; bh=sXqJwjOchb0CiV97OvPL1wdjoasWXfavi5nSr1y8FQ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s7rv3BGb/2Fl68/5qFaCjZTgmO+yjCDuTMqbO/SgtGDB0EvnXfTfSYXJmXgelpHOZ +80Mrxkk000EvOTAl2Rz/uZc4yUr73PJQ0Ml6L/oYBxpfps8TvsqPRH/zlBFuqydoH pzq+vNoIOxROXmg5mqt+izRSc6p2aiwWJVqw3CSY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Navid Emamdoost , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 47/91] allocate_flower_entry: should check for null deref Date: Wed, 14 Aug 2019 19:01:10 +0200 Message-Id: <20190814165751.587517398@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190814165748.991235624@linuxfoundation.org> References: <20190814165748.991235624@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 [ Upstream commit bb1320834b8a80c6ac2697ab418d066981ea08ba ] allocate_flower_entry does not check for allocation success, but tries to deref the result. I only moved the spin_lock under null check, because the caller is checking allocation's status at line 652. Signed-off-by: Navid Emamdoost Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c index f2aba5b160c2d..d45c435a599d6 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c @@ -67,7 +67,8 @@ static struct ch_tc_pedit_fields pedits[] = { static struct ch_tc_flower_entry *allocate_flower_entry(void) { struct ch_tc_flower_entry *new = kzalloc(sizeof(*new), GFP_KERNEL); - spin_lock_init(&new->lock); + if (new) + spin_lock_init(&new->lock); return new; } -- 2.20.1