[LTP] [PATCH v3 1/1] tst_kvcmp: Strip double quotes when parsing /etc/os-release

[LTP] [PATCH v3 1/1] tst_kvcmp: Strip double quotes when parsing /etc/os-release

[Petr Vorel]

ID is normally without double quotes, e.g.: ID=debian

But at least SLES and openSUSE contain double quotes, e.g.:
ID="opensuse-tumbleweed"

thus optionally strip the double quotes after scanning them.

Fixes: e2e60a39b ("lib/tst_kvercmp: Add support /etc/os-release")

Suggested-by: Cyril Hrubis <chrubis@suse.cz>
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
 lib/tst_kvercmp.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/tst_kvercmp.c b/lib/tst_kvercmp.c
index 185a5c39c..5d56e30b9 100644
--- a/lib/tst_kvercmp.c
+++ b/lib/tst_kvercmp.c
@@ -131,6 +131,7 @@ int tst_kvexcmp(const char *tst_exv, const char *cur_ver)
 const char *tst_kvcmp_distname(const char *kver)
 {
 	static char distname[64];
+	char *ret = distname;
 	char *p = distname;
 
 	if (strstr(kver, ".el5uek"))
@@ -148,12 +149,21 @@ const char *tst_kvcmp_distname(const char *kver)
 	if (access(OSRELEASE_PATH, F_OK) != -1) {
 		SAFE_FILE_LINES_SCANF(NULL, OSRELEASE_PATH, "ID=%s", distname);
 
+		if (p[0] == '"') {
+			ret = distname + 1;
+			p = ret;
+		}
+
 		while (*p) {
+			if (*p == '"') {
+				*p = 0;
+				break;
+			}
 			*p = toupper((unsigned char)*p);
 			p++;
 		}
 
-		return distname;
+		return ret;
 	}
 
 	return NULL;
-- 
2.28.0

[LTP] [PATCH v3 1/1] tst_kvcmp: Strip double quotes when parsing /etc/os-release

[Cyril Hrubis]

Hi!
Looks good to me.

Reviewed-by: Cyril Hrubis <chrubis@suse.cz>

-- 
Cyril Hrubis
chrubis@suse.cz

[LTP] [PATCH v3 1/1] tst_kvcmp: Strip double quotes when parsing /etc/os-release

[Po-Hsu Lin]

LGTM,
Tested with crafted ID, it can correctly parse the ID with or without
the double quote.

Another thing to note is that I found the loop in tst_kvercmp2 could
iterate outside the size of "vers" and causing
tst_test.c:1298: BROK: Test killed by SIGSEGV!

Reviewed-by: Po-Hsu Lin <po-hsu.lin@canonical.com>

On Thu, Aug 20, 2020 at 9:45 PM Cyril Hrubis <chrubis@suse.cz> wrote:
>
> Hi!
> Looks good to me.
>
> Reviewed-by: Cyril Hrubis <chrubis@suse.cz>
>
> --
> Cyril Hrubis
> chrubis@suse.cz

[LTP] [PATCH v3 1/1] tst_kvcmp: Strip double quotes when parsing /etc/os-release

[Petr Vorel]

Hi Po-Hsu,

> LGTM,
> Tested with crafted ID, it can correctly parse the ID with or without
> the double quote.

> Another thing to note is that I found the loop in tst_kvercmp2 could
> iterate outside the size of "vers" and causing
> tst_test.c:1298: BROK: Test killed by SIGSEGV!
Will you post the patch for this?

> Reviewed-by: Po-Hsu Lin <po-hsu.lin@canonical.com>
I'm sorry, I've merged it before, but forget to notify.
Is the bug mentioned above related to my commit?

Kind regards,
Petr

[LTP] [PATCH v3 1/1] tst_kvcmp: Strip double quotes when parsing /etc/os-release

[Po-Hsu Lin]

On Fri, Aug 21, 2020 at 4:33 AM Petr Vorel <pvorel@suse.cz> wrote:
>
> Hi Po-Hsu,
>
> > LGTM,
> > Tested with crafted ID, it can correctly parse the ID with or without
> > the double quote.
>
> > Another thing to note is that I found the loop in tst_kvercmp2 could
> > iterate outside the size of "vers" and causing
> > tst_test.c:1298: BROK: Test killed by SIGSEGV!
> Will you post the patch for this?
>
> > Reviewed-by: Po-Hsu Lin <po-hsu.lin@canonical.com>
> I'm sorry, I've merged it before, but forget to notify.
> Is the bug mentioned above related to my commit?
Hello Petr,
Don't worry it's not related to this commit :)
I will have a look at that bug.

Cheers
>
> Kind regards,
> Petr