Received: by 2002:a25:c205:0:0:0:0:0 with SMTP id s5csp3652556ybf; Tue, 3 Mar 2020 09:50:26 -0800 (PST) X-Google-Smtp-Source: ADFU+vtiJ2qzuEsfUDQB4f/PENw9tigaTvTdJWjt4HTHaaSxEii2SeT+9qhLfAmyK7UF6ReD6j4p X-Received: by 2002:aca:120e:: with SMTP id 14mr3105851ois.135.1583257826387; Tue, 03 Mar 2020 09:50:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583257826; cv=none; d=google.com; s=arc-20160816; b=qODw2kEnD1LdNLdh4hzd15Fn+g4d2RP2ZceMQLRBAWXgHXJNOsigUUGnGlPKlUl9hs iHgR4pi2teW1U4jismPJ1GTuXqHumwwOTnmXx0y7eD5GoNBMc2ffF4YDCWxGTVriSCf8 ntE6cy3W7KkWu8ZX9yE2HjSm+DZgnZt7bjcY/qmbYvvF2hkFv/zV7RLuJ+s55T1k5BYQ gu4qUZyJLCQ8I2uUopaiA/pVYJGuFArnAjn8viot4uyyQm1ZsGPEPG/7pCvhMp+3ZeYn kk1JvoyrAH6Q+Nup96Nj3tvPFL5A7PFmB0byZANcj4CbHl2fka0dqN4ujr9tIIseTRQa lR6w== 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:dkim-signature; bh=Qll6fAUy3dDSs2dah34BZpLXIk4UGQH3yo1/xhQ9HtI=; b=XHN7rrkSxUJqebH13bB5dcW4XbTyrdM1+OhS6XL1jewk2szmxOB557WTbuHthwW4xC qWZqi595L3IcPDxMoA1D2Xd677wYUcfejGFDGXDU9tjd9o+nWWkIXdfPm13/HqouivoK AbK+sTVJco4W34GjpUF1X5c5phAAoIcMzhdn/op1HZvNHBCxh5yMbgOHpknG7M79mIw6 8zZMxRABJW9D8MN2y7Pr6xVo89mSYSEf+H2eZPoW+q3pcaKOVCo8VL7t8Dg9xRwRRFcQ QhdBDml6UkD5pMi4fxbYD2XmaV9XO2xf/EPXgkHsvadMD/XFYC5VkdQ1dtewuhxrLk33 gFgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=sPqpS7Xh; 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 x8si61113oia.29.2020.03.03.09.50.14; Tue, 03 Mar 2020 09:50:26 -0800 (PST) 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; dkim=pass header.i=@kernel.org header.s=default header.b=sPqpS7Xh; 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 S1729788AbgCCRsn (ORCPT + 99 others); Tue, 3 Mar 2020 12:48:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:55846 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730586AbgCCRsk (ORCPT ); Tue, 3 Mar 2020 12:48:40 -0500 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 A0EE22146E; Tue, 3 Mar 2020 17:48:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583257719; bh=61cMcrHpCmck7DJMugnV0iIAxMjsJLcZIVyODY/uwUQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sPqpS7Xhfkq/qcOmLOd6WKUNSLhpZ1U/DS5nK+hgmf60p92bOx89OcOk6/x5F1ISt mvfklErgL2BenTOQHW7CBfcBsKiDrV6YLl7ySJbPEsxZeHnzDkbuMzfGn3qqklXMEi 4svP0LJcZfE1D0Vh1toNgK8uJf6xG/CRmGajuZnc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Guangbin Huang , Huazhong Tan , "David S. Miller" , Sasha Levin Subject: [PATCH 5.5 077/176] net: hns3: fix a copying IPv6 address error in hclge_fd_get_flow_tuples() Date: Tue, 3 Mar 2020 18:42:21 +0100 Message-Id: <20200303174313.526363215@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200303174304.593872177@linuxfoundation.org> References: <20200303174304.593872177@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 From: Guangbin Huang [ Upstream commit 47327c9315b2f3ae4ab659457977a26669631f20 ] The IPv6 address defined in struct in6_addr is specified as big endian, but there is no specified endian in struct hclge_fd_rule_tuples, so it will cause a problem if directly use memcpy() to copy ipv6 address between these two structures since this field in struct hclge_fd_rule_tuples is little endian. This patch fixes this problem by using be32_to_cpu() to convert endian of IPv6 address of struct in6_addr before copying. Fixes: d93ed94fbeaf ("net: hns3: add aRFS support for PF") Signed-off-by: Guangbin Huang Signed-off-by: Huazhong Tan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index bfdb08572f0cc..5d74f5a60102a 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -6106,6 +6106,9 @@ static int hclge_get_all_rules(struct hnae3_handle *handle, static void hclge_fd_get_flow_tuples(const struct flow_keys *fkeys, struct hclge_fd_rule_tuples *tuples) { +#define flow_ip6_src fkeys->addrs.v6addrs.src.in6_u.u6_addr32 +#define flow_ip6_dst fkeys->addrs.v6addrs.dst.in6_u.u6_addr32 + tuples->ether_proto = be16_to_cpu(fkeys->basic.n_proto); tuples->ip_proto = fkeys->basic.ip_proto; tuples->dst_port = be16_to_cpu(fkeys->ports.dst); @@ -6114,12 +6117,12 @@ static void hclge_fd_get_flow_tuples(const struct flow_keys *fkeys, tuples->src_ip[3] = be32_to_cpu(fkeys->addrs.v4addrs.src); tuples->dst_ip[3] = be32_to_cpu(fkeys->addrs.v4addrs.dst); } else { - memcpy(tuples->src_ip, - fkeys->addrs.v6addrs.src.in6_u.u6_addr32, - sizeof(tuples->src_ip)); - memcpy(tuples->dst_ip, - fkeys->addrs.v6addrs.dst.in6_u.u6_addr32, - sizeof(tuples->dst_ip)); + int i; + + for (i = 0; i < IPV6_SIZE; i++) { + tuples->src_ip[i] = be32_to_cpu(flow_ip6_src[i]); + tuples->dst_ip[i] = be32_to_cpu(flow_ip6_dst[i]); + } } } -- 2.20.1