From patchwork Tue Oct 27 13:49:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 290030 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=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 76512C56202 for ; Tue, 27 Oct 2020 14:30:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2BEA52222C for ; Tue, 27 Oct 2020 14:30:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603809033; bh=4jv+YtlfZaOIqjyRlJVzYg08CQ4sDQgFECkoM0Jy+3U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Ng3ZPXttq+1bYi4FtVm9vvbta803F7iURojBJf9YcIU+if6CWWnVW0X7AXoYwYBVF kdclob9LEpsDAza55L6GrRqGa4Cl8ClHSOC4GZGBrfSAiDYgeTwjBvfgNIiEkW6Z7p E8n7MR1niDkIgvR5XlapAzCJGIWZxxTlATlzZ8AE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759347AbgJ0O32 (ORCPT ); Tue, 27 Oct 2020 10:29:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:56052 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759339AbgJ0O3Y (ORCPT ); Tue, 27 Oct 2020 10:29:24 -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 4E3412225E; Tue, 27 Oct 2020 14:29:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603808963; bh=4jv+YtlfZaOIqjyRlJVzYg08CQ4sDQgFECkoM0Jy+3U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bj4NYgbcEUI3fnA2tjML3xCB5AuBlrhrPWnfPRjjV/7tvXD+cO7e/Z1IWW7bE1x0z pErf2dJ2sYK4I9IdovTUdIA+qBNKgNe1L2OeEoFnOZr3fvHDzaR8iyzdd2feJIrQxJ kjbG0nLvBZ3nx7p9C6YEmlt4AxwUIvw1Go91a0jQ= 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.4 026/408] chelsio/chtls: correct netdevice for vlan interface Date: Tue, 27 Oct 2020 14:49:24 +0100 Message-Id: <20201027135456.273205183@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135455.027547757@linuxfoundation.org> References: <20201027135455.027547757@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vinay Kumar Yadav [ Upstream commit 81519d1f7df7ed1bd5b1397540c8884438f57ae2 ] Check if netdevice is a vlan interface and find real vlan netdevice. Fixes: cc35c88ae4db ("crypto : chtls - CPL handler definition") 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 | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/crypto/chelsio/chtls/chtls_cm.c +++ b/drivers/crypto/chelsio/chtls/chtls_cm.c @@ -1053,6 +1053,9 @@ static struct sock *chtls_recv_sock(stru ndev = n->dev; if (!ndev) goto free_dst; + if (is_vlan_dev(ndev)) + ndev = vlan_dev_real_dev(ndev); + port_id = cxgb4_port_idx(ndev); csk = chtls_sock_create(cdev);