From: Denis Kenzior <denkenz@gmail.com>
To: iwd@lists.linux.dev
Cc: Denis Kenzior <denkenz@gmail.com>
Subject: [PATCH 1/7] handshake: Add cleanup function for handshake_state
Date: Thu, 30 Nov 2023 22:00:01 -0600 [thread overview]
Message-ID: <20231201040020.161143-1-denkenz@gmail.com> (raw)
To allow _auto_(handshake_state_free) variables to be used.
---
src/handshake.c | 7 ++++++-
src/handshake.h | 3 +++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/handshake.c b/src/handshake.c
index 6b93774ab137..1c5ed2c9bc12 100644
--- a/src/handshake.c
+++ b/src/handshake.c
@@ -105,7 +105,12 @@ void __handshake_set_install_ext_tk_func(handshake_install_ext_tk_func_t func)
void handshake_state_free(struct handshake_state *s)
{
- __typeof__(s->free) destroy = s->free;
+ __typeof__(s->free) destroy;
+
+ if (!s)
+ return;
+
+ destroy = s->free;
if (s->in_event) {
s->in_event = false;
diff --git a/src/handshake.h b/src/handshake.h
index 7200c3617b8e..815eb44ff6ba 100644
--- a/src/handshake.h
+++ b/src/handshake.h
@@ -24,6 +24,7 @@
#include <stdbool.h>
#include <asm/byteorder.h>
#include <linux/types.h>
+#include <ell/cleanup.h>
struct handshake_state;
enum crypto_cipher;
@@ -298,3 +299,5 @@ const uint8_t *handshake_util_find_pmkid_kde(const uint8_t *data,
size_t data_len);
void handshake_util_build_gtk_kde(enum crypto_cipher cipher, const uint8_t *key,
unsigned int key_index, uint8_t *to);
+
+DEFINE_CLEANUP_FUNC(handshake_state_free);
--
2.43.0
next reply other threads:[~2023-12-01 4:01 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-01 4:00 Denis Kenzior [this message]
2023-12-01 4:00 ` [PATCH 2/7] p2p: Simplify handshake_state cleanup Denis Kenzior
2023-12-01 4:00 ` [PATCH 3/7] p2p: Simplify cleanup of ies Denis Kenzior
2023-12-01 4:00 ` [PATCH 4/7] netdev: iov_ie_append: Support iovecs with multiple IEs Denis Kenzior
2023-12-01 4:00 ` [PATCH 5/7] p2p: Use handshake to pass vendor ies Denis Kenzior
2023-12-01 4:00 ` [PATCH 6/7] wsc: " Denis Kenzior
2023-12-01 4:00 ` [PATCH 7/7] netdev: Remove vendor_ies from netdev_connect signature Denis Kenzior
2023-12-01 12:42 ` [PATCH 1/7] handshake: Add cleanup function for handshake_state James Prestwood
2023-12-01 15:08 ` Denis Kenzior
2023-12-01 15:22 ` James Prestwood
2023-12-01 15:32 ` James Prestwood
2023-12-01 16:06 ` James Prestwood
2023-12-01 16:32 ` Denis Kenzior
2023-12-01 16:47 ` James Prestwood
2023-12-01 16:30 ` Denis Kenzior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231201040020.161143-1-denkenz@gmail.com \
--to=denkenz@gmail.com \
--cc=iwd@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).