From patchwork Fri May 19 21:26:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rik van Riel X-Patchwork-Id: 9738209 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6280A601C2 for ; Fri, 19 May 2017 21:32:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4834828474 for ; Fri, 19 May 2017 21:32:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3CCB8284B3; Fri, 19 May 2017 21:32:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4E96F28474 for ; Fri, 19 May 2017 21:32:16 +0000 (UTC) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=2xCEfkCzfXsQieegM+6DsgRMt8MAINbCsJxaTFrH4SY=; b=n2fMaya6FvUOBsXf1D2+5so5gX BigyGg0TTUzxzNQN7O+0rUPIpCeo24+bewuWV2dx5VscncWuDKyGc3VtTiNegc1sG2a4mBfRT1gNJ g52XbsYCn3TAKR30lvDTt7G3K2q47oxIT2466XWl4fM+8KA5bbjno+ufdyg+TX1B3LHEniZ+JD81M RR8XY7IUopq2DGUwZ8nMSvdykUIW2qP5RXIMOfrayd2A8bY+ZarJJAoVPswlRMqevjNZ3BYIBfJjX l1ef+RiX2lZ3cVm3QwvMumZBQQpTBzQs0A8RlPc1YpA/ziWjTkXHNX6kmlk6HlihkAtLkoooa87i9 6du4rRTg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dBpVN-0004bc-8F; Fri, 19 May 2017 21:32:13 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dBpR2-0001TY-0p for linux-arm-kernel@bombadil.infradead.org; Fri, 19 May 2017 21:27:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=wL50qDZ2j4Phvb4M+1vlR0++zyS+meWK+UsRkJ1elr8=; b=rhWSK4jPvpa1uKF1mu34z7BZB fH5hNpq/3Wuoh9+t3x1Hdk3PjkyZGZZflRarVOu47ZLkzT25v37+HR8SP9q95jV4X6OiVKRWZwYld BV6xzG+6xWOJAaDkXKq1eVL6sjVSm5Jm0Wp5/bKH+WDFmmkvcUAbTT5Z/keBKlV2lui+PeVbD4fOY OybxbM6v2dycOSH2HyyuyW8eFWu1b35Bq08zvIkO4uVihgk1R+Fq9SEB76ThEcxD5ZozSmWS0CeFS zhX4In767wRwqtM+EN3rRqkzcqGELwhMHAmbUXQfv77IAi7b+AI2XrhZRykt34hMe/KrMSb0snyEU nkyA3SsIA==; Received: from shelob.surriel.com ([96.67.55.147]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dBpQw-0000Mi-Oz for linux-arm-kernel@lists.infradead.org; Fri, 19 May 2017 21:27:42 +0000 Received: from [2603:3005:d05:2b00:224:e8ff:fe38:995c] (helo=annuminas.surriel.com) by shelob.surriel.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1dBpQ0-000493-Tc; Fri, 19 May 2017 17:26:40 -0400 Received: from annuminas.surriel.com (localhost.localdomain [127.0.0.1]) by annuminas.surriel.com (8.15.2/8.14.5) with ESMTP id v4JLQeBg000769; Fri, 19 May 2017 17:26:40 -0400 Received: (from riel@localhost) by annuminas.surriel.com (8.15.2/8.15.2/Submit) id v4JLQeNS000768; Fri, 19 May 2017 17:26:40 -0400 X-Authentication-Warning: annuminas.surriel.com: riel set sender to riel@redhat.com using -f From: riel@redhat.com To: linux-kernel@vger.kernel.org Subject: [PATCH 5/5] sh64: ascii armor the sh64 boot init stack canary Date: Fri, 19 May 2017 17:26:36 -0400 Message-Id: <20170519212636.30440-6-riel@redhat.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170519212636.30440-1-riel@redhat.com> References: <20170519212636.30440-1-riel@redhat.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170519_222738_907162_4F224885 X-CRM114-Status: UNSURE ( 8.70 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: tytso@mit.edu, keescook@chromium.org, ysato@users.sourceforge.jp, linux-sh@vger.kernel.org, catalin.marinas@arm.com, x86@kernel.org, luto@amacapital.net, danielmicay@gmail.com, hpa@zytor.com, mingo@kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Rik van Riel Use the ascii-armor canary to prevent unterminated C string overflows from being able to successfully overwrite the canary, even if they somehow obtain the canary value. Inspired by execshield ascii-armor and PaX/grsecurity. Signed-off-by: Rik van Riel --- arch/sh/include/asm/stackprotector.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/sh/include/asm/stackprotector.h b/arch/sh/include/asm/stackprotector.h index d9df3a76847c..141515a43b78 100644 --- a/arch/sh/include/asm/stackprotector.h +++ b/arch/sh/include/asm/stackprotector.h @@ -19,6 +19,7 @@ static __always_inline void boot_init_stack_canary(void) /* Try to get a semi random initial value. */ get_random_bytes(&canary, sizeof(canary)); canary ^= LINUX_VERSION_CODE; + canary &= CANARY_MASK; current->stack_canary = canary; __stack_chk_guard = current->stack_canary;