From: Andrew Morton <akpm@linux-foundation.org>
To: mm-commits@vger.kernel.org,yujie.liu@intel.com,usama.anjum@collabora.com,pedro.falcato@gmail.com,jeffxu@chromium.org,akpm@linux-foundation.org
Subject: [folded-merged] selftest-mm-mseal-read-only-elf-memory-segment-fix-3.patch removed from -mm tree
Date: Sat, 11 May 2024 14:50:23 -0700 [thread overview]
Message-ID: <20240511215023.8FC41C2BBFC@smtp.kernel.org> (raw)
The quilt patch titled
Subject: selftest mm/mseal: fix compile warning
has been removed from the -mm tree. Its filename was
selftest-mm-mseal-read-only-elf-memory-segment-fix-3.patch
This patch was dropped because it was folded into selftest-mm-mseal-read-only-elf-memory-segment.patch
------------------------------------------------------
From: Jeff Xu <jeffxu@chromium.org>
Subject: selftest mm/mseal: fix compile warning
Date: Sat, 20 Apr 2024 00:35:15 +0000
fix compile warning reported by test robot
Link: https://lkml.kernel.org/r/20240420003515.345982-2-jeffxu@chromium.org
Signed-off-by: Jeff Xu <jeffxu@chromium.org>
Reported-by: kernel test robot <yujie.liu@intel.com>
Closes: https://lore.kernel.org/r/202404190226.OfJOewV8-lkp@intel.com/
Suggested-by: Pedro Falcato <pedro.falcato@gmail.com>
Reviewed-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
tools/testing/selftests/mm/mseal_test.c | 3 +--
tools/testing/selftests/mm/seal_elf.c | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
--- a/tools/testing/selftests/mm/mseal_test.c~selftest-mm-mseal-read-only-elf-memory-segment-fix-3
+++ a/tools/testing/selftests/mm/mseal_test.c
@@ -79,7 +79,7 @@ static unsigned long get_vma_size(void *
return 0;
while (fgets(line, sizeof(line), maps)) {
- if (sscanf(line, "%lx-%lx %4s", &addr_start, &addr_end, &protstr) == 3) {
+ if (sscanf(line, "%lx-%lx %4s", &addr_start, &addr_end, protstr) == 3) {
if (addr_start == (uintptr_t) addr) {
size = addr_end - addr_start;
if (protstr[0] == 'r')
@@ -208,7 +208,6 @@ static u64 set_pkey_bits(u64 reg, int pk
static void set_pkey(int pkey, unsigned long pkey_value)
{
- unsigned long mask = (PKEY_DISABLE_ACCESS | PKEY_DISABLE_WRITE);
u64 new_pkey_reg;
new_pkey_reg = set_pkey_bits(__read_pkey_reg(), pkey, pkey_value);
--- a/tools/testing/selftests/mm/seal_elf.c~selftest-mm-mseal-read-only-elf-memory-segment-fix-3
+++ a/tools/testing/selftests/mm/seal_elf.c
@@ -105,7 +105,6 @@ static void test_seal_elf(void)
int ret;
FILE *maps;
char line[512];
- int size = 0;
uintptr_t addr_start, addr_end;
char prot[5];
char filename[256];
@@ -136,7 +135,7 @@ static void test_seal_elf(void)
*/
while (fgets(line, sizeof(line), maps)) {
if (sscanf(line, "%lx-%lx %4s %*x %*x:%*x %*u %255[^\n]",
- &addr_start, &addr_end, &prot, &filename) == 4) {
+ &addr_start, &addr_end, prot, filename) == 4) {
if (strlen(filename)) {
/*
* seal the mapping if read only.
_
Patches currently in -mm which might be from jeffxu@chromium.org are
mseal-wire-up-mseal-syscall.patch
mseal-add-mseal-syscall.patch
selftest-mm-mseal-memory-sealing.patch
mseal-add-documentation.patch
selftest-mm-mseal-read-only-elf-memory-segment.patch
selftest-mm-mseal-read-only-elf-memory-segment-fix-4.patch
reply other threads:[~2024-05-11 21:50 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20240511215023.8FC41C2BBFC@smtp.kernel.org \
--to=akpm@linux-foundation.org \
--cc=jeffxu@chromium.org \
--cc=mm-commits@vger.kernel.org \
--cc=pedro.falcato@gmail.com \
--cc=usama.anjum@collabora.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).