All of lore.kernel.org
 help / color / mirror / Atom feed
From: will.deacon@arm.com (Will Deacon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm64: fix off-by-one in compat syscall table for syscalls over 382
Date: Tue, 22 Dec 2015 17:16:12 +0000	[thread overview]
Message-ID: <1450804573-322-1-git-send-email-will.deacon@arm.com> (raw)

[fix targetting -stable only, no upstream commit required]

In the bad old days, our compat syscall table was a linear array
defined in assembly code using a series of .quad directives generated
from a preprocessed header file.

When I added compat support for memfd_create and getrandom in commit
a97a42c47608 ("arm64: compat: wire up memfd_create and getrandom
syscalls for aarch32"), I forgot to pad the gap where seccomp was due
to go, and so the new syscalls actually ended up being off-by-one in the
table for v3.17 and v3.18 (in 3.19 seccomp was added and in v4.0 we
moved the table construction into C).

This patch is intended for -stable trees based on v3.17 or v3.18.

Cc: <stable@vger.kernel.org> # 3.17 and 3.18 only
Fixes: a97a42c47608 ("arm64: compat: wire up memfd_create and getrandom syscalls for aarch32")
Reported-by: Edmund Grimley-Evans <Edmund.Grimley-Evans@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
 arch/arm64/include/asm/unistd32.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h
index 9dfdac4a74a1..fbe1ab059bbb 100644
--- a/arch/arm64/include/asm/unistd32.h
+++ b/arch/arm64/include/asm/unistd32.h
@@ -788,6 +788,7 @@ __SYSCALL(__NR_sched_getattr, sys_sched_getattr)
 #define __NR_renameat2 382
 __SYSCALL(__NR_renameat2, sys_renameat2)
 			/* 383 for seccomp */
+__SYSCALL(383, sys_ni_syscall)
 #define __NR_getrandom 384
 __SYSCALL(__NR_getrandom, sys_getrandom)
 #define __NR_memfd_create 385
-- 
2.1.4

WARNING: multiple messages have this Message-ID (diff)
From: Will Deacon <will.deacon@arm.com>
To: stable@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org, Will Deacon <will.deacon@arm.com>
Subject: [PATCH] arm64: fix off-by-one in compat syscall table for syscalls over 382
Date: Tue, 22 Dec 2015 17:16:12 +0000	[thread overview]
Message-ID: <1450804573-322-1-git-send-email-will.deacon@arm.com> (raw)

[fix targetting -stable only, no upstream commit required]

In the bad old days, our compat syscall table was a linear array
defined in assembly code using a series of .quad directives generated
from a preprocessed header file.

When I added compat support for memfd_create and getrandom in commit
a97a42c47608 ("arm64: compat: wire up memfd_create and getrandom
syscalls for aarch32"), I forgot to pad the gap where seccomp was due
to go, and so the new syscalls actually ended up being off-by-one in the
table for v3.17 and v3.18 (in 3.19 seccomp was added and in v4.0 we
moved the table construction into C).

This patch is intended for -stable trees based on v3.17 or v3.18.

Cc: <stable@vger.kernel.org> # 3.17 and 3.18 only
Fixes: a97a42c47608 ("arm64: compat: wire up memfd_create and getrandom syscalls for aarch32")
Reported-by: Edmund Grimley-Evans <Edmund.Grimley-Evans@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
 arch/arm64/include/asm/unistd32.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h
index 9dfdac4a74a1..fbe1ab059bbb 100644
--- a/arch/arm64/include/asm/unistd32.h
+++ b/arch/arm64/include/asm/unistd32.h
@@ -788,6 +788,7 @@ __SYSCALL(__NR_sched_getattr, sys_sched_getattr)
 #define __NR_renameat2 382
 __SYSCALL(__NR_renameat2, sys_renameat2)
 			/* 383 for seccomp */
+__SYSCALL(383, sys_ni_syscall)
 #define __NR_getrandom 384
 __SYSCALL(__NR_getrandom, sys_getrandom)
 #define __NR_memfd_create 385
-- 
2.1.4


             reply	other threads:[~2015-12-22 17:16 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-22 17:16 Will Deacon [this message]
2015-12-22 17:16 ` [PATCH] arm64: fix off-by-one in compat syscall table for syscalls over 382 Will Deacon
2016-01-18 12:24 ` Will Deacon
2016-01-18 12:24   ` Will Deacon
2016-01-24 21:41   ` Greg KH
2016-01-24 21:41     ` Greg KH

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=1450804573-322-1-git-send-email-will.deacon@arm.com \
    --to=will.deacon@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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.