From 2c6b25f01802808b142d450af3352605720899da Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 2 Jul 2013 10:46:10 +0200 Subject: libmount: be more restrictive about valid tag names # mount DUMMY=filename.img /mnt The 'DUMMY=filename.img' is a filename and should not be interpreted as tag name. The valid tag names are LABEL, UUID, PARTLABEL and PARTUUID only. Signed-off-by: Karel Zak --- libmount/src/cache.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) (limited to 'libmount/src/cache.c') diff --git a/libmount/src/cache.c b/libmount/src/cache.c index 7b651228a..43a4daf4f 100644 --- a/libmount/src/cache.c +++ b/libmount/src/cache.c @@ -583,22 +583,18 @@ error: char *mnt_resolve_spec(const char *spec, struct libmnt_cache *cache) { char *cn = NULL; + char *t = NULL, *v = NULL; if (!spec) return NULL; - if (strchr(spec, '=')) { - char *tag, *val; - - if (!blkid_parse_tag_string(spec, &tag, &val)) { - cn = mnt_resolve_tag(tag, val, cache); - - free(tag); - free(val); - } - } else + if (blkid_parse_tag_string(spec, &t, &v) == 0 && mnt_valid_tagname(t)) + cn = mnt_resolve_tag(t, v, cache); + else cn = mnt_resolve_path(spec, cache); + free(t); + free(v); return cn; } @@ -663,6 +659,7 @@ int test_read_tags(struct libmnt_test *ts, int argc, char *argv[]) while(fgets(line, sizeof(line), stdin)) { size_t sz = strlen(line); + char *t = NULL, *v = NULL; if (sz > 0 && line[sz - 1] == '\n') line[sz - 1] = '\0'; @@ -674,16 +671,14 @@ int test_read_tags(struct libmnt_test *ts, int argc, char *argv[]) if (mnt_cache_read_tags(cache, line) < 0) fprintf(stderr, "%s: read tags failed\n", line); - } else if (strchr(line, '=')) { - char *tag, *val; + } else if (blkid_parse_tag_string(line, &t, &v) == 0) { const char *cn = NULL; - if (!blkid_parse_tag_string(line, &tag, &val)) { - cn = cache_find_tag(cache, tag, val); + if (mnt_valid_tagname(t)) + cn = cache_find_tag(cache, t, v); + free(t); + free(v); - free(tag); - free(val); - } if (cn) printf("%s: %s\n", line, cn); else -- cgit v1.2.3-55-g7522