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.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,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 83C43C10DCE for ; Fri, 6 Mar 2020 15:37:25 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1CD9020726 for ; Fri, 6 Mar 2020 15:37:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lca.pw header.i=@lca.pw header.b="YAqiAObC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1CD9020726 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lca.pw Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 88DC86B0003; Fri, 6 Mar 2020 10:37:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 83E6A6B0006; Fri, 6 Mar 2020 10:37:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 754BF6B0007; Fri, 6 Mar 2020 10:37:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0114.hostedemail.com [216.40.44.114]) by kanga.kvack.org (Postfix) with ESMTP id 5A0E66B0003 for ; Fri, 6 Mar 2020 10:37:24 -0500 (EST) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 0FFF1180AD802 for ; Fri, 6 Mar 2020 15:37:24 +0000 (UTC) X-FDA: 76565341608.20.line00_65d7c1370c02 X-HE-Tag: line00_65d7c1370c02 X-Filterd-Recvd-Size: 4532 Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by imf20.hostedemail.com (Postfix) with ESMTP for ; Fri, 6 Mar 2020 15:37:23 +0000 (UTC) Received: by mail-qk1-f193.google.com with SMTP id y126so2680196qke.4 for ; Fri, 06 Mar 2020 07:37:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lca.pw; s=google; h=from:to:cc:subject:date:message-id; bh=j6sXql4oSXT6Q/ws5TYxgRAPlqnRvsWRJL+OU5ImErY=; b=YAqiAObC9L8ErnG6/sYX0Zx1A4YfyyMtalpuashj3Fr1rvx0oV1OTzOsf1WWd5r0Ca i+rVg+EPA+7B8n4SzAQBM96nGiG7YpOWr3ldTbt4yPhe+3suFzHaAuvNWtiPfdWgFQbB pkC+mQsm5hMdAydfzA3Znr9vsufyjEQL10k4hXn7OL81+feViHmmYOG/rgMttm5whuRf 7HUsfjEYrCq2jLdGGJkmywIhcwW8IJHjIsLL+MlYXHPgaJQHc4Oc2VasPVdIWN4zzAEm gBTHTQQcFMLOG2dgiAClPkxa6C2ODhB5T3Q1grlW+yo2942vwg11v77ivtsKG77Cy7F7 4fDQ== 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; bh=j6sXql4oSXT6Q/ws5TYxgRAPlqnRvsWRJL+OU5ImErY=; b=Fem61FQBwCIUCm63jUfvlAWuOBF7GVaKPtJs5oa7Ox0h3ngxSLRMXKMWm+Qb1xQi+U Hv2T1vht7NZ0kuUWjm9GH6MBCu+8mc2MV1D9rjys5dqiVtmlzvf5G5GE9DYkTwawCPCN uYTIVmj1A4xRmmIc9x7KkcGtkvjVlbcnQq6kIwpz34aqVoPYpqz6FPsMjLCMffMrpSOM iZUVW4km6bjwusEoClSg9Hr0+Tv17vkOW1alN0kjtd+CgjfUOdPw6W3BZs6ipd+RQ5Iy On/AYXrpa01/mCwW43pLEJ67KYGKj76KGdoOuuSr6EVwNs8xqFqLtAujr5a9v3XppMGM rYpQ== X-Gm-Message-State: ANhLgQ2PX9d3XLeBbJ0TKOteJgzXMFgFUxE/96jnatCLvMut5F1fOW5I +cYcu4E4CNwPTzk6DIDcPlK79w== X-Google-Smtp-Source: ADFU+vssYst3rQrdo3Lx7+NOozn/HbgaawMN4v1NWOduUezf5Zgkw4/bA/AC8DrCvilHOguU7M7DHA== X-Received: by 2002:a37:a80c:: with SMTP id r12mr3278127qke.241.1583509043047; Fri, 06 Mar 2020 07:37:23 -0800 (PST) Received: from qcai.nay.com (nat-pool-bos-t.redhat.com. [66.187.233.206]) by smtp.gmail.com with ESMTPSA id t3sm16038837qkt.114.2020.03.06.07.37.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Mar 2020 07:37:22 -0800 (PST) From: Qian Cai To: akpm@linux-foundation.org Cc: aryabinin@virtuozzo.com, glider@google.com, dvyukov@google.com, walter-zh.wu@mediatek.com, kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qian Cai Subject: [PATCH -next] kasan/tags: fix -Wdeclaration-after-statement warn Date: Fri, 6 Mar 2020 10:37:10 -0500 Message-Id: <1583509030-27939-1-git-send-email-cai@lca.pw> X-Mailer: git-send-email 1.8.3.1 X-Bogosity: Ham, tests=bogofilter, spamicity=0.003683, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The linux-next commit "kasan: detect negative size in memory operation function" introduced a compilation warning, mm/kasan/tags_report.c:51:27: warning: ISO C90 forbids mixing declarations and code [-Wdeclaration-after-statement] struct kasan_alloc_meta *alloc_meta; Fix it by moving a code around a bit where there is no strict dependency. Signed-off-by: Qian Cai --- mm/kasan/tags_report.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/mm/kasan/tags_report.c b/mm/kasan/tags_report.c index 1d412760551a..bee43717d6f0 100644 --- a/mm/kasan/tags_report.c +++ b/mm/kasan/tags_report.c @@ -36,17 +36,6 @@ const char *get_bug_type(struct kasan_access_info *info) { - /* - * If access_size is a negative number, then it has reason to be - * defined as out-of-bounds bug type. - * - * Casting negative numbers to size_t would indeed turn up as - * a large size_t and its value will be larger than ULONG_MAX/2, - * so that this can qualify as out-of-bounds. - */ - if (info->access_addr + info->access_size < info->access_addr) - return "out-of-bounds"; - #ifdef CONFIG_KASAN_SW_TAGS_IDENTIFY struct kasan_alloc_meta *alloc_meta; struct kmem_cache *cache; @@ -71,6 +60,17 @@ const char *get_bug_type(struct kasan_access_info *info) } #endif + /* + * If access_size is a negative number, then it has reason to be + * defined as out-of-bounds bug type. + * + * Casting negative numbers to size_t would indeed turn up as + * a large size_t and its value will be larger than ULONG_MAX/2, + * so that this can qualify as out-of-bounds. + */ + if (info->access_addr + info->access_size < info->access_addr) + return "out-of-bounds"; + return "invalid-access"; } -- 1.8.3.1