denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Algorithm names are not always static anymore, avoid string overflows

Browse Source
This commit is contained in:
Tobias Brunner
2012-09-28 16:49:05 +02:00
parent f3d98a6b78
commit bef21bd330
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c
+10 -5
View File
@@ -1263,7 +1263,8 @@ METHOD(kernel_ipsec_t, add_sa, status_t,
algo = (struct xfrm_algo_aead*)RTA_DATA(rthdr); algo = (struct xfrm_algo_aead*)RTA_DATA(rthdr);
algo->alg_key_len = enc_key.len * 8; algo->alg_key_len = enc_key.len * 8;
algo->alg_icv_len = icv_size; algo->alg_icv_len = icv_size;
strcpy(algo->alg_name, alg_name); strncpy(algo->alg_name, alg_name, sizeof(algo->alg_name));
algo->alg_name[sizeof(algo->alg_name) - 1] = '\0';
memcpy(algo->alg_key, enc_key.ptr, enc_key.len); memcpy(algo->alg_key, enc_key.ptr, enc_key.len);
rthdr = XFRM_RTA_NEXT(rthdr); rthdr = XFRM_RTA_NEXT(rthdr);
@@ -1293,7 +1294,8 @@ METHOD(kernel_ipsec_t, add_sa, status_t,
algo = (struct xfrm_algo*)RTA_DATA(rthdr); algo = (struct xfrm_algo*)RTA_DATA(rthdr);
algo->alg_key_len = enc_key.len * 8; algo->alg_key_len = enc_key.len * 8;
strcpy(algo->alg_name, alg_name); strncpy(algo->alg_name, alg_name, sizeof(algo->alg_name));
algo->alg_name[sizeof(algo->alg_name) - 1] = '\0';
memcpy(algo->alg_key, enc_key.ptr, enc_key.len); memcpy(algo->alg_key, enc_key.ptr, enc_key.len);
rthdr = XFRM_RTA_NEXT(rthdr); rthdr = XFRM_RTA_NEXT(rthdr);
@@ -1347,7 +1349,8 @@ METHOD(kernel_ipsec_t, add_sa, status_t,
algo = (struct xfrm_algo_auth*)RTA_DATA(rthdr); algo = (struct xfrm_algo_auth*)RTA_DATA(rthdr);
algo->alg_key_len = int_key.len * 8; algo->alg_key_len = int_key.len * 8;
algo->alg_trunc_len = trunc_len; algo->alg_trunc_len = trunc_len;
strcpy(algo->alg_name, alg_name); strncpy(algo->alg_name, alg_name, sizeof(algo->alg_name));
algo->alg_name[sizeof(algo->alg_name) - 1] = '\0';
memcpy(algo->alg_key, int_key.ptr, int_key.len); memcpy(algo->alg_key, int_key.ptr, int_key.len);
} }
else else
@@ -1365,7 +1368,8 @@ METHOD(kernel_ipsec_t, add_sa, status_t,
algo = (struct xfrm_algo*)RTA_DATA(rthdr); algo = (struct xfrm_algo*)RTA_DATA(rthdr);
algo->alg_key_len = int_key.len * 8; algo->alg_key_len = int_key.len * 8;
strcpy(algo->alg_name, alg_name); strncpy(algo->alg_name, alg_name, sizeof(algo->alg_name));
algo->alg_name[sizeof(algo->alg_name) - 1] = '\0';
memcpy(algo->alg_key, int_key.ptr, int_key.len); memcpy(algo->alg_key, int_key.ptr, int_key.len);
} }
rthdr = XFRM_RTA_NEXT(rthdr); rthdr = XFRM_RTA_NEXT(rthdr);
@@ -1393,7 +1397,8 @@ METHOD(kernel_ipsec_t, add_sa, status_t,
struct xfrm_algo* algo = (struct xfrm_algo*)RTA_DATA(rthdr); struct xfrm_algo* algo = (struct xfrm_algo*)RTA_DATA(rthdr);
algo->alg_key_len = 0; algo->alg_key_len = 0;
strcpy(algo->alg_name, alg_name); strncpy(algo->alg_name, alg_name, sizeof(algo->alg_name));
algo->alg_name[sizeof(algo->alg_name) - 1] = '\0';
rthdr = XFRM_RTA_NEXT(rthdr); rthdr = XFRM_RTA_NEXT(rthdr);
} }