diff mbox series

NAN: Fix setting PBM in NAN discovery event

Message ID 20260514083418.34498-1-andrei.otcheretianski@intel.com
State Accepted
Headers show
Series NAN: Fix setting PBM in NAN discovery event | expand

Commit Message

Andrei Otcheretianski May 14, 2026, 8:34 a.m. UTC 
From: Ilan Peer <ilan.peer@intel.com>

The pairing and bootstrapping value was set before the NAN discovery
object was memset. Fix this by moving the memset() call earlier.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
---
 src/common/nan_de.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jouni Malinen May 20, 2026, 9:21 a.m. UTC | #1 
On Thu, May 14, 2026 at 11:34:17AM +0300, Andrei Otcheretianski wrote:
> The pairing and bootstrapping value was set before the NAN discovery
> object was memset. Fix this by moving the memset() call earlier.

Thanks, applied.
diff mbox series

Patch

diff --git a/src/common/nan_de.c b/src/common/nan_de.c
index c5b1022772..ba61412bd9 100644
--- a/src/common/nan_de.c
+++ b/src/common/nan_de.c
@@ -1529,6 +1529,7 @@  static bool nan_de_rx_publish(struct nan_de *de, struct nan_de_service *srv,
 	}
 
 send_event:
+	os_memset(&res, 0, sizeof(res));
 	if (buf && buf_len > 0) {
 		/* Parse Cipher Suite Information Attribute */
 		cipher_suite_count = nan_de_parse_csia(
@@ -1552,7 +1553,6 @@  send_event:
 		res.pbm = nan_de_get_advertise_pbm(buf, buf_len);
 	}
 
-	os_memset(&res, 0, sizeof(res));
 	res.subscribe_id = srv->id;
 	res.srv_proto_type = srv_proto_type;
 	res.ssi = ssi;