| Message ID | 20201208195434.8289-1-tyreld@linux.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f10881a46f8914428110d110140a455c66bdf27b |
| Headers | show |
| Series | powerpc/rtas: fix typo of ibm,open-errinjct in rtas filter | expand |
On 9/12/20 6:54 am, Tyrel Datwyler wrote: > Commit bd59380c5ba4 ("powerpc/rtas: Restrict RTAS requests from userspace") > introduced the following error when invoking the errinjct userspace > tool. > > [root@ltcalpine2-lp5 librtas]# errinjct open > [327884.071171] sys_rtas: RTAS call blocked - exploit attempt? > [327884.071186] sys_rtas: token=0x26, nargs=0 (called by errinjct) > errinjct: Could not open RTAS error injection facility > errinjct: librtas: open: Unexpected I/O error > > The entry for ibm,open-errinjct in rtas_filter array has a typo where > the "j" is omitted in the rtas call name. After fixing this typo the > errinjct tool functions again as expected. > > [root@ltcalpine2-lp5 linux]# errinjct open > RTAS error injection facility open, token = 1 > > fixes: bd59380c5ba4 ("powerpc/rtas: Restrict RTAS requests from userspace") > Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com> Thanks for catching this! Acked-by: Andrew Donnellan <ajd@linux.ibm.com>
On Tue, 8 Dec 2020 13:54:34 -0600, Tyrel Datwyler wrote: > Commit bd59380c5ba4 ("powerpc/rtas: Restrict RTAS requests from userspace") > introduced the following error when invoking the errinjct userspace > tool. > > [root@ltcalpine2-lp5 librtas]# errinjct open > [327884.071171] sys_rtas: RTAS call blocked - exploit attempt? > [327884.071186] sys_rtas: token=0x26, nargs=0 (called by errinjct) > errinjct: Could not open RTAS error injection facility > errinjct: librtas: open: Unexpected I/O error > > [...] Applied to powerpc/next. [1/1] powerpc/rtas: Fix typo of ibm,open-errinjct in RTAS filter https://git.kernel.org/powerpc/c/f10881a46f8914428110d110140a455c66bdf27b cheers
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index 954f41676f69..cccb32cf0e08 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c @@ -1030,7 +1030,7 @@ static struct rtas_filter rtas_filters[] __ro_after_init = { { "ibm,display-message", -1, 0, -1, -1, -1 }, { "ibm,errinjct", -1, 2, -1, -1, -1, 1024 }, { "ibm,close-errinjct", -1, -1, -1, -1, -1 }, - { "ibm,open-errinct", -1, -1, -1, -1, -1 }, + { "ibm,open-errinjct", -1, -1, -1, -1, -1 }, { "ibm,get-config-addr-info2", -1, -1, -1, -1, -1 }, { "ibm,get-dynamic-sensor-state", -1, 1, -1, -1, -1 }, { "ibm,get-indices", -1, 2, 3, -1, -1 },
Commit bd59380c5ba4 ("powerpc/rtas: Restrict RTAS requests from userspace") introduced the following error when invoking the errinjct userspace tool. [root@ltcalpine2-lp5 librtas]# errinjct open [327884.071171] sys_rtas: RTAS call blocked - exploit attempt? [327884.071186] sys_rtas: token=0x26, nargs=0 (called by errinjct) errinjct: Could not open RTAS error injection facility errinjct: librtas: open: Unexpected I/O error The entry for ibm,open-errinjct in rtas_filter array has a typo where the "j" is omitted in the rtas call name. After fixing this typo the errinjct tool functions again as expected. [root@ltcalpine2-lp5 linux]# errinjct open RTAS error injection facility open, token = 1 fixes: bd59380c5ba4 ("powerpc/rtas: Restrict RTAS requests from userspace") Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com> --- arch/powerpc/kernel/rtas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)