From patchwork Fri Jun 26 13:05:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 11627579 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 02EEE13B4 for ; Fri, 26 Jun 2020 13:08:20 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CF3A42080C for ; Fri, 26 Jun 2020 13:08:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="qKA5Euio"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="B+LncNES" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CF3A42080C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version: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=F5oWFDJ0Iak/Ecn+MTJFzDutpKxKmUKMOM6KTpara4w=; b=qKA5EuioqGYrJsiGXGfmaNgzm 5gqS4UXoXCbiL/AJria4ebo0W45d7HESxCbYUd6i3Yp3WACB37CLiuJWRlQ2Q0yuwzgLRQzcniCNe HyCUhrfyzuadRoLW/p6SCc54t61+dP581mh/3jSxWRaL6WkJCqiaGABeGHZ1kYPRnc1+g5wQyfaPi q7cBYrMCIM0h+kt9XN2fenNDPjTQIsyh6fLo8TISUAQ84BJK5ndW5sk8vVqg5DCLTWpJCeZjwGIL/ u5HhJROWsvUejWYeeLYn8SJ/hTqpNjpVHfFa8Q2aOGrqlhhatp40TxUO88fEREon9XsSqw6CUaoCi ZAfPivpkQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1joo3R-0002ph-GN; Fri, 26 Jun 2020 13:06:05 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1joo2x-0002h1-Vr for linux-arm-kernel@lists.infradead.org; Fri, 26 Jun 2020 13:05:37 +0000 Received: by mail-wr1-x443.google.com with SMTP id f18so1379159wrs.0 for ; Fri, 26 Jun 2020 06:05:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eNnA3JIm/nNhrY/m6pTfGCbKyGY/Dou+IuOqoFoMcwU=; b=B+LncNESHZGTDdwm7FjaILQLgKfvB6QamNreWe/XQU8xhaEyEgsb4U4qxv08+ixDQ/ FnFt+RwqGrfUKnvBlql07hsVBCzE8UfjCT3v5eVekh5N4t1Bwgj3t+2SxxxU7SRQMXB0 iTIJMUDsufjuawLt1gCRmBs/5pxHL5XViTLUT+Uo07Yz19ugnCvaoVfcFUnnLjCb4OjZ APmtU1Hf+9fSpX5lG6GEsXO6xskSzVK/ym1JiQDWWG5muto8+vU7oP854PneFglhTygr IQp8m8nacqffpUHGayeWyU3H9dsP1a2WI5Ubcvp56QpipsQYivh3t90zZIS4lEEMDq1c Bd6w== 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:mime-version:content-transfer-encoding; bh=eNnA3JIm/nNhrY/m6pTfGCbKyGY/Dou+IuOqoFoMcwU=; b=NCoTW9jJVM9KkrhKolXTTVri192GKTVkwCGGy6J+oecJBf/e7arcJH+V5yUihbnEl6 lSTCb/IAn/JO0Of8qBt8WBUa17n3ITOaVHTAQnOcfJ0rY1KJoq9Qiie0QfOosFq6n5B9 trnPBF3iaN4AlUGZWdBkddHC2VC5jvH+CVtis8VKDIk5sWKOyMUa3y9nO/aQx2RKYvYf hA2nXfe5Z67jkBso9clde7uML3I7lVgbe8l1fgQkmf9Zzmz07PxqpvkFrr1gNbmtF0tC hiQqU1v8Z86lV+AOB/lF/PjcT3/yiHEnDNlGpEwR8DS3jDaE00MjIJHAhasGkqK8lIED MOLg== X-Gm-Message-State: AOAM530q8iiX7DlQsd0wK2B0LffraHRqG3ducb8mLCvukgEGcN97r8WH KjEhuvpiHnR4HMUVn9vEe3f9pex7i8M= X-Google-Smtp-Source: ABdhPJxBW4IPbPO5eoGMHxlvutWDO9MyQLFBGRb78I8VQ4Bim4qrRNtJrdF1lbgIHvXTS+XFhHn/sA== X-Received: by 2002:a5d:408c:: with SMTP id o12mr3677374wrp.412.1593176735173; Fri, 26 Jun 2020 06:05:35 -0700 (PDT) Received: from localhost.localdomain ([2.27.35.144]) by smtp.gmail.com with ESMTPSA id u20sm16746904wmc.44.2020.06.26.06.05.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 06:05:34 -0700 (PDT) From: Lee Jones To: arnd@arndb.de, gregkh@linuxfoundation.org Subject: [PATCH 05/10] misc: lkdtm: Always provide prototype for lkdtm_DOUBLE_FAULT() Date: Fri, 26 Jun 2020 14:05:20 +0100 Message-Id: <20200626130525.389469-6-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200626130525.389469-1-lee.jones@linaro.org> References: <20200626130525.389469-1-lee.jones@linaro.org> MIME-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:443 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lee Jones , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Kees Cook Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org lkdtm_DOUBLE_FAULT() already has internal logic to handle !CONFIG_X86_32. Compiling out the prototype actually prevents that logic from being useful. Fixes the following W=1 warning: drivers/misc/lkdtm/bugs.c: At top level: drivers/misc/lkdtm/bugs.c:420:6: warning: no previous prototype for ‘lkdtm_DOUBLE_FAULT’ [-Wmissing-prototypes] 420 | void lkdtm_DOUBLE_FAULT(void) | ^~~~~~~~~~~~~~~~~~ Cc: Kees Cook Signed-off-by: Lee Jones Acked-by: Arnd Bergmann --- drivers/misc/lkdtm/lkdtm.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/misc/lkdtm/lkdtm.h b/drivers/misc/lkdtm/lkdtm.h index 601a2156a0d48..8878538b2c132 100644 --- a/drivers/misc/lkdtm/lkdtm.h +++ b/drivers/misc/lkdtm/lkdtm.h @@ -31,9 +31,7 @@ void lkdtm_CORRUPT_USER_DS(void); void lkdtm_STACK_GUARD_PAGE_LEADING(void); void lkdtm_STACK_GUARD_PAGE_TRAILING(void); void lkdtm_UNSET_SMEP(void); -#ifdef CONFIG_X86_32 void lkdtm_DOUBLE_FAULT(void); -#endif void lkdtm_CORRUPT_PAC(void); /* lkdtm_heap.c */