From patchwork Fri May 19 21:26:33 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: 9738201 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 70095601C2 for ; Fri, 19 May 2017 21:28:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 56341284B3 for ; Fri, 19 May 2017 21:28:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4A29F2850E; Fri, 19 May 2017 21:28:49 +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 C569B284B3 for ; Fri, 19 May 2017 21:28:48 +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=GpO1A7F3hNuR3nyzgya+yVo64QvVX9RwUYPBj2Nt7Dk=; b=i08Sf8NncRm9QgIl/XYbgvpwJ2 XAFneJlTpc0HgKQgL5R4LUMA1gDC/AGgQPnOd242ctc6XvdtVg4l3bxk5BmqQcKUlVOHfzDnRcT8Q muZlQJbShn7G0up5b/g91TPRe3DvfbvvbzyZPIOYeqTpK5ovn4pt+z3lb2vrj2x/7Zp9Z7JpSfQbY GH5Bhbsc+0wjqmSae0bYCTQkEeSe5zQcersiIMeoCe72Vjv7XpfLYqtSsXd8HjCWhbZ8cpNulNXpk 8rr0hRaB04kXE4EKttj2+xR+iwHSQz9WkwNTr4b2Y3YrtD5c6XHVd5xght4a2ZKbxDAceOeyxTZTt KO4+rJjw==; 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 1dBpS2-0002Yt-Go; Fri, 19 May 2017 21:28:46 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dBpR1-0001TX-T7 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=yGVd8bKjJrTfkiHGXVA5I7A3DmRN9LWMLBWdUM29ORM=; b=DpL/87FfW1/itonORfiUpjHYg 2rXeb1HZUy6d0mPsBtMdhjPEHerepIIxu6y2ZUAQgrBDtUBnlAWJJUkTHKTn7qoo2EqIv/GyQbN0s SNGhg7FIFBjcY+DSH6PQyvyhkfitj5X7bR4uYQJhSusr40Gpqqa0t/SwWzuoYvSlvPoB4mHQFtkVT QXA2iFoQ1yOFDbcWlYn6e1zLBh2K703z0QVNnKUl0JWj4RA0cWPa7wCDU/VfxsQzMKaQ3+G9hSbpK zo3JCp5y+mS7InSMjHU0Skv6xsyVa/O5UIAYPU/+A/D4n7eiNM4LmJpRdn0+NAeG6ivL1pAfxJLdy UghrYHlSQ==; Received: from shelob.surriel.com ([96.67.55.147]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dBpQw-0000Mj-Nd for linux-arm-kernel@lists.infradead.org; Fri, 19 May 2017 21:27:42 +0000 Received: from [2001:470:1f07:12aa: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-00048x-SJ; 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 v4JLQevt000754; Fri, 19 May 2017 17:26:40 -0400 Received: (from riel@localhost) by annuminas.surriel.com (8.15.2/8.15.2/Submit) id v4JLQeeN000753; 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 2/5] fork, random: use get_random_canary to set tsk->stack_canary Date: Fri, 19 May 2017 17:26:33 -0400 Message-Id: <20170519212636.30440-3-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_865052_F17E5AB3 X-CRM114-Status: GOOD ( 10.85 ) 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 --- kernel/fork.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/fork.c b/kernel/fork.c index aa1076c5e4a9..b3591e9250a8 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -560,7 +560,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig, int node) set_task_stack_end_magic(tsk); #ifdef CONFIG_CC_STACKPROTECTOR - tsk->stack_canary = get_random_long(); + tsk->stack_canary = get_random_canary(); #endif /*