From patchwork Mon Nov 9 00:17:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nathan Chancellor X-Patchwork-Id: 11890083 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=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,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 6FAE3C388F9 for ; Mon, 9 Nov 2020 00:21:01 +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 F07F4206F4 for ; Mon, 9 Nov 2020 00:21:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="1j40E+yz"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="R8zuVCcd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F07F4206F4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.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=q6OpVBqEGPC0FRusgrmjx/dHMQOQGXnrnW9OAK20L28=; b=1j40E+yzkkqHL5ga6+ulY3pDJ QD98h0VlW4YVmAuGHI7FOoiFNJc25e2M0WDeSYf3S5YVg3mwGnQxxocU9y1RuEeTvQ5pbSE9EiYgQ KRyUyHvO22Hv46J+9gorzNitB9A6dbtnur6UuGLMrNlVcuaYOHZCbx0K30vn9cZTPuhmnWhRoKxIx NEenlPQWCxzxHHAd8gM0VBYFeyR9s/cdLU5z0tFCg8HB43Ds5te8OVQvYKHrulsbw/bUlA+qK0aQX nUFh3adS3K4ey2RJstlyzYsVpaymM89FSnsP+5x1YGmCEswKZcV2gKVLoorEuhGCRHW6qVPv6cHmO UXm6IbdOA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kbutz-00073n-IP; Mon, 09 Nov 2020 00:19:19 +0000 Received: from mail-qt1-x841.google.com ([2607:f8b0:4864:20::841]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kbutw-00072m-Op for linux-arm-kernel@lists.infradead.org; Mon, 09 Nov 2020 00:19:17 +0000 Received: by mail-qt1-x841.google.com with SMTP id p12so4950631qtp.7 for ; Sun, 08 Nov 2020 16:19:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3LcMZKLiUPDXMEpD6ZsN+QTNJLzBAx+sHH3KFfJGyJ0=; b=R8zuVCcdEeO0C5i/vvcm5HkmQPlTg9fjAhMuHmzfp6238Ab9nux7MHsAvHyVEFwDO+ xXOyJBVQ92hyI0zt5wxzCYWiWdNsESwhtV74DkxY/ZdjfBlF01azPxswWdUc0ombkp5M 7bLuwiv8USRYsvEfijTpW9IU6Ynpai653OR9Y/ipPTlyQ7A5lkPpp0kw0NYPlmwhKKGf HGsokQK+v+fVutJ2yIlW5OhHGlCe5eifq0b1bm0/2eNyEkJUiyqZI90xsA0le08gpYAL 24OZDCB4C4//iGp+Iu97ibjZxVyvO8JwJtbwOFCT9KkeCz0oZ5oKKzzowHaWQaqpCRBz xSWA== 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=3LcMZKLiUPDXMEpD6ZsN+QTNJLzBAx+sHH3KFfJGyJ0=; b=hn17Hc4H/rqZGbwNDXNxq2yH8hw0ZsGht5esIP0VvkaZM+iXe3E50PwlZI+UQJqYlU RJiU7jVAI3vy9MzRdXJFkIfKPQ9lSer5Quso4mxWi+UrYlXaJZne17qu7vNFEfdEAUw1 uqAaqbJg4/9CXQoxUg7J4yn3yIoXc3GNrtHiieU26aZkzkjCRrWDBir5E1nfHZjFPrUq obbAAahoKixRkfRpCZbDEknfsYAZL9Cun+7uWuR2TUGwf+pGNgw3QJ11UpUH1oE6Nv5W 1Ua1TjIjPmCNbqkmLW7J81sTu49ZilVELm/9AFTLeJ7tw+PQRwNG0Oxx+stpGIU1S4dQ RYWA== X-Gm-Message-State: AOAM530neMSNVdHFNV6+wQLrN+THAsAsbvRDUdWY93aPwHzS10qjsRr6 CJ8Wjh285dkL5MfGd/AkFAo= X-Google-Smtp-Source: ABdhPJyNLjeJUNhbcyqUseLKn/AOHETzyR0kNnjuJyNiW0lOPUD945guUsng+bjTQJfHD9zVJ5tCig== X-Received: by 2002:ac8:13cb:: with SMTP id i11mr11094139qtj.390.1604881154657; Sun, 08 Nov 2020 16:19:14 -0800 (PST) Received: from localhost.localdomain ([2604:1380:45f1:1d00::1]) by smtp.gmail.com with ESMTPSA id r19sm4851517qtm.4.2020.11.08.16.19.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Nov 2020 16:19:13 -0800 (PST) From: Nathan Chancellor To: Andrew Morton Subject: [PATCH] ARM: boot: Quote aliased symbol names in string.c Date: Sun, 8 Nov 2020 17:17:13 -0700 Message-Id: <20201109001712.3384097-1-natechancellor@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201108222156.GA1049451@ubuntu-m3-large-x86> References: <20201108222156.GA1049451@ubuntu-m3-large-x86> MIME-Version: 1.0 X-Patchwork-Bot: notify X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201108_191917_090965_70CA45E9 X-CRM114-Status: GOOD ( 14.57 ) 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: Stephen Rothwell , Florian Fainelli , Ahmad Fatoum , =?utf-8?q?Valdis_Kl=C4=93tnieks?= , Abbott Liu , Linus Walleij , Russell King , kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-next@vger.kernel.org, Naresh Kamboju , Joe Perches , Andrey Ryabinin , Nathan Chancellor , Ard Biesheuvel , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Patch "treewide: Remove stringification from __alias macro definition" causes arguments to __alias to no longer be quoted automatically, which breaks CONFIG_KASAN on ARM after commit d6d51a96c7d6 ("ARM: 9014/2: Replace string mem* functions for KASan"): arch/arm/boot/compressed/string.c:24:1: error: attribute 'alias' argument not a string 24 | void *__memcpy(void *__dest, __const void *__src, size_t __n) __alias(memcpy); | ^~~~ arch/arm/boot/compressed/string.c:25:1: error: attribute 'alias' argument not a string 25 | void *__memmove(void *__dest, __const void *__src, size_t count) __alias(memmove); | ^~~~ arch/arm/boot/compressed/string.c:26:1: error: attribute 'alias' argument not a string 26 | void *__memset(void *s, int c, size_t count) __alias(memset); | ^~~~ make[3]: *** [scripts/Makefile.build:283: arch/arm/boot/compressed/string.o] Error 1 Quote the names like the treewide patch does so there is no more error. Reported-by: Naresh Kamboju Reported-by: Valdis Klētnieks Signed-off-by: Nathan Chancellor Acked-by: Ard Biesheuvel Reviewed-by: Linus Walleij --- Hi Andrew, Stephen said I should send this along to you so that it can be applied as part of the post -next series. Please let me know if you need any more information or clarification, I tried to document it succinctly in the commit message. Cheers, Nathan arch/arm/boot/compressed/string.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/compressed/string.c b/arch/arm/boot/compressed/string.c index 8c0fa276d994..cc6198f8a348 100644 --- a/arch/arm/boot/compressed/string.c +++ b/arch/arm/boot/compressed/string.c @@ -21,9 +21,9 @@ #undef memcpy #undef memmove #undef memset -void *__memcpy(void *__dest, __const void *__src, size_t __n) __alias(memcpy); -void *__memmove(void *__dest, __const void *__src, size_t count) __alias(memmove); -void *__memset(void *s, int c, size_t count) __alias(memset); +void *__memcpy(void *__dest, __const void *__src, size_t __n) __alias("memcpy"); +void *__memmove(void *__dest, __const void *__src, size_t count) __alias("memmove"); +void *__memset(void *s, int c, size_t count) __alias("memset"); #endif void *memcpy(void *__dest, __const void *__src, size_t __n)