Received: by 2002:a17:90a:88:0:0:0:0 with SMTP id a8csp54769pja; Fri, 22 Nov 2019 03:22:28 -0800 (PST) X-Google-Smtp-Source: APXvYqxvWnrdJOnfVFMh/swMlenAvHdPZocei1xXRPxPRPXkennQ0JKW35jSj/VdZlcBuWWvq6S4 X-Received: by 2002:a05:6402:2049:: with SMTP id bc9mr414804edb.56.1574421748046; Fri, 22 Nov 2019 03:22:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574421748; cv=none; d=google.com; s=arc-20160816; b=EW0qiCHRmduGks4wMFVOq+U/5eJ3ExEKqUNvb49smpK4DAhS1U+LNjTyxNzganbofG smsHuLCoUr+zfJg0jpI/2KjGg5dtWvHUok5QU5lNR1mBhfSd1aEkfMNkzb8t5XpnPThW QMydQT8D+y8gnLDC8NSHC9HUE/kmlQ1oZCrGZGI/Ems6dkd7MIp75DSQ1NzVp+8s2T2k FOntneFU1f3kotO+h2YCOZHly3QRcUqYLchYRhxyKk30LIS39RQ85wqC7vNztAeZ5vP1 OE9PMKap1uJRiClG9n9tHtYiRBRKtiK7Q82wUq8xpl0XbnntW4jmskT/MJXcv0jdUnBT 19vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tSEHKzOWPSBTn9mzlL/nd8nk1xxKijpp74NoOBJYC7M=; b=lzIVzHSNV0XJNUg4cvTC1WBAfLIRV+NXyl1GdlyNMC6U460vj2uApSnQO9dScWGu4q woTCapa15YGi8k70VK/W7o9zFwnhhgwQaeHLn3TP/MgQHQgC/Uj48xVsNJrRjopPgdoR QJoboSPli/A5lm+JRsmweazXfLR2biAze/ia5DgpIygRcabl//FIW6NZlWHtKwHEmLDM MavWxKpHlx7HYi2aRc0L0vKbc2jB+T6Gjb0PdB+wDhsMX353cOPBvXT1SOUIf1gmWWkt DRVyodkEKIhiUWbiwWm5HsvwQKz5NN0HsilcbJZnN5bROXrC8vMEM7Mbc6LGC1bI/Sis poTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=m8Gxb4MO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t52si4747338edd.3.2019.11.22.03.22.04; Fri, 22 Nov 2019 03:22:28 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=m8Gxb4MO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730531AbfKVLRo (ORCPT + 99 others); Fri, 22 Nov 2019 06:17:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:57394 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729951AbfKVKs3 (ORCPT ); Fri, 22 Nov 2019 05:48:29 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DB08A2071F; Fri, 22 Nov 2019 10:48:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419709; bh=wuFV/Q3pP6kDQ8IyS7nsyXbODbwVXLDPUfz79SNORZk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m8Gxb4MOkYtjCYnqI75I1O8Q4IzpKwOj3CY9CD6BZG7dCyMfQPFelHkl8dtJCwNCb G8fRuqcGmZBYaKkz2UPrXrXkpku7cJnWYiQ+5x9BPsZOwJHmH8j3mHGQUJPPb5ndjN EM4gC1FWEyGPtiNj0Wo7rTu1+1or8ptKKZjd6KiY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Martin Schwidefsky , Vasily Gorbik , Sasha Levin Subject: [PATCH 4.9 203/222] s390/kasan: avoid vdso instrumentation Date: Fri, 22 Nov 2019 11:29:03 +0100 Message-Id: <20191122100916.925099032@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100830.874290814@linuxfoundation.org> References: <20191122100830.874290814@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vasily Gorbik [ Upstream commit 348498458505e202df41b6b9a78da448d39298b7 ] vdso is mapped into user space processes, which won't have kasan shodow mapped. Reviewed-by: Martin Schwidefsky Signed-off-by: Vasily Gorbik Signed-off-by: Martin Schwidefsky Signed-off-by: Sasha Levin --- arch/s390/kernel/vdso32/Makefile | 3 ++- arch/s390/kernel/vdso64/Makefile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/s390/kernel/vdso32/Makefile b/arch/s390/kernel/vdso32/Makefile index ca7c3c34f94ba..2bb3a255e51a4 100644 --- a/arch/s390/kernel/vdso32/Makefile +++ b/arch/s390/kernel/vdso32/Makefile @@ -24,9 +24,10 @@ obj-y += vdso32_wrapper.o extra-y += vdso32.lds CPPFLAGS_vdso32.lds += -P -C -U$(ARCH) -# Disable gcov profiling and ubsan for VDSO code +# Disable gcov profiling, ubsan and kasan for VDSO code GCOV_PROFILE := n UBSAN_SANITIZE := n +KASAN_SANITIZE := n # Force dependency (incbin is bad) $(obj)/vdso32_wrapper.o : $(obj)/vdso32.so diff --git a/arch/s390/kernel/vdso64/Makefile b/arch/s390/kernel/vdso64/Makefile index 84af2b6b64c42..76c56b5382be9 100644 --- a/arch/s390/kernel/vdso64/Makefile +++ b/arch/s390/kernel/vdso64/Makefile @@ -24,9 +24,10 @@ obj-y += vdso64_wrapper.o extra-y += vdso64.lds CPPFLAGS_vdso64.lds += -P -C -U$(ARCH) -# Disable gcov profiling and ubsan for VDSO code +# Disable gcov profiling, ubsan and kasan for VDSO code GCOV_PROFILE := n UBSAN_SANITIZE := n +KASAN_SANITIZE := n # Force dependency (incbin is bad) $(obj)/vdso64_wrapper.o : $(obj)/vdso64.so -- 2.20.1