From patchwork Thu Mar 7 09:45:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Baier X-Patchwork-Id: 1052753 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.cz Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44FQjl0gGVz9sD4 for ; Thu, 7 Mar 2019 20:45:47 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 47E4F3EA2E9 for ; Thu, 7 Mar 2019 10:45:44 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-6.smtp.seeweb.it (in-6.smtp.seeweb.it [IPv6:2001:4b78:1:20::6]) by picard.linux.it (Postfix) with ESMTP id CF4C73EA23F for ; Thu, 7 Mar 2019 10:45:42 +0100 (CET) Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-6.smtp.seeweb.it (Postfix) with ESMTPS id 2B3C21401B8D for ; Thu, 7 Mar 2019 10:45:40 +0100 (CET) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 76F50B817 for ; Thu, 7 Mar 2019 09:45:40 +0000 (UTC) Received: by caladan.suse.cz (Postfix, from userid 1199) id D7DE04C7B39; Thu, 7 Mar 2019 10:45:39 +0100 (CET) From: Jan Baier To: ltp@lists.linux.it Date: Thu, 7 Mar 2019 10:45:31 +0100 Message-Id: <20190307094531.21832-1-jbaier@suse.cz> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-6.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=-0.0 required=7.0 tests=SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-6.smtp.seeweb.it Subject: [LTP] [PATCH] sysctl01: fix fails on live-patched kernels X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Version from uname and /proc/sys/kernel/version does not match on live-patched kernels (bsc#1100130, poo#38483). Adjust the string from uname in such cases. Signed-off-by: Jan Baier --- testcases/kernel/syscalls/sysctl/sysctl01.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git testcases/kernel/syscalls/sysctl/sysctl01.c testcases/kernel/syscalls/sysctl/sysctl01.c index 70905d806..fda29f060 100644 --- testcases/kernel/syscalls/sysctl/sysctl01.c +++ testcases/kernel/syscalls/sysctl/sysctl01.c @@ -1,6 +1,7 @@ /* * Copyright (c) International Business Machines Corp., 2001 * Copyright (c) 2018 Xiao Yang + * Copyright (c) 2019 SUSE. All Rights Reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -77,6 +78,19 @@ static void setup(void) /* get kernel name and information */ if (uname(&buf) == -1) tst_brk(TBROK | TERRNO, "uname() failed"); + + /* revert uname change in case of kGraft/livepatch */ + char *klp_tag; + char *right_brace; + + klp_tag = strstr(buf.version, "/kGraft-"); + if (!klp_tag) + klp_tag = strstr(buf.version, "/lp-"); + if (klp_tag) { + right_brace = strchr(klp_tag, ')'); + if (right_brace) + strcpy(klp_tag, right_brace); + } } static struct tst_test test = {