If some of the arguments "check_at_most_once", "ignore_zero_blocks",
"use_fec_from_device", "root_hash_sig_key_desc" were specified more than
once on the target line, a memory leak would happen.
This commit fixes the memory leak. It also fixes error handling in
verity_verify_sig_parse_opt_args.
Signed-off-by: Mikulas Patocka <mpato...@redhat.com>
Cc: sta...@vger.kernel.org
---
drivers/md/dm-verity-fec.c | 4 ++++
drivers/md/dm-verity-target.c | 8 +++++++-
drivers/md/dm-verity-verify-sig.c | 17 +++++++++++++----
3 files changed, 24 insertions(+), 5 deletions(-)
Index: linux-2.6/drivers/md/dm-verity-fec.c
===================================================================
--- linux-2.6.orig/drivers/md/dm-verity-fec.c 2025-06-02 22:25:04.000000000
+0200
+++ linux-2.6/drivers/md/dm-verity-fec.c 2025-06-02 22:25:04.000000000
+0200
@@ -593,6 +593,10 @@ int verity_fec_parse_opt_args(struct dm_
(*argc)--;
if (!strcasecmp(arg_name, DM_VERITY_OPT_FEC_DEV)) {
+ if (v->fec->dev) {
+ ti->error = "FEC device already specified";
+ return -EINVAL;
+ }
r = dm_get_device(ti, arg_value, BLK_OPEN_READ, &v->fec->dev);
if (r) {
ti->error = "FEC device lookup failed";
Index: linux-2.6/drivers/md/dm-verity-target.c
===================================================================
--- linux-2.6.orig/drivers/md/dm-verity-target.c 2025-06-02
22:25:04.000000000 +0200
+++ linux-2.6/drivers/md/dm-verity-target.c 2025-06-03 18:32:01.000000000
+0200
@@ -1120,6 +1120,9 @@ static int verity_alloc_most_once(struct
{
struct dm_target *ti = v->ti;
+ if (v->validated_blocks)
+ return 0;
+
/* the bitset can only handle INT_MAX blocks */
if (v->data_blocks > INT_MAX) {
ti->error = "device too large to use check_at_most_once";
@@ -1143,6 +1146,9 @@ static int verity_alloc_zero_digest(stru
struct dm_verity_io *io;
u8 *zero_data;
+ if (v->zero_digest)
+ return 0;
+
v->zero_digest = kmalloc(v->digest_size, GFP_KERNEL);
if (!v->zero_digest)
@@ -1577,7 +1583,7 @@ static int verity_ctr(struct dm_target *
goto bad;
}
- /* Root hash signature is a optional parameter*/
+ /* Root hash signature is an optional parameter */
r = verity_verify_root_hash(root_hash_digest_to_validate,
strlen(root_hash_digest_to_validate),
verify_args.sig,
Index: linux-2.6/drivers/md/dm-verity-verify-sig.c
===================================================================
--- linux-2.6.orig/drivers/md/dm-verity-verify-sig.c 2025-06-02
22:25:04.000000000 +0200
+++ linux-2.6/drivers/md/dm-verity-verify-sig.c 2025-06-02 22:25:04.000000000
+0200
@@ -71,9 +71,14 @@ int verity_verify_sig_parse_opt_args(str
const char *arg_name)
{
struct dm_target *ti = v->ti;
- int ret = 0;
+ int ret;
const char *sig_key = NULL;
+ if (v->signature_key_desc) {
+ ti->error = DM_VERITY_VERIFY_ERR("root_hash_sig_key_desc
already specified");
+ return -EINVAL;
+ }
+
if (!*argc) {
ti->error = DM_VERITY_VERIFY_ERR("Signature key not specified");
return -EINVAL;
@@ -83,14 +88,18 @@ int verity_verify_sig_parse_opt_args(str
(*argc)--;
ret = verity_verify_get_sig_from_key(sig_key, sig_opts);
- if (ret < 0)
+ if (ret < 0) {
ti->error = DM_VERITY_VERIFY_ERR("Invalid key specified");
+ return ret;
+ }
v->signature_key_desc = kstrdup(sig_key, GFP_KERNEL);
- if (!v->signature_key_desc)
+ if (!v->signature_key_desc) {
+ ti->error = DM_VERITY_VERIFY_ERR("Could not allocate memory for
signature key");
return -ENOMEM;
+ }
- return ret;
+ return 0;
}
/*
