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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 548C8C41621 for ; Tue, 24 Mar 2020 15:37:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2E63720788 for ; Tue, 24 Mar 2020 15:37:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585064261; bh=ieuN1NJTq+9heb9k5hJc1KkJB7zqBNtgCKe1hqkqObc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LfSvxKxdTnvb1949hXQzBrl6lyuXqfwwe1Cx0QEu0aXjoTbVIhCI/hJzRNmJPAk3V hVlH91AevXO/sR9eqHz7GJrqqQ2fCgyN4b9BHNTpFcVhw9sIJUdOP+arhdMnujMOqu 3xuLExBc/WtxXInreYqNpQdgRlumpGt2qe+qb9kk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728281AbgCXPhk (ORCPT ); Tue, 24 Mar 2020 11:37:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:60572 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728709AbgCXPhf (ORCPT ); Tue, 24 Mar 2020 11:37:35 -0400 Received: from localhost.localdomain (236.31.169.217.in-addr.arpa [217.169.31.236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2CF882073E; Tue, 24 Mar 2020 15:37:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585064255; bh=ieuN1NJTq+9heb9k5hJc1KkJB7zqBNtgCKe1hqkqObc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FC4e4KubugDTpB2dTINNE4ZzmVzWoJ3zBo41BOOCCa60v3W4JTxEUmucW0IieqI4l wZBVBpH6WdYqZJFU8YUpcCq6bjh0Celqc9ggRZW4zOyKk4kEabDDXGKXOAm9utQybw ouCNAWXeOF7ZvMTnDx5Qm+mOiQ5cZ+619xCWIA6k= From: Will Deacon To: linux-kernel@vger.kernel.org Cc: Will Deacon , Eric Dumazet , Jann Horn , Kees Cook , Maddie Stone , Marco Elver , "Paul E . McKenney" , Peter Zijlstra , Thomas Gleixner , kernel-team@android.com, kernel-hardening@lists.openwall.com Subject: [RFC PATCH 18/21] list_bl: Move integrity checking out of line Date: Tue, 24 Mar 2020 15:36:40 +0000 Message-Id: <20200324153643.15527-19-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200324153643.15527-1-will@kernel.org> References: <20200324153643.15527-1-will@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In preparation for adding full integrity checking to 'hlist_bl', move the checks out of line before they become more bloated. At the same, swap the argument order for __hlist_bl_add_head_valid() so that it follows the same convention as __hlist_add_head_valid(). Signed-off-by: Will Deacon --- include/linux/list_bl.h | 34 ++++++---------------------------- include/linux/rculist_bl.h | 2 +- lib/list_debug.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 29 deletions(-) diff --git a/include/linux/list_bl.h b/include/linux/list_bl.h index 0839c4f43e6d..dd74043ebae6 100644 --- a/include/linux/list_bl.h +++ b/include/linux/list_bl.h @@ -33,34 +33,12 @@ struct hlist_bl_node { }; #ifdef CONFIG_CHECK_INTEGRITY_LIST -static inline bool __hlist_bl_add_head_valid(struct hlist_bl_head *h, - struct hlist_bl_node *n) -{ - unsigned long hlock = (unsigned long)h->first & LIST_BL_LOCKMASK; - unsigned long nlock = (unsigned long)n & LIST_BL_LOCKMASK; - - return !(CHECK_DATA_CORRUPTION(nlock, - "hlist_bl_add_head: node is locked\n") || - CHECK_DATA_CORRUPTION(hlock != LIST_BL_LOCKMASK, - "hlist_bl_add_head: head is unlocked\n")); -} - -static inline bool __hlist_bl_del_valid(struct hlist_bl_node *n) -{ - unsigned long nlock = (unsigned long)n & LIST_BL_LOCKMASK; - - return !(CHECK_DATA_CORRUPTION(nlock, - "hlist_bl_del_valid: node locked") || - CHECK_DATA_CORRUPTION(n->next == LIST_POISON1, - "hlist_bl_del corruption, %px->next is LIST_POISON1 (%px)\n", - n, LIST_POISON1) || - CHECK_DATA_CORRUPTION(n->pprev == LIST_POISON2, - "hlist_bl_del corruption, %px->pprev is LIST_POISON2 (%px)\n", - n, LIST_POISON2)); -} +extern bool __hlist_bl_add_head_valid(struct hlist_bl_node *n, + struct hlist_bl_head *h); +extern bool __hlist_bl_del_valid(struct hlist_bl_node *node); #else -static inline bool __hlist_bl_add_head_valid(struct hlist_bl_head *h, - struct hlist_bl_node *n) +static inline bool __hlist_bl_add_head_valid(struct hlist_bl_node *n, + struct hlist_bl_head *h) { return true; } @@ -103,7 +81,7 @@ static inline void hlist_bl_add_head(struct hlist_bl_node *n, { struct hlist_bl_node *first = hlist_bl_first(h); - if (!__hlist_bl_add_head_valid(h, n)) + if (!__hlist_bl_add_head_valid(n, h)) return; n->next = first; diff --git a/include/linux/rculist_bl.h b/include/linux/rculist_bl.h index 553ce3cde104..9356e7283ff0 100644 --- a/include/linux/rculist_bl.h +++ b/include/linux/rculist_bl.h @@ -63,7 +63,7 @@ static inline void hlist_bl_add_head_rcu(struct hlist_bl_node *n, { struct hlist_bl_node *first; - if (!__hlist_bl_add_head_valid(h, n)) + if (!__hlist_bl_add_head_valid(n, h)) return; /* don't need hlist_bl_first_rcu because we're under lock */ diff --git a/lib/list_debug.c b/lib/list_debug.c index b3560de4accc..9591fa6c9337 100644 --- a/lib/list_debug.c +++ b/lib/list_debug.c @@ -186,3 +186,31 @@ bool __hlist_nulls_del_valid(struct hlist_nulls_node *node) return true; } EXPORT_SYMBOL(__hlist_nulls_del_valid); + +bool __hlist_bl_add_head_valid(struct hlist_bl_node *new, + struct hlist_bl_head *head) +{ + unsigned long hlock = (unsigned long)head->first & LIST_BL_LOCKMASK; + unsigned long nlock = (unsigned long)new & LIST_BL_LOCKMASK; + + return !(CHECK_DATA_CORRUPTION(nlock, + "hlist_bl_add_head: node is locked\n") || + CHECK_DATA_CORRUPTION(hlock != LIST_BL_LOCKMASK, + "hlist_bl_add_head: head is unlocked\n")); +} +EXPORT_SYMBOL(__hlist_bl_add_head_valid); + +bool __hlist_bl_del_valid(struct hlist_bl_node *node) +{ + unsigned long nlock = (unsigned long)node & LIST_BL_LOCKMASK; + + return !(CHECK_DATA_CORRUPTION(nlock, + "hlist_bl_del_valid: node locked") || + CHECK_DATA_CORRUPTION(node->next == LIST_POISON1, + "hlist_bl_del corruption, %px->next is LIST_POISON1 (%px)\n", + node, LIST_POISON1) || + CHECK_DATA_CORRUPTION(node->pprev == LIST_POISON2, + "hlist_bl_del corruption, %px->pprev is LIST_POISON2 (%px)\n", + node, LIST_POISON2)); +} +EXPORT_SYMBOL(__hlist_bl_del_valid); -- 2.20.1