From patchwork Sun Oct 23 19:57:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jason A. Donenfeld" X-Patchwork-Id: 8087 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp117245wru; Sun, 23 Oct 2022 13:04:38 -0700 (PDT) X-Google-Smtp-Source: AMsMyM51TAqgdeSjQG6OaBIlC9/MDQxT/1Jx2YLfkKfpbYgqXmq3GOU9KEXeeNVKJf618Wa/jHgp X-Received: by 2002:a17:907:3f94:b0:78d:9d2f:3002 with SMTP id hr20-20020a1709073f9400b0078d9d2f3002mr24344189ejc.40.1666555478211; Sun, 23 Oct 2022 13:04:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666555478; cv=none; d=google.com; s=arc-20160816; b=wrTkSijIuFyDFNUhKLTOcBxA2hRSldICo8HkinEB5TRU4ROzfUV152e1C/unPLHMO9 B5q3RR71cCLeZAzPzjvStSuOspWjTOHaI21Uq8TF0ME6ApvvEQY5YXJ0BbsA1/i+o2r9 EQ2gql52sZ5yajuwWlqDK3QFCQoYWBpKoJ40ZtfKKmDEUKpPlui8/DJjqsSbgR3Y3YpE ZNKXF5kWvfZZgGT76gDHBp7QhmqNtg5wB74a9Knne8PjbchSGF+rGGz4z2Ff7uSjCiVM BLzWShD012cIG82iZL2VBXn0VFEAl2D2PRZ58A4fxqiA5mXlVem9P3hXi6O0y6hue3cO HhKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=cWtExo86QbcGU83TlxLOo9FcuH1N6ldwUMYQv/obgzc=; b=l3YvR1Jv8i9GHKzRnPAWYHNTb00fe6cFP6GLZUWWJjRSUC/XOSbD+ivWBli2QEPXTL SwlQPAf+MF70ZlVLjj/y9G2n5ZwyL+IfhQRuP5q8sCTbwZqcKGInir2EU7LGpSBCR/uF x/ONCvUPtHPj9mDThei8HQreKfJ+ujuxmfqPaPpgGSOywmoraHmAdYV6JPxGWPOYFZQd gdlSSVpLYX9HTwQGJZz3feC6WdITk5toJuK3vAEf+391EMXZwDjpe1OJh71a2fShkB08 BB2J01oAHgbXGCJhImYoUY9S6s0nqofWboQX5hPWadPhPwWiaWbb5FliRcxNmOFKGjQx YRtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@zx2c4.com header.s=20210105 header.b=RHl2LtIT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=zx2c4.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z1-20020a056402274100b0045c786162f5si3966735edd.567.2022.10.23.13.04.07; Sun, 23 Oct 2022 13:04:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@zx2c4.com header.s=20210105 header.b=RHl2LtIT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=zx2c4.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230226AbiJWT50 (ORCPT + 99 others); Sun, 23 Oct 2022 15:57:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229618AbiJWT5Y (ORCPT ); Sun, 23 Oct 2022 15:57:24 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3BD6C70E43; Sun, 23 Oct 2022 12:57:23 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 8A6F6CE0F58; Sun, 23 Oct 2022 19:57:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E233C433C1; Sun, 23 Oct 2022 19:57:19 +0000 (UTC) Authentication-Results: smtp.kernel.org; dkim=pass (1024-bit key) header.d=zx2c4.com header.i=@zx2c4.com header.b="RHl2LtIT" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zx2c4.com; s=20210105; t=1666555036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=cWtExo86QbcGU83TlxLOo9FcuH1N6ldwUMYQv/obgzc=; b=RHl2LtITdsVw3pwWJLkHF4seczWczbn1OqZH2KgVX8rAsHgRpazXCOrq6DWxZF8v07JdEL rYfXZt/bxcshHqqZ6gQx67hKQKvnEWINrE3f3cv8EeyMJbIFVA3slI1XMvvHA7FlUMfAmu DCnr6Qj7X+mef3h86QrEUvBcyodfgog= Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 31711279 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 23 Oct 2022 19:57:16 +0000 (UTC) From: "Jason A. Donenfeld" To: linus.walleij@linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: "Jason A. Donenfeld" , stable@vger.kernel.org, kernel test robot Subject: [PATCH] soc: ux500: do not directly dereference __iomem Date: Sun, 23 Oct 2022 21:57:11 +0200 Message-Id: <20221023195711.52515-1-Jason@zx2c4.com> MIME-Version: 1.0 X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747510077271855466?= X-GMAIL-MSGID: =?utf-8?q?1747510077271855466?= Sparse reports that calling add_device_randomness() on `uid` is a violation of address spaces. And indeed the next usage uses readl() properly, but that was left out when passing it toadd_device_ randomness(). So instead copy the whole thing to the stack first. Fixes: 4040d10a3d44 ("ARM: ux500: add DB serial number to entropy pool") Cc: Linus Walleij Cc: stable@vger.kernel.org Link: https://lore.kernel.org/all/202210230819.loF90KDh-lkp@intel.com/ Reported-by: kernel test robot Signed-off-by: Jason A. Donenfeld --- Untested, but hopefully correct. drivers/soc/ux500/ux500-soc-id.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/soc/ux500/ux500-soc-id.c b/drivers/soc/ux500/ux500-soc-id.c index a9472e0e5d61..27d6e25a0115 100644 --- a/drivers/soc/ux500/ux500-soc-id.c +++ b/drivers/soc/ux500/ux500-soc-id.c @@ -167,20 +167,18 @@ ATTRIBUTE_GROUPS(ux500_soc); static const char *db8500_read_soc_id(struct device_node *backupram) { void __iomem *base; - void __iomem *uid; const char *retstr; + u32 uid[5]; base = of_iomap(backupram, 0); if (!base) return NULL; - uid = base + 0x1fc0; + memcpy_fromio(uid, base + 0x1fc0, sizeof(uid)); /* Throw these device-specific numbers into the entropy pool */ - add_device_randomness(uid, 0x14); + add_device_randomness(uid, sizeof(uid)); retstr = kasprintf(GFP_KERNEL, "%08x%08x%08x%08x%08x", - readl((u32 *)uid+0), - readl((u32 *)uid+1), readl((u32 *)uid+2), - readl((u32 *)uid+3), readl((u32 *)uid+4)); + uid[0], uid[1], uid[2], uid[3], uid[4]); iounmap(base); return retstr; }