From patchwork Fri Dec 21 15:38:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 1017596 X-Patchwork-Delegate: hauke@hauke-m.de 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.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=hauke-m.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ak729O/4"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43Lt7x10rDz9sD4 for ; Sat, 22 Dec 2018 02:38:37 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=6iXemFNYOyMKeblwny5nrJdHDCFM0TpWS+85SpONUEQ=; b=ak729O/4rcqFzv V3JHSCP5y5WQ2ISvxfZsUz/8NhDOJjl87p2KnO4aVVb6RkbxQ2BtOe5DJhsun4WV6Q/cw9XcVFPQ3 38m/jCbJIE85rxYDG6qZuwnBhjj60xFeOars9r28kG+TSVJUEN22Vt3k/v31yy6XnUziuETa0XhVp X9//Xz6n/LAGHjfmwdeG6+62WWSzsA96h5rxjnajdD2+3KQZrrKZukV9J0tDtlVCqKFDSnhYsbGx6 RbXizZFKDt36aW+RcOwshvKwb7cvwSqEtNmaAKj3WunxFDjBreWgI5HIQaPgl1En7cTGy5AIblhAY RIhJZWTzeiiDmfuAi1QA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gaMsX-0000IQ-Aq; Fri, 21 Dec 2018 15:38:21 +0000 Received: from mx1.mailbox.org ([80.241.60.212]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gaMsT-0000Hg-W4 for openwrt-devel@lists.openwrt.org; Fri, 21 Dec 2018 15:38:19 +0000 Received: from smtp2.mailbox.org (unknown [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 5BFE540A41; Fri, 21 Dec 2018 16:38:13 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id 3cDAS54040NV; Fri, 21 Dec 2018 16:38:12 +0100 (CET) From: Hauke Mehrtens To: openwrt-devel@lists.openwrt.org Date: Fri, 21 Dec 2018 16:38:09 +0100 Message-Id: <20181221153809.4158-1-hauke@hauke-m.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181221_073818_180215_444942D5 X-CRM114-Status: GOOD ( 12.58 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [80.241.60.212 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record Subject: [OpenWrt-Devel] [PATCH] kernel: Fix KERNEL_STACKPROTECTOR on kernel 4.19 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hauke Mehrtens Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The configuration option was renamed with kernel 4.19 from CONFIG_CC_STACKPROTECTOR to CONFIG_STACKPROTECTOR adapt the code to set both options. CONFIG_STACKPROTECTOR now sets the regular stack protector and CONFIG_STACKPROTECTOR_STRONG activates the additional protection of more functions. Signed-off-by: Hauke Mehrtens --- config/Config-build.in | 8 ++++++++ target/linux/generic/config-4.19 | 6 ++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/config/Config-build.in b/config/Config-build.in index a082a5e0e2..8cbc16b5c8 100644 --- a/config/Config-build.in +++ b/config/Config-build.in @@ -234,6 +234,14 @@ menu "Global build settings" bool "Strong" endchoice + config KERNEL_STACKPROTECTOR + bool + default KERNEL_CC_STACKPROTECTOR_REGULAR || KERNEL_CC_STACKPROTECTOR_STRONG + + config KERNEL_STACKPROTECTOR_STRONG + bool + default KERNEL_CC_STACKPROTECTOR_STRONG + choice prompt "Enable buffer-overflows detection (FORTIFY_SOURCE)" default PKG_FORTIFY_SOURCE_1 diff --git a/target/linux/generic/config-4.19 b/target/linux/generic/config-4.19 index dc3d80b57f..0fc5ce6621 100644 --- a/target/linux/generic/config-4.19 +++ b/target/linux/generic/config-4.19 @@ -745,10 +745,6 @@ CONFIG_CARDBUS=y # CONFIG_CCS811 is not set CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -# CONFIG_CC_STACKPROTECTOR is not set -CONFIG_CC_STACKPROTECTOR_NONE=y -# CONFIG_CC_STACKPROTECTOR_REGULAR is not set -# CONFIG_CC_STACKPROTECTOR_STRONG is not set # CONFIG_CDROM_PKTCDVD is not set # CONFIG_CEPH_FS is not set # CONFIG_CEPH_LIB is not set @@ -1650,6 +1646,7 @@ CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_NMI=y +CONFIG_HAVE_STACKPROTECTOR=y # CONFIG_HCALL_STATS is not set # CONFIG_HDC100X is not set # CONFIG_HDLC is not set @@ -4942,6 +4939,7 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_SSB_SILENT is not set # CONFIG_SSFDC is not set # CONFIG_STACKPROTECTOR is not set +# CONFIG_STACKPROTECTOR_STRONG is not set # CONFIG_STACKTRACE is not set CONFIG_STACKTRACE_SUPPORT=y # CONFIG_STACK_TRACER is not set