From 2b6808f165d5fd22c2158d141f14886c7f8de598 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Wed, 14 Feb 2018 18:23:25 +0100 Subject: [PATCH] Fix some anoying gcc buffer size warnings. --- lib/libdevmapper.c | 4 ++-- lib/luks2/luks2_json_metadata.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libdevmapper.c b/lib/libdevmapper.c index b3579ba1..16a6870e 100644 --- a/lib/libdevmapper.c +++ b/lib/libdevmapper.c @@ -457,7 +457,7 @@ static int cipher_c2dm(const char *org_c, const char *org_i, unsigned tag_size, static int cipher_dm2c(char **org_c, char **org_i, const char *c_dm, const char *i_dm) { char cipher[CLEN], mode[CLEN], iv[CLEN], auth[CLEN]; - char tmp[CAPIL], capi[CAPIL]; + char tmp[CAPIL*2], capi[CAPIL]; size_t len; int i; @@ -523,7 +523,7 @@ static char *get_dm_crypt_params(struct crypt_dm_active_device *dmd, uint32_t fl { int r, max_size, null_cipher = 0, num_options = 0, keystr_len = 0; char *params, *hexkey; - char sector_feature[32], features[256], integrity_dm[256], cipher_dm[256]; + char sector_feature[32], features[512], integrity_dm[256], cipher_dm[256]; if (!dmd) return NULL; diff --git a/lib/luks2/luks2_json_metadata.c b/lib/luks2/luks2_json_metadata.c index f3bf43a2..462e7bbb 100644 --- a/lib/luks2/luks2_json_metadata.c +++ b/lib/luks2/luks2_json_metadata.c @@ -1829,7 +1829,7 @@ int LUKS2_activate(struct crypt_device *cd, .sector_size = crypt_get_sector_size(cd) } }; - char dm_int_name[PATH_MAX], dm_int_dev_name[PATH_MAX]; + char dm_int_name[512], dm_int_dev_name[PATH_MAX]; struct device *device = NULL; /* do not allow activation when particular requirements detected */