tlshd: Store peer IDs in a GArray

The number of peer IDs passed up from the kernel is not known in
advance. Use a flexible array to handle one-at-a-time storage of
the peerids as they are retrieved from the netlink arguments.

Signed-off-by: Chuck Lever <[email protected]>

Author: chucklever

src/tlshd/client.c

@@ -417,9 +417,10 @@ static void tlshd_tls13_client_psk_handshake_one(struct tlshd_handshake_parms *p
 
 static void tlshd_tls13_client_psk_handshake(struct tlshd_handshake_parms *parms)
 {
-	unsigned int i;
+	key_serial_t peerid;
+	guint i;
 
-	if (!parms->peerids) {
+	if (parms->peerids->len == 0) {
 		tlshd_log_error("No key identities");
 		return;
 	}
@@ -428,8 +429,9 @@ static void tlshd_tls13_client_psk_handshake(struct tlshd_handshake_parms *parms
 	 * GnuTLS does not yet support multiple offered PskIdentities.
 	 * Retry ClientHello with each identity on the kernel's list.
 	 */
-	for (i = 0; i < parms->num_peerids; i++) {
-		tlshd_tls13_client_psk_handshake_one(parms, parms->peerids[i]);
+	for (i = 0; i < parms->peerids->len; i++) {
+		peerid = g_array_index(parms->peerids, key_serial_t, i);
+		tlshd_tls13_client_psk_handshake_one(parms, peerid);
 		if (parms->session_status != EACCES)
 			break;
 	}

src/tlshd/netlink.c

@@ -189,20 +189,15 @@ void tlshd_genl_dispatch(void)
 static void tlshd_parse_peer_identity(struct tlshd_handshake_parms *parms,
 				      struct nlattr *head)
 {
+	key_serial_t peerid;
+
 	if (!head) {
 		tlshd_log_debug("No peer identities found\n");
 		return;
 	}
 
-	parms->num_peerids = 1;
-
-	parms->peerids = calloc(parms->num_peerids, sizeof(key_serial_t));
-	if (!parms->peerids) {
-		parms->num_peerids = 0;
-		return;
-	}
-
-	parms->peerids[0] = nla_get_s32(head);
+	peerid = nla_get_s32(head);
+	g_array_append_val(parms->peerids, peerid);
 }
 
 #if LIBNL_VER_NUM >= LIBNL_VER(3,5)
@@ -320,7 +315,6 @@ static const struct tlshd_handshake_parms tlshd_default_handshake_parms = {
 	.x509_cert		= TLS_NO_CERT,
 	.x509_privkey		= TLS_NO_PRIVKEY,
 	.peerids		= NULL,
-	.num_peerids		= 0,
 	.remote_peerids		= NULL,
 	.msg_status		= 0,
 	.session_status		= EIO,
@@ -346,6 +340,7 @@ int tlshd_genl_get_handshake_parms(struct tlshd_handshake_parms *parms)
 
 	*parms = tlshd_default_handshake_parms;
 
+	parms->peerids = g_array_new(FALSE, FALSE, sizeof(key_serial_t));
 	parms->remote_peerids = g_array_new(FALSE, FALSE, sizeof(key_serial_t));
 
 	ret = tlshd_genl_sock_open(&nls);
@@ -415,7 +410,7 @@ void tlshd_genl_put_handshake_parms(struct tlshd_handshake_parms *parms)
 {
 	if (parms->keyring)
 		keyctl_unlink(parms->keyring, KEY_SPEC_SESSION_KEYRING);
-	free(parms->peerids);
+	g_array_free(parms->peerids, TRUE);
 	g_array_free(parms->remote_peerids, TRUE);
 }
 

src/tlshd/tlshd.h

@@ -39,8 +39,7 @@ struct tlshd_handshake_parms {
 	key_serial_t	keyring;
 	key_serial_t	x509_cert;
 	key_serial_t	x509_privkey;
-	key_serial_t	*peerids;
-	unsigned int	num_peerids;
+	GArray		*peerids;
 	GArray		*remote_peerids;
 	int		msg_status;