From patchwork Tue Oct 27 13:51:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 311823 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 9612BC55179 for ; Tue, 27 Oct 2020 18:04:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5052C21655 for ; Tue, 27 Oct 2020 18:04:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603821847; bh=B30AqVV5k7OS9cHMOheZhm2Vc7v0WUZoIgeg09EOxws=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=NXF4NxNA+ww4Om3C6X2DXqRxCLr+Hq+aizc6Mc8CkIFty0pzw1wTTz1mRluu6I6as svVwJCnv5vv6p9XFrBJJ+uJF3MskYpgR0sb/7vYryZ4sjizHd9ZZKBVuPgnv8mSJps PgQ+rpybpOSXBprYdzwPqL8F5mdNJOZiY0SbuhoI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756989AbgJ0OSp (ORCPT ); Tue, 27 Oct 2020 10:18:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:42320 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757329AbgJ0OSn (ORCPT ); Tue, 27 Oct 2020 10:18:43 -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 13BD9206D4; Tue, 27 Oct 2020 14:18:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603808323; bh=B30AqVV5k7OS9cHMOheZhm2Vc7v0WUZoIgeg09EOxws=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=npj/dWCg/huJqKyjItVDZ9+uK0trmjWPBNxluDDElutupo4p3//VfE2A5QC9Cy30a B9B0XFBxKILTn1Y6vVFd2ozE1CSDmb15ahLQVm//GG1/WiUEa87+68CvD86se+OJ21 XzbWzIpcE/85eroCu7I+VSwJt4orDF5I+n5iXsBk= 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 4.19 017/264] chelsio/chtls: correct netdevice for vlan interface Date: Tue, 27 Oct 2020 14:51:15 +0100 Message-Id: <20201027135431.479002441@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135430.632029009@linuxfoundation.org> References: <20201027135430.632029009@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 @@ -1057,6 +1057,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);