From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DD4C0239085 for ; Wed, 1 Jul 2026 23:42:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782949378; cv=none; b=bK8kkvg6CmcbFCqnm6h/9g6WJbxdDspInwabEXJ4tpAMN5vEnoLip672K9a+F+a7nq3s72wrt7Z/BrlGy3Mo/LuTYWCIDxaaaR8fWP0aIT4qnVVVIRVh6swl1Uhv/qtSEkdad/TBJMGlqjpxkIC0ygedG4WdvUD2rOebocu55JU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782949378; c=relaxed/simple; bh=NwvngB55nrQuY2zsw+u/UlQ+ziOq9i4AgvNGIC5B8qg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mN13L5i7nX7fXoHblKfaPx7GjiBeCWxte8rMALE2d1ubU2Xw2p1YZkuxhb3Zcj7YIT4HJnpVmm7Ri8pMXVJsA8B1Qmfc1zL0+yR3tMwazKO1fMM7t3o9+4vHNOWTOvbNwk4T+JNmfJiuKhddor/yRWy1RvTJrk/Ts3VP6JaV9/g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=T68td7Dc; arc=none smtp.client-ip=209.85.167.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="T68td7Dc" Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-5aeb17c2564so1358206e87.0 for ; Wed, 01 Jul 2026 16:42:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782949375; x=1783554175; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=HjOEsE0qEDjFyTwl3K+CtParcmWNsl4rWJyxgaM5lGk=; b=T68td7DcIeSQXbb7LNevtAYMB3InXe2EW5aCNI5m/JIAaf+B1nAdfL/rnNERZrIvXB aIkQoS09lnSuCUOQB2U0Tv6vb3lOG1U+h7HhKLgZTidsXh38B+RmG7JXd+xxQMh5Qoaj fOo69VyGYfm+VYi22t2tX/zg2ml/s3tGqq+TfKIOpq6GAXhyOkzufC6n9mKdZmT5Vowg dJyvSPj6nLe70KZMtK4E6qBTzCH20KfupjDYYABe6eYnLdKNQTM7Ua8aGI7iYYs+5df/ Hys0oSTaVqZU6qs5ln+h9NLb4ANzmBa68vHA2yW5w5t1oAimTFHMK8KQzO9QzCYx4R9o pxYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782949375; x=1783554175; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=HjOEsE0qEDjFyTwl3K+CtParcmWNsl4rWJyxgaM5lGk=; b=EWxwyDBe93exYX2tNm1cOyM0JMjeaycO0QUs4FN6Nq1IY0SZIuMwHz+51KB8YCc87I 5EpNWYt12fgPwCE2XgA3NpXGp3S2DttCPmuYScLtHuGAwHFlsGb7DqieQF+XeZBqVtEW Si+gGLIPwe9pqd1lE9t8gGzeWNMcUCRdwMGjHoPIcWqzH5BD2dKkzyjjBSxXzuR+DpaA X00IZBd8LMi43DZ0LlEG0rs4Y5gchLiJFhOzy4+R69/PTVLdGULlnRZGMyydoNPDniU6 03eKw+N4ncIERd/DAJN3EvAAHRgiflR+oyWAXR1Mx9yZEt3Ue9B84spy/aa0RPACe6dw ArlQ== X-Forwarded-Encrypted: i=1; AHgh+Rqeqq09A5i+dmXReThGIGiDUXO36JvNMvK47QBcGQQN84RDe3N/mp8g/gdPfxiB8Kn3Fw09hFk=@vger.kernel.org X-Gm-Message-State: AOJu0Yyt5x3PveSG9yvp7GjDkh87hyv9g0yb6lDyjNtRtnQgWdnr6xOi CPM73cIhKmK4MlOmAL7hAAiGu7+O4gtfYU1GPeEIfZSA7pTwX4J0XwpR X-Gm-Gg: AfdE7ckpgLPjtFZhp/Qs+sIeociMuKDANdqejsOWtoNXfmOdeTK2+BIcvp2AZwS/LeD G7hd/dpbYmr5cvfRFynaGTwPWpLI6hXmwo44Oyo0EqpnAE+6YVEEhnCc7aM4R+sUEvrpKsLvNvi GS1LcS1ISqnOxXaqeGg+bDnON01Vi1HTXqFzTybQUQgeZZLQq2uPJN9VGAvAOgdk6f2nmvcsyab RjOOoml8Ax/tpzKUNjWXuEmW6dwted5bKhiH3odsicUL7x13MZqpyO4EJQiqe20MK9aQxKxd5/1 qdT87bxrjojhYkt7mAI+7RxW9VUK6nkO3LZqLzYVFqrIHa2iNM9T7L27jhkSeioxKMy6iYghl6x sNy7wQYs1cQi4EofOqdkKRiMqi+auiCM0iavtRsfsdjzNuARLGkuAF54hltWrxv4/uqmlegu9HO 8AZQBkngDjGIqGsFVRI589cpFD5YlxfeW2mqsFAyobnw== X-Received: by 2002:a05:6512:4481:b0:5ae:c201:c3d7 with SMTP id 2adb3069b0e04-5aec801063cmr603820e87.8.1782949374962; Wed, 01 Jul 2026 16:42:54 -0700 (PDT) Received: from localhost.localdomain ([2a01:4f9:2a:1c13::2]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-39b37fda160sm2836261fa.29.2026.07.01.16.42.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2026 16:42:53 -0700 (PDT) From: Melbin K Mathew To: deller@gmx.de Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Melbin K Mathew , stable@vger.kernel.org Subject: [PATCH v3 1/3] fbdev: bound mode sysfs output to the sysfs buffer Date: Thu, 2 Jul 2026 01:42:46 +0200 Message-Id: <20260701234248.236023-2-mlbnkm1@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260701231706.234715-1-mlbnkm1@gmail.com> References: <20260701231706.234715-1-mlbnkm1@gmail.com> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit mode_string() uses snprintf() which can return a value larger than the remaining buffer space. show_modes() accumulates the return value into i without checking whether i has reached PAGE_SIZE, causing the offset to advance past the sysfs buffer if the modelist is long enough. Add a size parameter to mode_string() and use scnprintf() to return only the bytes actually written. Add an early return when offset already exceeds the buffer. In show_modes(), stop accumulating once the buffer is full. Cc: stable@vger.kernel.org Signed-off-by: Melbin K Mathew --- drivers/video/fbdev/core/fbsysfs.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/video/fbdev/core/fbsysfs.c b/drivers/video/fbdev/core/fbsysfs.c index ea196603c7..af21dc5052 100644 --- a/drivers/video/fbdev/core/fbsysfs.c +++ b/drivers/video/fbdev/core/fbsysfs.c @@ -27,12 +27,15 @@ static int activate(struct fb_info *fb_info, struct fb_var_screeninfo *var) return 0; } -static int mode_string(char *buf, unsigned int offset, +static int mode_string(char *buf, size_t size, unsigned int offset, const struct fb_videomode *mode) { char m = 'U'; char v = 'p'; + if (offset >= size) + return 0; + if (mode->flag & FB_MODE_IS_DETAILED) m = 'D'; if (mode->flag & FB_MODE_IS_VESA) @@ -45,7 +48,7 @@ static int mode_string(char *buf, unsigned int offset, if (mode->vmode & FB_VMODE_DOUBLE) v = 'd'; - return snprintf(&buf[offset], PAGE_SIZE - offset, "%c:%dx%d%c-%d\n", + return scnprintf(&buf[offset], size - offset, "%c:%dx%d%c-%d\n", m, mode->xres, mode->yres, v, mode->refresh); } @@ -64,7 +67,7 @@ static ssize_t store_mode(struct device *device, struct device_attribute *attr, list_for_each_entry(modelist, &fb_info->modelist, list) { mode = &modelist->mode; - i = mode_string(mstr, 0, mode); + i = mode_string(mstr, sizeof(mstr), 0, mode); if (strncmp(mstr, buf, max(count, i)) == 0) { var = fb_info->var; @@ -86,7 +89,7 @@ static ssize_t show_mode(struct device *device, struct device_attribute *attr, if (!fb_info->mode) return 0; - return mode_string(buf, 0, fb_info->mode); + return mode_string(buf, PAGE_SIZE, 0, fb_info->mode); } static ssize_t store_modes(struct device *device, @@ -136,7 +139,9 @@ static ssize_t show_modes(struct device *device, struct device_attribute *attr, i = 0; list_for_each_entry(modelist, &fb_info->modelist, list) { mode = &modelist->mode; - i += mode_string(buf, i, mode); + i += mode_string(buf, PAGE_SIZE, i, mode); + if (i >= PAGE_SIZE - 1) + break; } return i; } -- 2.39.5