openharmony/third_party_libnl
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_libnl synced 2025-02-25 22:07:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

xfrm: attach only one xfrm alg attribute to netlink message

Browse Source 
The kernel only uses the xfrm alg auth attribute if the xfrm alg auth
truncated attribute is not present. Hence sending both attributes in one
message does not make sense.
This piece of code also removes the call to nla_reserve in favor of the
NLA_PUT macro.

Signed-off-by: Thomas Egerer <thomas.egerer@secunet.com>
Signed-off-by: Thomas Haller <thaller@redhat.com>

http://lists.infradead.org/pipermail/libnl/2016-June/002139.html
This commit is contained in:
Thomas Egerer 2016-06-10 11:57:57 +02:00 committed by Thomas Haller
parent 01bd6ef7e0
commit 6db1547c0d
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/xfrm/sa.c
View File

@ -1157,20 +1157,25 @@ static int build_xfrm_sa_message(struct xfrmnl_sa *tmpl, int cmd, int flags, str
}
if (tmpl->ce_mask & XFRM_SA_ATTR_ALG_AUTH) {
struct xfrm_algo* auth;
struct nlattr * auth_attr;
/* kernel prefers XFRMA_ALG_AUTH_TRUNC over XFRMA_ALG_AUTH, so only
* one of the attributes needs to be present */
if (tmpl->auth->alg_trunc_len) {
len = sizeof (struct xfrm_algo_auth) + ((tmpl->auth->alg_key_len + 7) / 8);
NLA_PUT (msg, XFRMA_ALG_AUTH_TRUNC, len, tmpl->auth);
} else {
struct xfrm_algo *auth;
len = sizeof (struct xfrm_algo) + ((tmpl->auth->alg_key_len + 7) / 8);
auth_attr = nla_reserve(msg, XFRMA_ALG_AUTH, len);
if (!auth_attr)
goto nla_put_failure;
auth = nla_data (auth_attr);
strcpy(auth->alg_name, tmpl->auth->alg_name);
memcpy(auth->alg_key, tmpl->auth->alg_key, (tmpl->auth->alg_key_len + 7) / 8);
auth->alg_key_len = tmpl->auth->alg_key_len;
len = sizeof (struct xfrm_algo) + ((tmpl->auth->alg_key_len + 7) / 8);
auth = malloc(len);
if (!auth)
return -NLE_NOMEM;
len = sizeof (struct xfrm_algo_auth) + ((tmpl->auth->alg_key_len + 7) / 8);
NLA_PUT (msg, XFRMA_ALG_AUTH_TRUNC, len, tmpl->auth);
strncpy(auth->alg_name, tmpl->auth->alg_name, sizeof(auth->alg_name));
auth->alg_key_len = tmpl->auth->alg_key_len;
memcpy(auth->alg_key, tmpl->auth->alg_key, (tmpl->auth->alg_key_len + 7) / 8);
NLA_PUT(msg, XFRMA_ALG_AUTH, len, auth);
free(auth);
}
}
if (tmpl->ce_mask & XFRM_SA_ATTR_ALG_CRYPT) {