Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp254527pxx; Wed, 28 Oct 2020 04:12:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJypLoqnKNlOXYtoKBOcKbAzLt3I1YxGXx3mSK6FDaL9GxVMJJnF8AEajYy0gZYoSzac3noU X-Received: by 2002:a17:906:7fd8:: with SMTP id r24mr6786965ejs.553.1603883536898; Wed, 28 Oct 2020 04:12:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603883536; cv=none; d=google.com; s=arc-20160816; b=BijfyYyv1JfZWjVmHegYoqhBfbnw5kwHuBE/9xdgyWW7dCtcG7FwQb33MrUwfSHlt0 kAWU4GsgoAAnaR9ISVyJsQEPDiCIhqZs7L1vOfyY7EgOG7MnpEzN1LjhEDFnTlrOhtU2 2RbOR0jNWW1Tbvl3/gvg2gFY4uxv3WCKllppE1GzJmCE8Q/kgeZ4LWrwoCclGWk7bH9H QwgDMkvS93BpeGHFlxeA1Y9wHCVzaCG3C/7roFr5Vrv/vzw+9HO6lP8gJSpmDYfRGu3v MkuQZ+0ph0wksgJpB5AsR6QSIHaJHGEA9xTya+u0KTkNZmlZ1peN1cb0Mf5o71AiBkAI ZY2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=kzUmTGplscYDQkptwEHFo32KzvXYv2GzWBQPdIbPrwg=; b=h5FGLufy15Yx61pVq4+aFEqq9gfto1e0UkOxCQPKLhIF9TXCWMkAzUMvaKF/qVZu3T 9zJfpIBqBp4mMJWabN5iLP4pPoivSqKywpFgKZfym3u3qPyG7eKwSMw2wzToFeNi56Em O1SyK+jc715dRwqD41/HQHDyhY1FHD8kuTsCq5KBPLmyKucXKLYa+eUM+q7Z3uHwLgy6 TyI4lrx96rPClEpbQSCIsy7Q1iTb5gRlBzKNNNBW6460DtIY9d582C2zUV2ghkt9fmpe g3hPZmnxEdzb6VpE1CZDFrNOzIxaw+RrCsYXoDko6sdWi6uJjzDU/67ndTL+n3FBPi7n S/TQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=IHKQBxC5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id jr1si3058858ejb.164.2020.10.28.04.11.54; Wed, 28 Oct 2020 04:12:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=IHKQBxC5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1786775AbgJ0O74 (ORCPT + 99 others); Tue, 27 Oct 2020 10:59:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:49162 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1766449AbgJ0OtD (ORCPT ); Tue, 27 Oct 2020 10:49:03 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 040A8206E5; Tue, 27 Oct 2020 14:49:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603810142; bh=l6PdRIk2q9kQkm+pHSYC9bMdJ4FHIN5XHDF1uNwVZbc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IHKQBxC5W22PXXrs7Tg4DP0CX1VmVQMjw7oFYkkegEr5WbITIIHzbjJPW0wSqUM/N xNVDii/IZlmG6V+TwVwIPQ/sWZSrlhBGgNz/qE/Om+5IzSA0vJoKSYrZhxjKo/EuJ2 o230SHaGNdL4jatjNT/6KQGQhFebZkVEKGSkTQ9U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Venkatesh Ellapu , Vinay Kumar Yadav , Jakub Kicinski Subject: [PATCH 5.8 035/633] chelsio/chtls: Fix panic when listen on multiadapter Date: Tue, 27 Oct 2020 14:46:18 +0100 Message-Id: <20201027135524.343801775@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135522.655719020@linuxfoundation.org> References: <20201027135522.655719020@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vinay Kumar Yadav [ Upstream commit 9819f22c410b4bf6589d3126e8bc3952db507cbf ] Add the logic to compare net_device returned by ip_dev_find() with the net_device list in cdev->ports[] array and return net_device if matched else NULL. Fixes: 6abde0b24122 ("crypto/chtls: IPv6 support for inline TLS") Signed-off-by: Venkatesh Ellapu Signed-off-by: Vinay Kumar Yadav Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/crypto/chelsio/chtls/chtls_cm.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) --- a/drivers/crypto/chelsio/chtls/chtls_cm.c +++ b/drivers/crypto/chelsio/chtls/chtls_cm.c @@ -92,11 +92,13 @@ static void chtls_sock_release(struct kr static struct net_device *chtls_find_netdev(struct chtls_dev *cdev, struct sock *sk) { + struct adapter *adap = pci_get_drvdata(cdev->pdev); struct net_device *ndev = cdev->ports[0]; #if IS_ENABLED(CONFIG_IPV6) struct net_device *temp; int addr_type; #endif + int i; switch (sk->sk_family) { case PF_INET: @@ -127,8 +129,12 @@ static struct net_device *chtls_find_net return NULL; if (is_vlan_dev(ndev)) - return vlan_dev_real_dev(ndev); - return ndev; + ndev = vlan_dev_real_dev(ndev); + + for_each_port(adap, i) + if (cdev->ports[i] == ndev) + return ndev; + return NULL; } static void assign_rxopt(struct sock *sk, unsigned int opt)