From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13B2DC432C3 for ; Thu, 21 Nov 2019 18:15:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D6455206CC for ; Thu, 21 Nov 2019 18:15:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="AUOvfPWM" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727123AbfKUSPe (ORCPT ); Thu, 21 Nov 2019 13:15:34 -0500 Received: from mail-pj1-f65.google.com ([209.85.216.65]:34819 "EHLO mail-pj1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727099AbfKUSPc (ORCPT ); Thu, 21 Nov 2019 13:15:32 -0500 Received: by mail-pj1-f65.google.com with SMTP id s8so1847659pji.2 for ; Thu, 21 Nov 2019 10:15:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0T61AzxnAvwa4rB+CZumfDDidufAJnp+U8GPCQMxTB4=; b=AUOvfPWMFq4respwzA0a7ruKECsyXNc2uFyzNEbqSnofRJKhfkixrJJ0M+DfKvrJxy OyeHQu1ARk/u7CyYkgiVLfxU9mPHkRpyTfW0lX3RFQNpV30KQ8mB5qjnK2AK8Db4f/BI V7fIe1AlaR3RbttdT03b1f/4luN3yqTzQl3gs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0T61AzxnAvwa4rB+CZumfDDidufAJnp+U8GPCQMxTB4=; b=o+D/s/lFCKu7P8HSYs/N++op9Jl6KSkO4hx6OWqUtLKYspsYAOZanq1nXnxSwm1i1w D5Wn+rwp87yyQ/OBk1pDmV7z0Qvv0rbdtxMexBqblHLM8Yku7soPrvBT+Hx5EWWdyoDM W8bDXRRT4Vi+80zB0HZmwCEd7qv45Zntsi66NRi1u8kgyeCVmBj+d57J1fXE2jFQs+TA 8r3iOto/rV8cTbgXm11+zg6Vkq/r3nAO6LioPqtnxM+RwnK/0c9SpZvgYzPV9yXLyVzA McJ+9NryqPQJ3VnKhYMXxAvsnxERzvn666Dia/nMdbuOlRgwB5b+7YKuKEawO9j2rV0N 7XEQ== X-Gm-Message-State: APjAAAW4Yut9K6AZlqnh2BckguMlqJHKiKfhSiReOMtKiM5a7J1iQR6O 9CuJ6VZTBpJ/XMyuZxlTTjSkLA== X-Google-Smtp-Source: APXvYqwYaxQm1EsXEJba84FDgOq6w11jd48NYQ2iAFZdb0g9WHYhwZWRGHcjD+YTLE62j1VjOIgDnw== X-Received: by 2002:a17:90a:3d01:: with SMTP id h1mr13598717pjc.15.1574360131608; Thu, 21 Nov 2019 10:15:31 -0800 (PST) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id o23sm3964733pgj.90.2019.11.21.10.15.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Nov 2019 10:15:28 -0800 (PST) From: Kees Cook To: Andrew Morton Cc: Kees Cook , Andrey Ryabinin , Elena Petrova , Alexander Potapenko , Dmitry Vyukov , Linus Torvalds , Dan Carpenter , "Gustavo A. R. Silva" , Arnd Bergmann , Ard Biesheuvel , kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, kernel-hardening@lists.openwall.com Subject: [PATCH v2 3/3] lkdtm/bugs: Add arithmetic overflow and array bounds checks Date: Thu, 21 Nov 2019 10:15:19 -0800 Message-Id: <20191121181519.28637-4-keescook@chromium.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191121181519.28637-1-keescook@chromium.org> References: <20191121181519.28637-1-keescook@chromium.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Adds LKDTM tests for arithmetic overflow (both signed and unsigned), as well as array bounds checking. Signed-off-by: Kees Cook --- drivers/misc/lkdtm/bugs.c | 75 ++++++++++++++++++++++++++++++++++++++ drivers/misc/lkdtm/core.c | 3 ++ drivers/misc/lkdtm/lkdtm.h | 3 ++ 3 files changed, 81 insertions(+) diff --git a/drivers/misc/lkdtm/bugs.c b/drivers/misc/lkdtm/bugs.c index 7284a22b1a09..8b4ef30f53c6 100644 --- a/drivers/misc/lkdtm/bugs.c +++ b/drivers/misc/lkdtm/bugs.c @@ -11,6 +11,7 @@ #include #include #include +#include struct lkdtm_list { struct list_head node; @@ -171,6 +172,80 @@ void lkdtm_HUNG_TASK(void) schedule(); } +volatile unsigned int huge = INT_MAX - 2; +volatile unsigned int ignored; + +void lkdtm_OVERFLOW_SIGNED(void) +{ + int value; + + value = huge; + pr_info("Normal signed addition ...\n"); + value += 1; + ignored = value; + + pr_info("Overflowing signed addition ...\n"); + value += 4; + ignored = value; +} + + +void lkdtm_OVERFLOW_UNSIGNED(void) +{ + unsigned int value; + + value = huge; + pr_info("Normal unsigned addition ...\n"); + value += 1; + ignored = value; + + pr_info("Overflowing unsigned addition ...\n"); + value += 4; + ignored = value; +} + +/* Intentially using old-style flex array definition of 1 byte. */ +struct array_bounds_flex_array { + int one; + int two; + char data[1]; +}; + +struct array_bounds { + int one; + int two; + char data[8]; + int three; +}; + +void lkdtm_ARRAY_BOUNDS(void) +{ + struct array_bounds_flex_array *not_checked; + struct array_bounds *checked; + int i; + + not_checked = kmalloc(sizeof(*not_checked) * 2, GFP_KERNEL); + checked = kmalloc(sizeof(*checked) * 2, GFP_KERNEL); + + pr_info("Array access within bounds ...\n"); + /* For both, touch all bytes in the actual member size. */ + for (i = 0; i < sizeof(checked->data); i++) + checked->data[i] = 'A'; + /* + * For the uninstrumented flex array member, also touch 1 byte + * beyond to verify it is correctly uninstrumented. + */ + for (i = 0; i < sizeof(not_checked->data) + 1; i++) + not_checked->data[i] = 'A'; + + pr_info("Array access beyond bounds ...\n"); + for (i = 0; i < sizeof(checked->data) + 1; i++) + checked->data[i] = 'B'; + + kfree(not_checked); + kfree(checked); +} + void lkdtm_CORRUPT_LIST_ADD(void) { /* diff --git a/drivers/misc/lkdtm/core.c b/drivers/misc/lkdtm/core.c index cbc4c9045a99..25879f7b0768 100644 --- a/drivers/misc/lkdtm/core.c +++ b/drivers/misc/lkdtm/core.c @@ -129,6 +129,9 @@ static const struct crashtype crashtypes[] = { CRASHTYPE(HARDLOCKUP), CRASHTYPE(SPINLOCKUP), CRASHTYPE(HUNG_TASK), + CRASHTYPE(OVERFLOW_SIGNED), + CRASHTYPE(OVERFLOW_UNSIGNED), + CRASHTYPE(ARRAY_BOUNDS), CRASHTYPE(EXEC_DATA), CRASHTYPE(EXEC_STACK), CRASHTYPE(EXEC_KMALLOC), diff --git a/drivers/misc/lkdtm/lkdtm.h b/drivers/misc/lkdtm/lkdtm.h index ab446e0bde97..2cd0c5031eea 100644 --- a/drivers/misc/lkdtm/lkdtm.h +++ b/drivers/misc/lkdtm/lkdtm.h @@ -22,6 +22,9 @@ void lkdtm_SOFTLOCKUP(void); void lkdtm_HARDLOCKUP(void); void lkdtm_SPINLOCKUP(void); void lkdtm_HUNG_TASK(void); +void lkdtm_OVERFLOW_SIGNED(void); +void lkdtm_OVERFLOW_UNSIGNED(void); +void lkdtm_ARRAY_BOUNDS(void); void lkdtm_CORRUPT_LIST_ADD(void); void lkdtm_CORRUPT_LIST_DEL(void); void lkdtm_CORRUPT_USER_DS(void); -- 2.17.1