Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp5632215pxb; Mon, 28 Mar 2022 15:14:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzt9lhgkU0aPGHW7sufS+790Z5di4xTEMk4Rt3fqv/L/JR+PIPWoTYTZRZUkyhRt1KabJyX X-Received: by 2002:a05:6870:a1a3:b0:d3:f4a7:f3e3 with SMTP id a35-20020a056870a1a300b000d3f4a7f3e3mr676852oaf.109.1648505668397; Mon, 28 Mar 2022 15:14:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648505668; cv=none; d=google.com; s=arc-20160816; b=qMzZm51d0HK+s2BvJwebWoKmKZi6mhiHs7fM7tR55/RABaDVMIkARJd+qhPzCdI2Kn Ag+CDy967IVEQqttVXXVUsSPuzQ10DKaBSbDWo3VG7vOl3ZrP8hR08bKutIepF86Lt+V SBZ4PvTwYfwo3CW0j10zRmpw5dj+iCkqOU+k9rx+Kq/j78XBDaKwwRsNIqs2AsASkpyL NBdg4vAbkVNnfCrANcaNjLNX+okrk+tx3SDQmzk7a6oL7YYQz2ZyPThltMNQfn1enC0v wt4aTQ7bef3kWnVNDGuNMS3mADMtJuGgnTiINxGes2o9NEWsqguO1Jr6oz3AWd+ng5gV Z11Q== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ttQpNweEKc2kkgqLMoKanNOtWU8VZeXtPKAOP/qjy3A=; b=a+bxXaSrdOxuGwo3PnoYp0tXLOoRy24FTxICs2P+mrjkzJbEoRD29yzUWlzMSch9/M lefpx0afollyBD1Hrlc/P54OgZ5ncSb2nc75flNWzARtobJ9G+Y5Iuv7GSXOE8J/J89o tY5hmNYzAOw712zt9EuGJpV9ayipZ7Gmx9dyPGVda+cPqHJcWhLpDmlbKZQT7Bl0WDLN XYyxG97FKGPPwbs2PzpWTvjEqed/gnWJjQAOEfpJMt6QsNdn2h2tINg2JsAfE/Nmo0WS fuSZ2nUj3+f9mDXp6poOyRlVvHAV6ahf6i6VSfM8WY5zbE2/eVinZyMjmIbLZrnkM7uh 7ZsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=iNBQp8M0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id n6-20020acaef06000000b002ef0c34767bsi9964668oih.251.2022.03.28.15.14.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Mar 2022 15:14:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=iNBQp8M0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id CE207171EE3; Mon, 28 Mar 2022 14:33:24 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240805AbiC1LWq (ORCPT + 99 others); Mon, 28 Mar 2022 07:22:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240737AbiC1LVf (ORCPT ); Mon, 28 Mar 2022 07:21:35 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ECDEA5574C; Mon, 28 Mar 2022 04:19:17 -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 ams.source.kernel.org (Postfix) with ESMTPS id 8480CB80E01; Mon, 28 Mar 2022 11:19:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7C924C34100; Mon, 28 Mar 2022 11:19:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648466356; bh=3hDtQEHfWIJkLh3b5M0cJNcopCDOOF5++nmwce1+xTQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iNBQp8M0oHRgV+ATjYl+iKMl6wnUoEIsW31gfVYupAsXWPRD1ox2Ag+cxyzdMA/sD JtZpIvy8vB0LnhonlV9MOxIAtwfyft0+0ZUK9AJp+yTBtW7FruwUBsp1KXiDRD8nKA L3pXvBCh27PakDxzyMr9J1KH37WKDq9GARaRvDyx2k8cCCXMB5LhBuVgJIJNK0Xi8A zr/6Ir/0VffuUAnD0tNMForBzjpaYRtLzrqPqymhrRwxwztxgvvoIDawYd+5iG61kp q0HyTxH0VNKKgxLAZpDGX4/Gh9XW66L9qQv9zr5kZklsoCZbyNLBMwLIBjXsaCAjsS hECKYQi04SkCA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chaitanya Kulkarni , Himanshu Madhani , Jens Axboe , Sasha Levin , linux-block@vger.kernel.org Subject: [PATCH AUTOSEL 5.17 23/43] loop: use sysfs_emit() in the sysfs xxx show() Date: Mon, 28 Mar 2022 07:18:07 -0400 Message-Id: <20220328111828.1554086-23-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220328111828.1554086-1-sashal@kernel.org> References: <20220328111828.1554086-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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 From: Chaitanya Kulkarni [ Upstream commit b27824d31f09ea7b4a6ba2c1b18bd328df3e8bed ] sprintf does not know the PAGE_SIZE maximum of the temporary buffer used for outputting sysfs content and it's possible to overrun the PAGE_SIZE buffer length. Use a generic sysfs_emit function that knows the size of the temporary buffer and ensures that no overrun is done for offset attribute in loop_attr_[offset|sizelimit|autoclear|partscan|dio]_show() callbacks. Signed-off-by: Chaitanya Kulkarni Reviewed-by: Himanshu Madhani Link: https://lore.kernel.org/r/20220215213310.7264-2-kch@nvidia.com Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/loop.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 19fe19eaa50e..e65d1e24cab3 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -681,33 +681,33 @@ static ssize_t loop_attr_backing_file_show(struct loop_device *lo, char *buf) static ssize_t loop_attr_offset_show(struct loop_device *lo, char *buf) { - return sprintf(buf, "%llu\n", (unsigned long long)lo->lo_offset); + return sysfs_emit(buf, "%llu\n", (unsigned long long)lo->lo_offset); } static ssize_t loop_attr_sizelimit_show(struct loop_device *lo, char *buf) { - return sprintf(buf, "%llu\n", (unsigned long long)lo->lo_sizelimit); + return sysfs_emit(buf, "%llu\n", (unsigned long long)lo->lo_sizelimit); } static ssize_t loop_attr_autoclear_show(struct loop_device *lo, char *buf) { int autoclear = (lo->lo_flags & LO_FLAGS_AUTOCLEAR); - return sprintf(buf, "%s\n", autoclear ? "1" : "0"); + return sysfs_emit(buf, "%s\n", autoclear ? "1" : "0"); } static ssize_t loop_attr_partscan_show(struct loop_device *lo, char *buf) { int partscan = (lo->lo_flags & LO_FLAGS_PARTSCAN); - return sprintf(buf, "%s\n", partscan ? "1" : "0"); + return sysfs_emit(buf, "%s\n", partscan ? "1" : "0"); } static ssize_t loop_attr_dio_show(struct loop_device *lo, char *buf) { int dio = (lo->lo_flags & LO_FLAGS_DIRECT_IO); - return sprintf(buf, "%s\n", dio ? "1" : "0"); + return sysfs_emit(buf, "%s\n", dio ? "1" : "0"); } LOOP_ATTR_RO(backing_file); -- 2.34.1