Skip to content

fix: validate key lengths from kernel reply and fix try_again loop cleanup #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MarkAtwood wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: validate key lengths from kernel reply and fix try_again loop cleanup #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 29 additions & 15 deletions user-src/ipc-linux.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,20 +540,24 @@ static int parse_privkey(const struct nlattr *attr, void *data)

switch (mnl_attr_get_type(attr)) {
case WGDEVICE_A_PRIVATE_KEY:
*privkey->privkey_len = mnl_attr_get_payload_len(attr);
*privkey->privkey = malloc(*privkey->privkey_len);
if (mnl_attr_get_payload_len(attr) != WG_PRIVATE_KEY_LEN)
return MNL_CB_ERROR;
*privkey->privkey_len = WG_PRIVATE_KEY_LEN;
*privkey->privkey = malloc(WG_PRIVATE_KEY_LEN);
if (! *privkey->privkey)
return MNL_CB_ERROR;
memcpy(*privkey->privkey, mnl_attr_get_payload(attr), *privkey->privkey_len);
memcpy(*privkey->privkey, mnl_attr_get_payload(attr), WG_PRIVATE_KEY_LEN);
break;
case WGDEVICE_A_PUBLIC_KEY:
if (! privkey->pubkey)
return MNL_CB_OK;
*privkey->pubkey_len = mnl_attr_get_payload_len(attr);
*privkey->pubkey = malloc(*privkey->pubkey_len);
if (mnl_attr_get_payload_len(attr) != WG_PUBLIC_KEY_LEN)
return MNL_CB_ERROR;
*privkey->pubkey_len = WG_PUBLIC_KEY_LEN;
*privkey->pubkey = malloc(WG_PUBLIC_KEY_LEN);
if (! *privkey->pubkey)
return MNL_CB_ERROR;
memcpy(*privkey->pubkey, mnl_attr_get_payload(attr), *privkey->pubkey_len);
memcpy(*privkey->pubkey, mnl_attr_get_payload(attr), WG_PUBLIC_KEY_LEN);
break;
}

Expand Down Expand Up @@ -605,8 +609,10 @@ static int kernel_generate_privkey(uint8_t **privkey, size_t *privkey_len, uint8
}

out:
if (nlg)
if (nlg) {
mnlg_socket_close(nlg);
nlg = NULL;
}
if (ret) {
if (*privkey) {
memzero_explicit(*privkey, *privkey_len);
Expand Down Expand Up @@ -641,11 +647,13 @@ static int parse_pubkey(const struct nlattr *attr, void *data)
case WGDEVICE_A_PUBLIC_KEY:
if (! pubkey->pubkey)
return MNL_CB_OK;
*pubkey->pubkey_len = mnl_attr_get_payload_len(attr);
*pubkey->pubkey = malloc(*pubkey->pubkey_len);
if (mnl_attr_get_payload_len(attr) != WG_PUBLIC_KEY_LEN)
return MNL_CB_ERROR;
*pubkey->pubkey_len = WG_PUBLIC_KEY_LEN;
*pubkey->pubkey = malloc(WG_PUBLIC_KEY_LEN);
if (! *pubkey->pubkey)
return MNL_CB_ERROR;
memcpy(*pubkey->pubkey, mnl_attr_get_payload(attr), *pubkey->pubkey_len);
memcpy(*pubkey->pubkey, mnl_attr_get_payload(attr), WG_PUBLIC_KEY_LEN);
break;
}

Expand Down Expand Up @@ -691,8 +699,10 @@ static int kernel_derive_pubkey(const uint8_t *privkey, size_t privkey_len, uint
}

out:
if (nlg)
if (nlg) {
mnlg_socket_close(nlg);
nlg = NULL;
}
if (ret) {
if (*pubkey) {
free(*pubkey);
Expand All @@ -717,11 +727,13 @@ static int parse_psk(const struct nlattr *attr, void *data)

switch (mnl_attr_get_type(attr)) {
case WGDEVICE_A_PRESHARED_KEY:
*psk->psk_len = mnl_attr_get_payload_len(attr);
*psk->psk = malloc(*psk->psk_len);
if (mnl_attr_get_payload_len(attr) != WG_SYMMETRIC_KEY_LEN)
return MNL_CB_ERROR;
*psk->psk_len = WG_SYMMETRIC_KEY_LEN;
*psk->psk = malloc(WG_SYMMETRIC_KEY_LEN);
if (! *psk->psk)
return MNL_CB_ERROR;
memcpy(*psk->psk, mnl_attr_get_payload(attr), *psk->psk_len);
memcpy(*psk->psk, mnl_attr_get_payload(attr), WG_SYMMETRIC_KEY_LEN);
break;
}

Expand Down Expand Up @@ -766,8 +778,10 @@ static int kernel_generate_psk(uint8_t **psk, size_t *psk_len)
}

out:
if (nlg)
if (nlg) {
mnlg_socket_close(nlg);
nlg = NULL;
}
if (ret) {
if (*psk) {
memzero_explicit(*psk, *psk_len);
Expand Down