From 5ee7bb99f2af1429a3bedeb6b76d67da4a4e4f65 Mon Sep 17 00:00:00 2001 From: Srikanth Marepalli Date: Tue, 15 Jun 2021 20:49:34 +0800 Subject: [PATCH] qcacld-3.0: Ignore duplicated assoc req frame When PMF enabled, SA Query will be triggered unexpectly if duplicated assoc_req received after pre_auth node deleted and before key installed. Here drop such duplicated assoc_req frame. Change-Id: I1c769892052fba5e8c7340b2f82e822add573dd4 CRs-Fixed: 2966447 --- core/mac/src/pe/lim/lim_process_assoc_req_frame.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c index e86fe3aeed18..d39211873c14 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2012-2020 The Linux Foundation. All rights reserved. + * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -2335,6 +2336,15 @@ void lim_process_assoc_req_frame(struct mac_context *mac_ctx, uint8_t *rx_pkt_in session->limSystemRole, QDF_MAC_ADDR_REF(hdr->sa)); return; + } else if (sta_ds->rmfEnabled && !sta_ds->is_key_installed) { + /* When PMF enabled, SA Query will be triggered + * unexpectly if duplicated assoc_req received - + * 1) after pre_auth node deleted and + * 2) before key installed. + * Here drop such duplicated assoc_req frame. + */ + pe_err("Drop duplicate assoc_req before 4-way HS"); + return; } }