From patchwork Mon Feb 5 06:04:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Sakamoto X-Patchwork-Id: 196637 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp691574dyb; Sun, 4 Feb 2024 22:05:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IHbFGMCNJUW7/RtdyjVlLusv91Qgi7kArM/NDpSkHa0LcC0Y2lvODDI9BrNpljTFaKOWJ3n X-Received: by 2002:a17:90a:ea0a:b0:296:530:996e with SMTP id w10-20020a17090aea0a00b002960530996emr7035918pjy.20.1707113115594; Sun, 04 Feb 2024 22:05:15 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707113115; cv=pass; d=google.com; s=arc-20160816; b=LmxMIPIKn2Mw7HO4RWBJ4gARmw9JBoU5NpkUxf9kJjSPuMzHW/WFqVy/NLtU2+f6qr PbJZSPRhUP2B207b75c7P7vdIdUKQrgEOAYqxmw+X8SejdijQM5z4gIg6sfCSkwsZEXy NuxdqzvlFPktInryHDuEPnG+sN0HCxeO7g9d+XVkrisvCpKazAgmAOYtiAxEdlEV1pQN TD/BMnxnBM3tFgDxQWddb6E3BgTv0k+T27Gu8A3nLXn0OkOjhdApYRon3GLP3bM/vVlj TDMfIZo3NkroNWRYJ99jgspgJ1r0tyOnAW8/qrfmgLWTBH7ZSjLDV4z30F/hVevG83sj JOGg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:feedback-id:dkim-signature:dkim-signature; bh=L96t1AozAoYK/Cnj9rCJdZC5N9mB5YiS8vFpPwYqvVk=; fh=pdoEK7iSJK0FfOES42RY20oDUXmoI7oDb2RHnAn721s=; b=Tcxp4PP2V9NJ0+8dQXUgW+10eSE7myuGgNpvqY5eXCruXwaXJWS062zuxZAM5cI5vY mz42o7WZFmblbT2e9DXOblV0ZT9jeOBteNX403hvrzQVnuIRdyXfG6HHPOxiXKkAwmE8 9oR67qc+IsDiVzXmgJDt4lFULwt3mqxoFLMnktcbJo6ln9SSxF2DpjqtlqtvJjVAza61 fQUkjvezpI0ZHstXe7p74oKjKTNjY0ipi5dw3kbDfiOot8eJW6zsWcAIiVVwsh3l0sCB uCXgWs07p6se6Ue+U1irNqZWJaMeIbiqKQPsMPwxhANIxUQzwP6lnqL2GcfmLrK9fOuU ourg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@sakamocchi.jp header.s=fm3 header.b=Wh9uleSd; dkim=pass header.i=@messagingengine.com header.s=fm3 header.b=j+aIWJi4; arc=pass (i=1 spf=pass spfdomain=sakamocchi.jp dkim=pass dkdomain=sakamocchi.jp dkim=pass dkdomain=messagingengine.com dmarc=pass fromdomain=sakamocchi.jp); spf=pass (google.com: domain of linux-kernel+bounces-52065-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-52065-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sakamocchi.jp X-Forwarded-Encrypted: i=1; AJvYcCX/51NNeuY2thuCDv4z6TMSraV8JMuZcEMgNLEQp8wYLqD2fr1wnoSdTCsCyABP1edW1TuKCiKmnsabFIJiLhhP+8yzGg== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id qa11-20020a17090b4fcb00b0029689b378e4si1655735pjb.173.2024.02.04.22.05.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Feb 2024 22:05:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-52065-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@sakamocchi.jp header.s=fm3 header.b=Wh9uleSd; dkim=pass header.i=@messagingengine.com header.s=fm3 header.b=j+aIWJi4; arc=pass (i=1 spf=pass spfdomain=sakamocchi.jp dkim=pass dkdomain=sakamocchi.jp dkim=pass dkdomain=messagingengine.com dmarc=pass fromdomain=sakamocchi.jp); spf=pass (google.com: domain of linux-kernel+bounces-52065-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-52065-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sakamocchi.jp Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 3785E282589 for ; Mon, 5 Feb 2024 06:05:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 73E13C8DE; Mon, 5 Feb 2024 06:05:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sakamocchi.jp header.i=@sakamocchi.jp header.b="Wh9uleSd"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="j+aIWJi4" Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E7F94BE4B for ; Mon, 5 Feb 2024 06:04:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=66.111.4.26 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707113097; cv=none; b=XioIoBF7LZDqZIgLZ1Gdntzbv3UQYd88qXSQYMiSZQ+Ol2YT3u2byKqMQtTbacNNiFe3cjEfjVTuxZ+p+MkZ/wpRWaS6FxEzQt/6cVjLrB52etQ5IBAG8fhSyX63NgVlR2KqSlKRMdXKrqCpCLJNYjcWUcxgPm6E5GieN4JPjyw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707113097; c=relaxed/simple; bh=xwFTrIlrAls4xajJqJT9lIoJy/mgAuyVcs+oDEyeAus=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=qAhR047LNSWt0wNOmgOBLYddcukj1JsHXbGSpS0CHr2HT3piG4OWtGMRDPhNB5vQ5wGugfTtoQD/8C9h9yurikHKFYcO38h+hGJF38D4Du6gAx1r7Nktg3l1MNldrmnlBaOBnpHP9CzcUSV6LW4RwBSn2yRwTK1gTV+DZqu5pto= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sakamocchi.jp; spf=pass smtp.mailfrom=sakamocchi.jp; dkim=pass (2048-bit key) header.d=sakamocchi.jp header.i=@sakamocchi.jp header.b=Wh9uleSd; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=j+aIWJi4; arc=none smtp.client-ip=66.111.4.26 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sakamocchi.jp Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sakamocchi.jp Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id B954B5C00F7; Mon, 5 Feb 2024 01:04:53 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Mon, 05 Feb 2024 01:04:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakamocchi.jp; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to; s=fm3; t=1707113093; x=1707199493; bh=L96t1AozAo YK/Cnj9rCJdZC5N9mB5YiS8vFpPwYqvVk=; b=Wh9uleSdER1WIq612o/QY7/9Y+ nKgd7R+/Nwwkln6Z0fmDCdBwjfa6ZwZTWo+yIPc5xgS8RJ03LI8H0Ua9Im5D/i5o +rxvchr9wGxPt8EMKz0IVHigC/ARgDaNHyBWIZEHMZ2z3ZL489OjaKDMABXUX+mJ YNcsAM8k/7bwSC+LxdWC79fhohOleUxEunV36gpzTVlp/+v4mcyU4XBBspq7iDKz mzzoiT5qnSIO+6W07v6yHjBrcXiL4vzr6uaXGkcyD1H86HqCzLCdobtfgeH2kP8+ 0K0IzphW/4CZbTyjLCqTIbG6UY9lpD4dc9LAnTj13DNN9ecq+47VheEMW9eA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1707113093; x=1707199493; bh=L96t1AozAoYK/Cnj9rCJdZC5N9mB 5YiS8vFpPwYqvVk=; b=j+aIWJi4T0LLCBeSzZaNjxHR5JfcsGUjEbNEqRy2YZDE mKfnGe7KPJGdMpnHOMg2AFbRnBMlp4+fxoYpVpw6VEZt7VnBMk2zYFSkbx0tgHoC WaJV6Ysut9+ESKjOyEW3gCJpEXaND0lPhjopUULjfv/PHAemw+8NZTeXP0uGawp2 frvFO7IkgrM0fdnnN7rnlawGXLw0ObZbexTSjeaC7ltSZJKdb9RkQU0vpcunbPn9 eQ1BF+eHYZZwYK6NxfbjgFY4qmHhRNK1ezRTxmitu7//uNkfhOCLN5ELGkq9T/js FMm5nDw2jr/DzvlIgUIihS2eREEBEt+cDN8zTy8vgA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrfeduledgleduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpefvrghkrghshhhiucfurghkrghmohhtohcuoehoqdhtrghkrghs hhhisehsrghkrghmohgttghhihdrjhhpqeenucggtffrrghtthgvrhhnpeeggfehleehje eileehveefkefhtdeffedtfeeghfekffetudevjeegkeevhfdvueenucffohhmrghinhep khgvrhhnvghlrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepohdqthgrkhgrshhhihesshgrkhgrmhhotggthhhirdhjph X-ME-Proxy: Feedback-ID: ie8e14432:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 5 Feb 2024 01:04:51 -0500 (EST) From: Takashi Sakamoto To: linux1394-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Cc: Stephen Rothwell , kernel test robot Subject: [PATCH] firewire: core: fix build failure due to the caller of fw_csr_string() Date: Mon, 5 Feb 2024 15:04:48 +0900 Message-Id: <20240205060448.13881-1-o-takashi@sakamocchi.jp> X-Mailer: git-send-email 2.40.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790037841983274736 X-GMAIL-MSGID: 1790037841983274736 A commit 47dc55181dcb ("firewire: core: search descriptor leaf just after vendor directory entry in root directory") for v6.8-rc3 and a commit 67a5a58c0443 ("firewire: Kill unnecessary buf check in device_attribute.show") for v6.9 bring build failure in for-next tree due to the change of the name of local variable. This commit fixes it. Reported-by: Stephen Rothwell Closes: https://lore.kernel.org/lkml/20240202111602.6f6e2c1a@canb.auug.org.au/ Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202402022343.NkgsMITA-lkp@intel.com/ Signed-off-by: Takashi Sakamoto --- drivers/firewire/core-device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c index a802c6d4f4fd..c0976f6268d3 100644 --- a/drivers/firewire/core-device.c +++ b/drivers/firewire/core-device.c @@ -366,7 +366,7 @@ static ssize_t show_text_leaf(struct device *dev, // in the root directory follows to the directory entry for vendor ID // instead of the immediate value for vendor ID. result = fw_csr_string(directories[i], CSR_DIRECTORY | attr->key, buf, - bufsize); + PAGE_SIZE - 1); if (result >= 0) ret = result; }