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=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 5A228C433ED for ; Tue, 11 May 2021 13:53:44 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 B37C3611BF for ; Tue, 11 May 2021 13:53:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B37C3611BF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=roeck-us.net 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=desiato.20200630; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:Cc:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=sCx/A0gp2w/RCK5va/75TBew0wN5QMCJV3a9WqugE9I=; b=cG8ACszSw6Tij5vQ9ILrQcQjj 0E5K0Me4IYC2uSjeALrNHsD6urDSCJU/ntIlZ7Hh/ijETXbYYrHmVgIaGOuMTqo8DBaB4qEbsXBQ1 p5ILq6QQ4H98KV00DFn6EpMSXBUyqL4RkvW5gTi5GlUntxvmq24mTyCDqLusO91b3odiXkf9m5sRN TIYnJpzY5lHhli6iPF5jALeSRL9DIk2aEtrxYWkk2kjjFeurrJ9Zrdud3dvhMfCzDopv7bbufRmJc dvLbgqx/qzzcS4YxPKFNVdPEC7HwAHYGwsrDEeYVrYcKN4oKdpdWpngHqIdsu2LdA1oANJ4WzyqwQ aW949XygQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lgSnv-000HnP-D0; Tue, 11 May 2021 13:52:07 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lgSXi-000AN4-Ob for linux-arm-kernel@desiato.infradead.org; Tue, 11 May 2021 13:35:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:In-Reply-To:MIME-Version:Date:Message-ID:From:References:Cc:To: Subject:Sender:Reply-To:Content-ID:Content-Description; bh=h6fK7BnZuy9PHn9xxf/wsp5uxAeJb4ALs9dipuADBFY=; b=xClksmnZbFHjVFvq7n8fmiLItc ONxv2O7VKoMsFUWEbolNLQsLmLXRam6FRaGfDLWKEyT6j0+Rvso6QH7KbilDLaqmJ5FoSFsQqOe1N dezf90wursymndq2Oo5Bq8gxWE+IdbvLuYmnwB5F3FOJL6SZaABpalacappvFFS+N+XRnaPqI9m1l 1Dk8ghJ8sa4n5ivOqDs1zySAYNv73yRh3ULPmGwoXaSjmynRoUfeKm+VWlx1TTX+RZrserUX4KStb S/f+qOHb4uOMn5B+A5Ga/lT1SHCIqEeOK4gazE8a595MdFESSjfMEf3TBWz9pEE/NVXVJbPuiomuD slobnu7A==; Received: from mail-ot1-x330.google.com ([2607:f8b0:4864:20::330]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lgSXf-009cyO-JQ for linux-arm-kernel@lists.infradead.org; Tue, 11 May 2021 13:35:21 +0000 Received: by mail-ot1-x330.google.com with SMTP id f75-20020a9d03d10000b0290280def9ab76so17472166otf.12 for ; Tue, 11 May 2021 06:35:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=h6fK7BnZuy9PHn9xxf/wsp5uxAeJb4ALs9dipuADBFY=; b=Cz7NhXEz5zhBwoP3xMiPki1O5IHCH/QOv9iq5NkHhSZGwU22h0zkyUoSP32uvRA5q4 bvtY6jU9MiNAASgEcvFZ3jUs3Cg75n9sTzuQtDLcB6yhcKdGbvCxA5lPdpzoPPDyehyR Fy1vQZ1iX5VOMI3J3tvswpgfoIEVQ8l0ktX5r/eXvKuuryOSqPxAJEKtL0TYrs2YsZy7 DmlNBPp7C8ArOsAmsbdf7TDyYJmpxmW2cR2R6KxbK9njIGXfzh/qqpFjoFmqOA/Vd0bv d9KIa/8OMWmlscb9Op/9lyVtIbFQnVBCK7yZvjMQQ50Yglkc4msczITaXoTUSEpa4QbV W13Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=h6fK7BnZuy9PHn9xxf/wsp5uxAeJb4ALs9dipuADBFY=; b=Nv7gQ0OD8TAw4fptCfJkfYYliWdmVt7/zrfuat/xWdAwrtMVuro7DccluM/OkbmOJk bb5xLq2S6YWProi/lZjYFikKPo6bL0ojo4+2MQA47vvQuAfMKwNwH3TUeJEB9Ez+bGc0 HdUOlsMgWwphhMkF+gq94IS26l64exSGZNqShuHn6oXnvda1f72o7/87qPhBV0VkbCNo kx9VUWkUssoMIXsGhd04ExKh5PnQ4fk8v5CJKp6Yl0zWTZpOjQFoUcn9uDbIaSPgjGiB JN4kYNrR6ff7//OJWiThcL82AyUyvZ85zFbzvsu/i7+g+Et1TNAr673b6ViGG9HhtzVA jtIw== X-Gm-Message-State: AOAM533Ud75OZzS7bFNTpeCxZuIVOuStc0BrgKsSOU3lB1zeqprygul5 EVekc3xQnCzEQTMFfueJwXo= X-Google-Smtp-Source: ABdhPJzZsguJjl3as/RigM4yjHDbwp+sJugUyMWZjcnqsJFWf1mf+ZNxwpRtnIJXLgKLbQR3QrkF/w== X-Received: by 2002:a05:6830:1605:: with SMTP id g5mr25516254otr.22.1620740116730; Tue, 11 May 2021 06:35:16 -0700 (PDT) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id v79sm1567350oia.14.2021.05.11.06.35.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 11 May 2021 06:35:16 -0700 (PDT) Subject: Re: [PATCH] watchdog: Use sysfs_emit() and sysfs_emit_at() in "show" functions To: Juerg Haefliger , wim@linux-watchdog.org, joel@jms.id.au, linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org Cc: andrew@aj.id.au, linux-kernel@vger.kernel.org, Juerg Haefliger References: <20210511061812.480172-1-juergh@canonical.com> From: Guenter Roeck Message-ID: Date: Tue, 11 May 2021 06:35:14 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <20210511061812.480172-1-juergh@canonical.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210511_063519_689338_07B237B4 X-CRM114-Status: GOOD ( 19.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 5/10/21 11:18 PM, Juerg Haefliger wrote: > Convert sprintf() in sysfs "show" functions to sysfs_emit() and > sysfs_emit_at() in order to check for buffer overruns in sysfs outputs. > > Signed-off-by: Juerg Haefliger Reviewed-by: Guenter Roeck > --- > drivers/watchdog/aspeed_wdt.c | 4 ++-- > drivers/watchdog/watchdog_dev.c | 19 ++++++++++--------- > drivers/watchdog/watchdog_pretimeout.c | 4 ++-- > drivers/watchdog/ziirave_wdt.c | 12 +++++++----- > 4 files changed, 21 insertions(+), 18 deletions(-) > > diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c > index 7e00960651fa..933998e5a9de 100644 > --- a/drivers/watchdog/aspeed_wdt.c > +++ b/drivers/watchdog/aspeed_wdt.c > @@ -175,8 +175,8 @@ static ssize_t access_cs0_show(struct device *dev, > struct aspeed_wdt *wdt = dev_get_drvdata(dev); > u32 status = readl(wdt->base + WDT_TIMEOUT_STATUS); > > - return sprintf(buf, "%u\n", > - !(status & WDT_TIMEOUT_STATUS_BOOT_SECONDARY)); > + return sysfs_emit(buf, "%u\n", > + !(status & WDT_TIMEOUT_STATUS_BOOT_SECONDARY)); > } > > static ssize_t access_cs0_store(struct device *dev, > diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c > index 2946f3a63110..fe68a97973a5 100644 > --- a/drivers/watchdog/watchdog_dev.c > +++ b/drivers/watchdog/watchdog_dev.c > @@ -451,7 +451,8 @@ static ssize_t nowayout_show(struct device *dev, struct device_attribute *attr, > { > struct watchdog_device *wdd = dev_get_drvdata(dev); > > - return sprintf(buf, "%d\n", !!test_bit(WDOG_NO_WAY_OUT, &wdd->status)); > + return sysfs_emit(buf, "%d\n", !!test_bit(WDOG_NO_WAY_OUT, > + &wdd->status)); > } > > static ssize_t nowayout_store(struct device *dev, struct device_attribute *attr, > @@ -485,7 +486,7 @@ static ssize_t status_show(struct device *dev, struct device_attribute *attr, > status = watchdog_get_status(wdd); > mutex_unlock(&wd_data->lock); > > - return sprintf(buf, "0x%x\n", status); > + return sysfs_emit(buf, "0x%x\n", status); > } > static DEVICE_ATTR_RO(status); > > @@ -494,7 +495,7 @@ static ssize_t bootstatus_show(struct device *dev, > { > struct watchdog_device *wdd = dev_get_drvdata(dev); > > - return sprintf(buf, "%u\n", wdd->bootstatus); > + return sysfs_emit(buf, "%u\n", wdd->bootstatus); > } > static DEVICE_ATTR_RO(bootstatus); > > @@ -510,7 +511,7 @@ static ssize_t timeleft_show(struct device *dev, struct device_attribute *attr, > status = watchdog_get_timeleft(wdd, &val); > mutex_unlock(&wd_data->lock); > if (!status) > - status = sprintf(buf, "%u\n", val); > + status = sysfs_emit(buf, "%u\n", val); > > return status; > } > @@ -521,7 +522,7 @@ static ssize_t timeout_show(struct device *dev, struct device_attribute *attr, > { > struct watchdog_device *wdd = dev_get_drvdata(dev); > > - return sprintf(buf, "%u\n", wdd->timeout); > + return sysfs_emit(buf, "%u\n", wdd->timeout); > } > static DEVICE_ATTR_RO(timeout); > > @@ -530,7 +531,7 @@ static ssize_t pretimeout_show(struct device *dev, > { > struct watchdog_device *wdd = dev_get_drvdata(dev); > > - return sprintf(buf, "%u\n", wdd->pretimeout); > + return sysfs_emit(buf, "%u\n", wdd->pretimeout); > } > static DEVICE_ATTR_RO(pretimeout); > > @@ -539,7 +540,7 @@ static ssize_t identity_show(struct device *dev, struct device_attribute *attr, > { > struct watchdog_device *wdd = dev_get_drvdata(dev); > > - return sprintf(buf, "%s\n", wdd->info->identity); > + return sysfs_emit(buf, "%s\n", wdd->info->identity); > } > static DEVICE_ATTR_RO(identity); > > @@ -549,9 +550,9 @@ static ssize_t state_show(struct device *dev, struct device_attribute *attr, > struct watchdog_device *wdd = dev_get_drvdata(dev); > > if (watchdog_active(wdd)) > - return sprintf(buf, "active\n"); > + return sysfs_emit(buf, "active\n"); > > - return sprintf(buf, "inactive\n"); > + return sysfs_emit(buf, "inactive\n"); > } > static DEVICE_ATTR_RO(state); > > diff --git a/drivers/watchdog/watchdog_pretimeout.c b/drivers/watchdog/watchdog_pretimeout.c > index 01ca84be240f..7f257c3485cd 100644 > --- a/drivers/watchdog/watchdog_pretimeout.c > +++ b/drivers/watchdog/watchdog_pretimeout.c > @@ -55,7 +55,7 @@ int watchdog_pretimeout_available_governors_get(char *buf) > mutex_lock(&governor_lock); > > list_for_each_entry(priv, &governor_list, entry) > - count += sprintf(buf + count, "%s\n", priv->gov->name); > + count += sysfs_emit_at(buf, count, "%s\n", priv->gov->name); > > mutex_unlock(&governor_lock); > > @@ -68,7 +68,7 @@ int watchdog_pretimeout_governor_get(struct watchdog_device *wdd, char *buf) > > spin_lock_irq(&pretimeout_lock); > if (wdd->gov) > - count = sprintf(buf, "%s\n", wdd->gov->name); > + count = sysfs_emit(buf, "%s\n", wdd->gov->name); > spin_unlock_irq(&pretimeout_lock); > > return count; > diff --git a/drivers/watchdog/ziirave_wdt.c b/drivers/watchdog/ziirave_wdt.c > index 4297280807ca..6c9414d09684 100644 > --- a/drivers/watchdog/ziirave_wdt.c > +++ b/drivers/watchdog/ziirave_wdt.c > @@ -445,8 +445,9 @@ static ssize_t ziirave_wdt_sysfs_show_firm(struct device *dev, > if (ret) > return ret; > > - ret = sprintf(buf, ZIIRAVE_FW_VERSION_FMT, w_priv->firmware_rev.major, > - w_priv->firmware_rev.minor); > + ret = sysfs_emit(buf, ZIIRAVE_FW_VERSION_FMT, > + w_priv->firmware_rev.major, > + w_priv->firmware_rev.minor); > > mutex_unlock(&w_priv->sysfs_mutex); > > @@ -468,8 +469,9 @@ static ssize_t ziirave_wdt_sysfs_show_boot(struct device *dev, > if (ret) > return ret; > > - ret = sprintf(buf, ZIIRAVE_BL_VERSION_FMT, w_priv->bootloader_rev.major, > - w_priv->bootloader_rev.minor); > + ret = sysfs_emit(buf, ZIIRAVE_BL_VERSION_FMT, > + w_priv->bootloader_rev.major, > + w_priv->bootloader_rev.minor); > > mutex_unlock(&w_priv->sysfs_mutex); > > @@ -491,7 +493,7 @@ static ssize_t ziirave_wdt_sysfs_show_reason(struct device *dev, > if (ret) > return ret; > > - ret = sprintf(buf, "%s", ziirave_reasons[w_priv->reset_reason]); > + ret = sysfs_emit(buf, "%s", ziirave_reasons[w_priv->reset_reason]); > > mutex_unlock(&w_priv->sysfs_mutex); > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel