linux-kernel - [PATCH] x86/paravirt: Get rid of patch

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20180907104917.12502-1-bp@alien8.de>
Date:   Fri,  7 Sep 2018 12:49:17 +0200
From:   Borislav Petkov <bp@...en8.de>
To:     LKML <linux-kernel@...r.kernel.org>
Cc:     Juergen Gross <jgross@...e.com>, x86@...nel.org,
        virtualization@...ts.linux-foundation.org
Subject: [PATCH] x86/paravirt: Get rid of patch_site label

From: Borislav Petkov <bp@...e.de>

When CONFIG_PARAVIRT_SPINLOCKS=n, it fires

  arch/x86/kernel/paravirt_patch_64.c: In function ‘native_patch’:
  arch/x86/kernel/paravirt_patch_64.c:89:1: warning: label ‘patch_site’ defined but not used [-Wunused-label]
   patch_site:

but that label can simply be removed by directly calling
paravirt_patch_insns() there.

Signed-off-by: Borislav Petkov <bp@...e.de>
Cc: Juergen Gross <jgross@...e.com>
Cc: x86@...nel.org
Cc: virtualization@...ts.linux-foundation.org
---
 arch/x86/kernel/paravirt_patch_64.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c
index 5ad5bcda9dc6..f09d264cbd2d 100644
--- a/arch/x86/kernel/paravirt_patch_64.c
+++ b/arch/x86/kernel/paravirt_patch_64.c
@@ -76,7 +76,8 @@ unsigned native_patch(u8 type, void *ibuf, unsigned long addr, unsigned len)
 			if (pv_is_native_vcpu_is_preempted()) {
 				start = start_lock_vcpu_is_preempted;
 				end   = end_lock_vcpu_is_preempted;
-				goto patch_site;
+
+				return paravirt_patch_insns(ibuf, len, start, end);
 			}
 			goto patch_default;
 #endif
@@ -86,7 +87,6 @@ patch_default: __maybe_unused
 		ret = paravirt_patch_default(type, ibuf, addr, len);
 		break;
 
-patch_site:
 		ret = paravirt_patch_insns(ibuf, len, start, end);
 		break;
 	}
-- 
2.17.0.582.gccdcbd54c