Received: by 2002:ac0:a582:0:0:0:0:0 with SMTP id m2-v6csp1350978imm; Tue, 2 Oct 2018 06:57:50 -0700 (PDT) X-Google-Smtp-Source: ACcGV617rJViB5tXym1uyPR1fqAaTtpVxfIgoWdp8PPZQ51MXtva2Nqq3wnjXJHBoinA8y8FF2c9 X-Received: by 2002:a17:902:82c9:: with SMTP id u9-v6mr10767279plz.320.1538488670860; Tue, 02 Oct 2018 06:57:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538488670; cv=none; d=google.com; s=arc-20160816; b=GRtJf95jfXPGl7uXhw8ohk6PJ8cGmMEq7hXZV0cYiFvUsK8oWxemCfbmQpxw6M5+er 2MnvYc3EVQYt6ICwZlqVZONrXKKRe6iL8u/AX5kchT7VWlCre3/DZ+I2NyerbldOipXY Xv9V6QUus1aEqpQftxejTqR9cAVSip+GI1e+tD/Fpn0YE5ZwbFYHgV43Osphb0h7b7wI jpsLOKkA3GUP8QrtrimojNxAIucbY4kq1ltoAfCeVE4N9CVTs8h05UBn4VbbqWcAHc/H KS8BCZFyS9hDIk3u1nMNpCx+/bDspLLDozxixfXBjjx5p1s20jE7zDcmtM9hv6a3TvrX fdVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from; bh=P1aagPExVFmlsAHothKxe7QmTMZVy3mIKWXAemAg7kQ=; b=KaXtqsuMeK/ZGrQHtazPFvybDFAFUdzdkzrIbnh0tBndMoyAQ52GQigZDtLO2qzl93 x7tdgxrZA4CsTLJMYdysQ0T2q24gNTkuN0RV5KCMFTjs0sF/r0ynJC2OM5c4yuvMAptU 2rc4aTagWkqOB4gy1FuroEn7FN+1j0hTgJSUljeMbv+F28X+9biBqyms53BUbwVVAH4A cvgGZgtLRj3myPXE/HgvvNUjFslUBgprhcT6/gwuNdoWZVOdqWEpqH6IJhqenYZqsO65 oVtRlTclGej7Uc5nzTVgg8d/2VXbOz0GrWTKHLYWatq6ezVknvlPRYCG03TnWkVmK6pt neAQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 34-v6si16643795plp.310.2018.10.02.06.57.36; Tue, 02 Oct 2018 06:57:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730997AbeJBUOt (ORCPT + 99 others); Tue, 2 Oct 2018 16:14:49 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:34110 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730036AbeJBUOr (ORCPT ); Tue, 2 Oct 2018 16:14:47 -0400 Received: from localhost (24-104-73-23-ip-static.hfc.comcastbusiness.net [24.104.73.23]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 02C0CBF0; Tue, 2 Oct 2018 13:31:24 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ganesh Goudar , Atul Gupta , Herbert Xu , Sasha Levin Subject: [PATCH 4.18 209/228] crypto: chtls - fix null dereference chtls_free_uld() Date: Tue, 2 Oct 2018 06:25:06 -0700 Message-Id: <20181002132511.892106140@linuxfoundation.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181002132459.032960735@linuxfoundation.org> References: <20181002132459.032960735@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review 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 4.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ganesh Goudar [ Upstream commit 65b2c12dcdb883fc015c0ec65d6c2f857e0456ac ] call chtls_free_uld() only for the initialized cdev, this fixes NULL dereference in chtls_free_uld() Signed-off-by: Ganesh Goudar Signed-off-by: Atul Gupta Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/crypto/chelsio/chtls/chtls.h | 5 +++++ drivers/crypto/chelsio/chtls/chtls_main.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) --- a/drivers/crypto/chelsio/chtls/chtls.h +++ b/drivers/crypto/chelsio/chtls/chtls.h @@ -96,6 +96,10 @@ enum csk_flags { CSK_CONN_INLINE, /* Connection on HW */ }; +enum chtls_cdev_state { + CHTLS_CDEV_STATE_UP = 1 +}; + struct listen_ctx { struct sock *lsk; struct chtls_dev *cdev; @@ -146,6 +150,7 @@ struct chtls_dev { unsigned int send_page_order; int max_host_sndbuf; struct key_map kmap; + unsigned int cdev_state; }; struct chtls_hws { --- a/drivers/crypto/chelsio/chtls/chtls_main.c +++ b/drivers/crypto/chelsio/chtls/chtls_main.c @@ -160,6 +160,7 @@ static void chtls_register_dev(struct ch tlsdev->hash = chtls_create_hash; tlsdev->unhash = chtls_destroy_hash; tls_register_device(&cdev->tlsdev); + cdev->cdev_state = CHTLS_CDEV_STATE_UP; } static void chtls_unregister_dev(struct chtls_dev *cdev) @@ -281,8 +282,10 @@ static void chtls_free_all_uld(void) struct chtls_dev *cdev, *tmp; mutex_lock(&cdev_mutex); - list_for_each_entry_safe(cdev, tmp, &cdev_list, list) - chtls_free_uld(cdev); + list_for_each_entry_safe(cdev, tmp, &cdev_list, list) { + if (cdev->cdev_state == CHTLS_CDEV_STATE_UP) + chtls_free_uld(cdev); + } mutex_unlock(&cdev_mutex); }