Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-02-16 15:20:42 +01:00
Code Releases Activity

ie: Change ie_tlv_builder_finalize signature

Browse Source 
ie_tlv_builder_init takes a size_t as input, yet for some reason
ie_tlv_builder_finalize takes an unsigned int argument as output.  Fix
the latter to use size_t as well.
This commit is contained in:
Denis Kenzior 2021-07-09 14:31:27 -05:00
parent 8320e3ab92
commit 08845fb19c
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ap.c
View File

@ -688,7 +688,6 @@ static size_t ap_build_beacon_pr_head(struct ap_state *ap,
size_t out_len) size_t out_len)
{ {
struct mmpdu_header *mpdu = (void *) out_buf; struct mmpdu_header *mpdu = (void *) out_buf;
unsigned int len;
uint16_t capability = IE_BSS_CAP_ESS | IE_BSS_CAP_PRIVACY; uint16_t capability = IE_BSS_CAP_ESS | IE_BSS_CAP_PRIVACY;
const uint8_t *bssid = netdev_get_address(ap->netdev); const uint8_t *bssid = netdev_get_address(ap->netdev);
uint32_t minr, maxr, count, r; uint32_t minr, maxr, count, r;
@ -740,8 +739,8 @@ static size_t ap_build_beacon_pr_head(struct ap_state *ap,
ie_tlv_builder_next(&builder, IE_TYPE_DSSS_PARAMETER_SET); ie_tlv_builder_next(&builder, IE_TYPE_DSSS_PARAMETER_SET);
ie_tlv_builder_set_data(&builder, &ap->channel, 1); ie_tlv_builder_set_data(&builder, &ap->channel, 1);
ie_tlv_builder_finalize(&builder, &len); ie_tlv_builder_finalize(&builder, &out_len);
return 36 + len; return 36 + out_len;
} }
/* Beacon / Probe Response frame portion after the TIM IE */ /* Beacon / Probe Response frame portion after the TIM IE */

7
src/fils.c
View File

@ -91,7 +91,6 @@ static void fils_erp_tx_func(const uint8_t *eap_data, size_t len,
struct ie_tlv_builder builder; struct ie_tlv_builder builder;
uint8_t data[256]; uint8_t data[256];
uint8_t *ptr = data; uint8_t *ptr = data;
unsigned int tlv_len;
struct ie_rsn_info rsn_info; struct ie_rsn_info rsn_info;
uint8_t *rsne; uint8_t *rsne;
@ -133,9 +132,9 @@ static void fils_erp_tx_func(const uint8_t *eap_data, size_t len,
fils->hs->mde[1]); fils->hs->mde[1]);
} }
ie_tlv_builder_finalize(&builder, &tlv_len); ie_tlv_builder_finalize(&builder, &len);
fils->auth(data, ptr - data + tlv_len, fils->user_data); fils->auth(data, ptr - data + len, fils->user_data);
} }
static int fils_derive_key_data(struct fils_sm *fils) static int fils_derive_key_data(struct fils_sm *fils)
@ -153,7 +152,7 @@ static int fils_derive_key_data(struct fils_sm *fils)
size_t iov_elems = 0; size_t iov_elems = 0;
size_t fils_ft_len = 0; size_t fils_ft_len = 0;
bool sha384; bool sha384;
unsigned int ie_len; size_t ie_len;
uint8_t *rsne = NULL; uint8_t *rsne = NULL;
rmsk = erp_get_rmsk(fils->erp, &rmsk_len); rmsk = erp_get_rmsk(fils->erp, &rmsk_len);

2
src/ie.c
View File

@ -393,7 +393,7 @@ bool ie_tlv_builder_recurse(struct ie_tlv_builder *builder,
} }
unsigned char *ie_tlv_builder_finalize(struct ie_tlv_builder *builder, unsigned char *ie_tlv_builder_finalize(struct ie_tlv_builder *builder,
unsigned int *out_len) size_t *out_len)
{ {
unsigned int len = 0; unsigned int len = 0;

2
src/ie.h
View File

@ -497,7 +497,7 @@ bool ie_tlv_builder_set_data(struct ie_tlv_builder *builder,
bool ie_tlv_builder_recurse(struct ie_tlv_builder *builder, bool ie_tlv_builder_recurse(struct ie_tlv_builder *builder,
struct ie_tlv_builder *recurse); struct ie_tlv_builder *recurse);
unsigned char *ie_tlv_builder_finalize(struct ie_tlv_builder *builder, unsigned char *ie_tlv_builder_finalize(struct ie_tlv_builder *builder,
unsigned int *out_len); size_t *out_len);
uint32_t ie_rsn_cipher_suite_to_cipher(enum ie_rsn_cipher_suite suite); uint32_t ie_rsn_cipher_suite_to_cipher(enum ie_rsn_cipher_suite suite);

8
unit/test-ie.c
View File

@ -156,8 +156,10 @@ static int create_ie(int ie_count, struct ie_tlv_builder *builder,
static void ie_test_writer(const void *data) static void ie_test_writer(const void *data)
{ {
struct test_data *test = (struct test_data *)data; struct test_data *test = (struct test_data *)data;
size_t expected_len = test->len;
struct ie_tlv_builder builder; struct ie_tlv_builder builder;
unsigned int final_len = 0, builder_len, expected_len = test->len; size_t final_len = 0;
size_t builder_len;
const unsigned char *expected_buf = test->buf; const unsigned char *expected_buf = test->buf;
unsigned int ie_count = 0; unsigned int ie_count = 0;
char *str; char *str;
@ -250,7 +252,7 @@ static void ie_test_writer(const void *data)
assert(!memcmp(test->buf, expected_buf, final_len)); assert(!memcmp(test->buf, expected_buf, final_len));
} }
printf("Wrote %d IE total len %d\n", ie_count, expected_len); printf("Wrote %d IE total len %zu\n", ie_count, expected_len);
} }
static void ie_test_writer_invalid_tag(const void *data) static void ie_test_writer_invalid_tag(const void *data)
@ -291,7 +293,7 @@ static void ie_test_reader_extended(const void *data)
static void ie_test_writer_extended(const void *data) static void ie_test_writer_extended(const void *data)
{ {
struct ie_tlv_builder builder; struct ie_tlv_builder builder;
unsigned int builder_len; size_t builder_len;
static const uint8_t expected[] = { static const uint8_t expected[] = {
0xff, 0x05, 0x0a, 0xff, 0x01, 0x02, 0x03, 0xff, 0x05, 0x0a, 0xff, 0x01, 0x02, 0x03,
}; };