Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
From:   Isak Westin <isak.westin@hotmail.com>
To:     linux-bluetooth@vger.kernel.org
Cc:     Isak Westin <isak.westin@hotmail.com>
Subject: [PATCH BlueZ 1/1] mesh: Use correct net_id for received CTL messages
Date:   Fri, 15 Apr 2022 18:43:35 +0200
Message-ID: <VI1PR09MB4239579EE5A795C707FBE075E3EE9@VI1PR09MB4239.eurprd09.prod.outlook.com>
In-Reply-To: <20220415164335.24808-1-isak.westin@hotmail.com>
References: <20220415164335.24808-1-isak.westin@hotmail.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 2f6a953f-18ab-4b1a-0dd2-08da1eff2624
X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEsiTQR6L2uA9gg60dIKieXwQ2CO+dSPIjhQim+Tk143QYFuLIBrDGJrKFaHtu2br+kO4Mhwf6vf5P4yUz/MLMm4AnBcDR4weOVI46+1FJEfOAG+w6JcnBer8X2YwEds5LripEvA0Szr9lyFbjqk/9NYEMOo6kj3nyTrKyXejifiiAF5To2xOz5LhpoX0MAVaV3yWzEkoeyTCU3jaVxrQdMwgMBXxK7t6eS4IzZlIJlGQGSpyjEMK5utG0xdB+CvrwgnQRNq7qsyWtJ6gVXdHVaF7CqPKydeLkfi4d1IVWnKBDlPi0Qqf2KZDYrWDmqzQ+6b5O7YtODSEOCzxhxPGwAPzSfSDsrtHU53mJGNV8EeGst7YXtCYdC4aDi62+nwx8q59c45vOdLedP+ARn3Qhj51wvCMFlkeeCl6TipTI6DhSzH7UNhLhuRY9+4ZZpJ2NaTYTjl4z0COgr7qP3370NtymozqvGqKjHgg4Cj02mHmAic4VY8yR3YasmgOwbJNqzrmPanFytw+psnJhtw+qU2dAA04jfjJlkgo3ANiwZygOnPcVJXdfpAGl2De27shzDN4w30uANONQGnOgVRLDfPeUbZdcyLob62I5OhzDCMv2yprrUySw7ARwteZpD1XauyEGgAg+cuGjnt4XzqPXjBOABAY+1//WUU3O9G1+qxy8J/pP2Tgacsqlw7Hz6JiO7PeJ7NwnkOmN64UO+vKSJkhdtq3W/FfFXmvoOeh22WQDbsI8tDT/8D9VCr3axbRz2ZSVcWvdX4I9EFOmp7pTHT
X-MS-TrafficTypeDiagnostic: DBBPR09MB3029:EE_
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: LHvTkwJ7fVSTlaZVFF/uWvsNnX1P/uQBPRFJsoHaFpZx0rgSzY8N7f1eYQUOcz66cDKs26WEBPkjSFcLQOO3Fa/MMsnxX+6FAvS+V6gi3NchuqyopEvLZnwOEh9rAVP8H2fYV4N6a6JFiYaTfjWghgPgMsCTUT/Xy2ZPDti4i6K8N3cfrk46xb1ssQBTzFKC6iPuSc5iAMk8POLEdD5FAMhRy3nNjfJZk8gfbNwlDzzb2v+XpcXtX6tjmRQfQUBgZB71GwFHmR95JgH5+NfoLlkdaVIbJRsC+VTWz1OYR/1rnCXm+EYKK6Ht/C0W8YrgsD1a5WjVrbJnw1LxfbB7OXD+9x+50CKCUL8xI4JO4XnLZhhZVxE7fbip2ZEafp6tEHKfVbPuVIR0sdOfI1dha59teUfoPWEJGaz5k0Lv3mAgNTuQVjBxYo9dmRWE2mBXYVhe3rpTQxywU2wqBHBUS1Z/ijE9MSuj3/GhgZTEbu30TgSTkijrnO8tnmPT0k6+HYMKT6PLMx5YVqPGPGyOTZnB9K1TVX/T3fpVf6JOE6BS7UzIUxicXZtv/ppfRhe0rwSPrp7N5zFfCiiFxAXV2A==
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?re9/EZa8heHvhkLtPIRze9tgvWpvBM5RoQPXWLqduTDVfhcrevrx41HbkQGJ?=
 =?us-ascii?Q?43+JBrjKQQGAVEfC+OZeAgyT93w5mQc2hqPmrfGZfosS0OYDP4tLEatll2ad?=
 =?us-ascii?Q?trCfcg+SfVAVs5KaLy6CV9A95ijQQ+Z3Nc/RJJ7BCvdKYoPS00n22tpEX+Qi?=
 =?us-ascii?Q?HOyYkyjDLB4brTEHob349ipG7uTZNsNmcDwG5qam51cQvBohCs5vXYTfXb7i?=
 =?us-ascii?Q?yU9Dv5PAaDvvz0DMGaBs9UamUQPa9OQhga4VOSRTh5i05vGD0yAg4O2dsQ8q?=
 =?us-ascii?Q?7+jY8ek5SSDne9lHA/gWfC0LMtskl/WuSHoxEXU+ZsXM5qTD2uRLyqEuXtHc?=
 =?us-ascii?Q?nef7xgzlzUFTyQwLK1nNMT7spuQfFaxnwyDaUtStyhxmTtlb49zfQJZUxBn2?=
 =?us-ascii?Q?CkYUCBdahvyJt01dYQHPJjjzO0C9jP5iWYnQjX+PehmayoDngCxnUrpFhLwC?=
 =?us-ascii?Q?rG9fr66DjS0e3noSXE+F9UEs55OgWN37hAt+iABRUlEhuQk72x1/FIabaC3p?=
 =?us-ascii?Q?4rHFe6Ui+VEi5/Whq4NHL7OiZ9LqHK02lN8vgijxgcC2UmoLfxPGvqnlRhgx?=
 =?us-ascii?Q?BcvaixIl7onfBHIGn8X+dS3Dq89dwe9za2zHS3yADT9LLhhLfyA7uSOlzQRk?=
 =?us-ascii?Q?fY7/n/+YvVFBIgDbGTGffBF7ewEbx7OXFpWmiokpeqYo1hFON8sft9QkV2P6?=
 =?us-ascii?Q?18xponabtWW/tOTj21y+5tKItr/Y+zFFixAT0ggJmCjNbcDwdkcTsM/SiOpk?=
 =?us-ascii?Q?/PxxaEvVs8DlYHFW8vqFx7/UIGEbk3lhIthl8FDme2V5CliZe8joLqPomEcO?=
 =?us-ascii?Q?b3A2j6tdLmNTvmkJvC1Aubh+WALzX7ORd4Oyyfd8v8PoWdzklmSTz+1y+WdU?=
 =?us-ascii?Q?Lui9yAyIbz04iXZGF8qvLb/D0jFEJBen2ylq03AtAZaIvZ8+rhZLb9Yf/Mw6?=
 =?us-ascii?Q?ItdJjq1Sry1U5rRCLPXQonAesMVESrhdJGr1KOGzbZxnlccphJngYm0gEpvA?=
 =?us-ascii?Q?uWPEKnxRzFcrckJs12nh0QM2tn3QahGXV0cHY0/J4xm9u17StHY8BSVvkxsz?=
 =?us-ascii?Q?XNDqsOlBelmUPedQwSh2lf4h31L5vDvqOQ+6oAC09YVEisVT9vPO21MJgxcA?=
 =?us-ascii?Q?RH4ffLCOBC0nms+U1Hpgtbh/P9gtauo07ipf/Idr0qJhfWsu6F1OnDfygcvN?=
 =?us-ascii?Q?wtuEfH0oZ5yBESpczakZWAcGwUleHu3PA6ffyxHhXuuJ3jJnptBFsb9MxVtP?=
 =?us-ascii?Q?POr322j/KIw6/WOI9Pt2JYtjj8o2v95d+rLybwOCa9Iu94qn6H93wJGae4nd?=
 =?us-ascii?Q?uxpVLUFUu7FEEEOCBEPq+pIy5SzGj+GU+d4O3uIHplcnaeD0yk3Togk3/uBr?=
 =?us-ascii?Q?UuQzxAaNl2BXFNfYVnUe4YojbLYaktCnAaKjLvubSaNlW2x88GLyl1IIA9kj?=
 =?us-ascii?Q?q6T1hLqBAELZ9+g7/dfdB6LWTFIBNG73?=
X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-64da6.templateTenant
X-MS-Exchange-CrossTenant-Network-Message-Id: 2f6a953f-18ab-4b1a-0dd2-08da1eff2624
X-MS-Exchange-CrossTenant-AuthSource: VI1PR09MB4239.eurprd09.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2022 16:44:03.3612
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR09MB3029
X-Spam-Status: No, score=-0.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,FORGED_HOTMAIL_RCVD2,
	FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE
	autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
	lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-bluetooth.vger.kernel.org>
X-Mailing-List: linux-bluetooth@vger.kernel.org

For received CTL mesh messages, the wrong network ID variable was
passed to ctl_received. This patch changes to the correct variable.

Also, changed type of net_key_id argument in ctl_received function
to be consistent wich the whole call chain.
---
 mesh/net.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mesh/net.c b/mesh/net.c
index 8ff3ef32e..e8e6d3a61 100644
--- a/mesh/net.c
+++ b/mesh/net.c
@@ -2028,7 +2028,7 @@ static bool seg_rxed(struct mesh_net *net, bool frnd, uint32_t iv_index,
 	return false;
 }
 
-static bool ctl_received(struct mesh_net *net, uint16_t net_key_id,
+static bool ctl_received(struct mesh_net *net, uint32_t net_key_id,
 						uint32_t iv_index, uint8_t ttl,
 						uint32_t seq,
 						uint16_t src, uint16_t dst,
@@ -2347,7 +2347,7 @@ static enum _relay_advice packet_received(void *user_data,
 							net_seqZero,
 							l_get_be32(msg + 3));
 			} else {
-				ctl_received(net, key_aid, iv_index, net_ttl,
+				ctl_received(net, net_key_id, iv_index, net_ttl,
 						net_seq, net_src, net_dst,
 						net_opcode, rssi, msg,
 								app_msg_len);
-- 
2.20.1