Received: by 10.223.185.111 with SMTP id b44csp919725wrg; Fri, 9 Mar 2018 16:53:08 -0800 (PST) X-Google-Smtp-Source: AG47ELt4XgV99NLqOLXi6KNjx6bQQkL7NsuLeNHJP2rEjJILYDzFRcI0HlSlM2cGe3PiP8uxEyhI X-Received: by 10.98.147.27 with SMTP id b27mr362581pfe.145.1520643188593; Fri, 09 Mar 2018 16:53:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520643188; cv=none; d=google.com; s=arc-20160816; b=0LQpK5bNAAxXZESWPzQ5QlOkw6ZqHbp7gXdR4/9hkrd9B+GVVWH98gbg2I01FzRNqw 53CBJIi+n+A8u5NBk0gWEMVzjKfCgYcOq8mQyC20Fac15/m/z9uZ/GLOBTvIwmydqQjq vAqJcRg40Kxo0i2+K16xpQThFZllVxxsCkP+qRTxsvvBiW0a71Z8Z+M+tswV9lm4+t7z zNuE6WJz21XU1mtMXFUW9BLBoKW6+8VHzCfs/NNUEmT3hzLSWLf115+MNOtGI2AMFdnZ tYHMyxFLcSphbfMi/uclMdDJfmeRaPiiKT14Tx8nrQh+yMWPh4LPFe2vZ6DntUUQlmuZ nvFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=6d48tajXMes9+wsB8Rnn0Z33nwv+3LbJBj+cE20j0wY=; b=WP3Dj7ztyAtn2N+C+bH4HZeSn5QZ+j7zFv6mUAwxNiNawxflrsUBQk6WvPxBaGXpXr 295tPQjK0MexhmWJt8f2XPRNMm4Zq8/eQToKWhUn/RJ2q46QnxJEgt9zcSZm9WrQhquK U2wShGyB0x2709MA0KYosVcqRHCYANf8h3GQM/8+3A2w2VJ/C+mkm4FPOvdtI2WnCosJ wJmWBAXpFo0ozfFRYp7p4DxJtVYZiz/NRlF9qLNF7+YUygkKnEJTQwgpnr2yTKH08LIj qiqN/GWpxmxFZHe1515UrPaEh0iLR+idePCJ5qfnTt1lv+W5HN5A3utOsqP0vWpi/ZFa cdcQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i70si1551400pgc.86.2018.03.09.16.52.54; Fri, 09 Mar 2018 16:53:08 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932929AbeCJATL (ORCPT + 99 others); Fri, 9 Mar 2018 19:19:11 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:38518 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932571AbeCJATH (ORCPT ); Fri, 9 Mar 2018 19:19:07 -0500 Received: from localhost (unknown [185.236.200.248]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 06E0DE6A; Sat, 10 Mar 2018 00:19:06 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nathan Sullivan , Zach Brown , Jacek Anaszewski , Willy Tarreau , Vlastimil Babka Subject: [PATCH 3.18 07/21] leds: do not overflow sysfs buffer in led_trigger_show Date: Fri, 9 Mar 2018 16:18:29 -0800 Message-Id: <20180310001801.468099665@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180310001801.045114869@linuxfoundation.org> References: <20180310001801.045114869@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Nathan Sullivan commit 3b9b95363c45365d606ad4bbba16acca75fdf6d3 upstream. Per the documentation, use scnprintf instead of sprintf to ensure there is never more than PAGE_SIZE bytes of trigger names put into the buffer. Signed-off-by: Nathan Sullivan Signed-off-by: Zach Brown Signed-off-by: Jacek Anaszewski Cc: Willy Tarreau Cc: Vlastimil Babka Signed-off-by: Greg Kroah-Hartman --- drivers/leds/led-triggers.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) --- a/drivers/leds/led-triggers.c +++ b/drivers/leds/led-triggers.c @@ -78,21 +78,23 @@ ssize_t led_trigger_show(struct device * down_read(&led_cdev->trigger_lock); if (!led_cdev->trigger) - len += sprintf(buf+len, "[none] "); + len += scnprintf(buf+len, PAGE_SIZE - len, "[none] "); else - len += sprintf(buf+len, "none "); + len += scnprintf(buf+len, PAGE_SIZE - len, "none "); list_for_each_entry(trig, &trigger_list, next_trig) { if (led_cdev->trigger && !strcmp(led_cdev->trigger->name, trig->name)) - len += sprintf(buf+len, "[%s] ", trig->name); + len += scnprintf(buf+len, PAGE_SIZE - len, "[%s] ", + trig->name); else - len += sprintf(buf+len, "%s ", trig->name); + len += scnprintf(buf+len, PAGE_SIZE - len, "%s ", + trig->name); } up_read(&led_cdev->trigger_lock); up_read(&triggers_list_lock); - len += sprintf(len+buf, "\n"); + len += scnprintf(len+buf, PAGE_SIZE - len, "\n"); return len; } EXPORT_SYMBOL_GPL(led_trigger_show);