From patchwork Sun Jan 19 13:10:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Hicks X-Patchwork-Id: 1225448 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 480wCn6llSz9sRR; Mon, 20 Jan 2020 00:11:01 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1itALx-0007JD-Gz; Sun, 19 Jan 2020 13:10:57 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1itALu-0007HU-PG for kernel-team@lists.ubuntu.com; Sun, 19 Jan 2020 13:10:54 +0000 Received: from 2.general.tyhicks.uk.vpn ([10.172.192.53] helo=sec.lxd) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1itALt-0004re-Sa; Sun, 19 Jan 2020 13:10:54 +0000 From: Tyler Hicks To: kernel-team@lists.ubuntu.com Subject: [PATCH 4/8] UBUNTU: [Config] Enable scatterlist validation Date: Sun, 19 Jan 2020 13:10:25 +0000 Message-Id: <20200119131029.23160-5-tyhicks@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200119131029.23160-1-tyhicks@canonical.com> References: <20200119131029.23160-1-tyhicks@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://launchpad.net/bugs/1855336 Enable CONFIG_DEBUG_SG to perform sanity checks when performing operations on scatterlists. If a sanity check fails a loud warning is printed to the logs. This change may help in detection of an attack that relies on scatterlist manipulation. Signed-off-by: Tyler Hicks --- debian.master/config/annotations | 3 ++- debian.master/config/config.common.ubuntu | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 3ce3a62a8d7d..5bd7b6a2bda2 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -10623,7 +10623,7 @@ CONFIG_DEBUG_KOBJECT policy<{'amd64': 'n', 'arm64': ' CONFIG_DEBUG_BUGVERBOSE policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_DEBUG_LIST policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_DEBUG_PLIST policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}> -CONFIG_DEBUG_SG policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}> +CONFIG_DEBUG_SG policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_DEBUG_NOTIFIERS policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}> CONFIG_DEBUG_CREDENTIALS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_DEBUG_WQ_FORCE_RR_CPU policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}> @@ -10633,6 +10633,7 @@ CONFIG_LATENCYTOP policy<{'amd64-generic': 'n', 'a # CONFIG_DEBUG_LIST mark note CONFIG_DEBUG_CREDENTIALS mark note +CONFIG_DEBUG_SG mark note CONFIG_LATENCYTOP mark note # Menu: Kernel hacking >> Kernel debugging >> Architecture: arm diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index f989a8ba30ca..46309da0e559 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2346,7 +2346,7 @@ CONFIG_DEBUG_MISC=y # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_DEBUG_RWSEMS is not set # CONFIG_DEBUG_SECTION_MISMATCH is not set -# CONFIG_DEBUG_SG is not set +CONFIG_DEBUG_SG=y # CONFIG_DEBUG_SHIRQ is not set # CONFIG_DEBUG_SPINLOCK is not set # CONFIG_DEBUG_STACKOVERFLOW is not set