All of lore.kernel.org
 help / color / mirror / Atom feed
From: <gregkh@linuxfoundation.org>
To: ebiggers@google.com,ebiggers@kernel.org,gregkh@linuxfoundation.org,joe@perches.com,linux-mm@kvack.org,lucaswei@google.com,yujie.liu@intel.com
Cc: <stable-commits@vger.kernel.org>
Subject: Patch "fs: sysfs_emit_at: Remove PAGE_SIZE alignment check" has been added to the 4.19-stable tree
Date: Fri, 17 Mar 2023 14:02:38 +0100	[thread overview]
Message-ID: <167905815836131@kroah.com> (raw)
In-Reply-To: <20230317062743.313169-1-ebiggers@kernel.org>


This is a note to let you know that I've just added the patch titled

    fs: sysfs_emit_at: Remove PAGE_SIZE alignment check

to the 4.19-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     fs-sysfs_emit_at-remove-page_size-alignment-check.patch
and it can be found in the queue-4.19 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


From ebiggers@kernel.org  Fri Mar 17 13:57:17 2023
From: Eric Biggers <ebiggers@kernel.org>
Date: Thu, 16 Mar 2023 23:27:43 -0700
Subject: fs: sysfs_emit_at: Remove PAGE_SIZE alignment check
To: stable@vger.kernel.org
Cc: Joe Perches <joe@perches.com>, Lucas Wei <lucaswei@google.com>, linux-mm@kvack.org, kernel test robot <yujie.liu@intel.com>
Message-ID: <20230317062743.313169-1-ebiggers@kernel.org>

From: Eric Biggers <ebiggers@kernel.org>

From: Eric Biggers <ebiggers@google.com>

[No upstream commit because this fixes a bug in a backport.]

Before upstream commit 59bb47985c1d ("mm, sl[aou]b: guarantee natural
alignment for kmalloc(power-of-two)") which went into v5.4, kmalloc did
*not* always guarantee that PAGE_SIZE allocations are PAGE_SIZE-aligned.

Upstream commit 2efc459d06f1 ("sysfs: Add sysfs_emit and sysfs_emit_at
to format sysfs output") added two WARN()s that trigger when PAGE_SIZE
allocations are not PAGE_SIZE-aligned.  This was backported to old
kernels that don't guarantee PAGE_SIZE alignment.

Commit 10ddfb495232 ("fs: sysfs_emit: Remove PAGE_SIZE alignment check")
in 4.19.y, and its equivalent in 4.14.y and 4.9.y, tried to fix this
bug.  However, only it handled sysfs_emit(), not sysfs_emit_at().

Fix it in sysfs_emit_at() too.

A reproducer is to build the kernel with the following options:

	CONFIG_SLUB=y
	CONFIG_SLUB_DEBUG=y
	CONFIG_SLUB_DEBUG_ON=y
	CONFIG_PM=y
	CONFIG_SUSPEND=y
	CONFIG_PM_WAKELOCKS=y

Then run:

	echo foo > /sys/power/wake_lock && cat /sys/power/wake_lock

Fixes: cb1f69d53ac8 ("sysfs: Add sysfs_emit and sysfs_emit_at to format sysfs output")
Reported-by: kernel test robot <yujie.liu@intel.com>
Link: https://lore.kernel.org/r/202303141634.1e64fd76-yujie.liu@intel.com
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 fs/sysfs/file.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -599,7 +599,7 @@ int sysfs_emit_at(char *buf, int at, con
 	va_list args;
 	int len;
 
-	if (WARN(!buf || offset_in_page(buf) || at < 0 || at >= PAGE_SIZE,
+	if (WARN(!buf || at < 0 || at >= PAGE_SIZE,
 		 "invalid sysfs_emit_at: buf:%p at:%d\n", buf, at))
 		return 0;
 


Patches currently in stable-queue which might be from ebiggers@kernel.org are

queue-4.19/fs-sysfs_emit_at-remove-page_size-alignment-check.patch
queue-4.19/ext4-fix-cgroup-writeback-accounting-with-fs-layer-encryption.patch


      parent reply	other threads:[~2023-03-17 13:02 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-17  6:27 [PATCH 4.19] fs: sysfs_emit_at: Remove PAGE_SIZE alignment check Eric Biggers
2023-03-17 13:02 ` Patch "fs: sysfs_emit_at: Remove PAGE_SIZE alignment check" has been added to the 4.14-stable tree gregkh
2023-03-17 13:02 ` gregkh [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=167905815836131@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=ebiggers@google.com \
    --cc=ebiggers@kernel.org \
    --cc=joe@perches.com \
    --cc=linux-mm@kvack.org \
    --cc=lucaswei@google.com \
    --cc=stable-commits@vger.kernel.org \
    --cc=yujie.liu@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.