2005-02-04 09:35:03

by Fabio Massimo Di Nitto

Subject: [PATCH] x86_64: parse noexec=[on|off]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,
the patch fixes the noexec= boot option on x86_64 to actually work when other
options come after it.

Credits (if any ;)) should go to Matt Zimmerman and Colin Watson for spotting
the problem and providing/testing the fix.

Best Regards,
Fabio

diff -urNad linux-source-2.6.10-2.6.10/arch/x86_64/kernel/setup64.c /usr/src/dpatchtemp/dpep.fC5FuB/linux-source-2.6.10-2.6.10/arch/x86_64/kernel/setup64.c
- --- linux-source-2.6.10-2.6.10/arch/x86_64/kernel/setup64.c 2005-02-04 09:16:07.000000000 +0100
+++ /usr/src/dpatchtemp/dpep.fC5FuB/linux-source-2.6.10-2.6.10/arch/x86_64/kernel/setup64.c 2005-02-04 09:17:29.832897272 +0100
@@ -52,10 +52,10 @@
*/
void __init nonx_setup(const char *str)
{
- - if (!strcmp(str, "on")) {
+ if (!strncmp(str, "on", 2)) {
__supported_pte_mask |= _PAGE_NX;
do_not_nx = 0;
- - } else if (!strcmp(str, "off")) {
+ } else if (!strncmp(str, "off", 3)) {
do_not_nx = 1;
__supported_pte_mask &= ~_PAGE_NX;
}

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)

iD8DBQFCA0CVhCzbekR3nhgRAhwqAKCZTa/CefbSGX/1SsCzr3CJBf61gQCdGqac
lAVVeWjAxi+KZFiiu1Ukqkw=
=ARdl
-----END PGP SIGNATURE-----

2005-02-04 12:54:37

by Andi Kleen

Subject: Re: [PATCH] x86_64: parse noexec=[on|off]

[email protected] (Fabio Massimo Di Nitto) writes:

> Hi,
> the patch fixes the noexec= boot option on x86_64 to actually work when other
> options come after it.
>
> Credits (if any ;)) should go to Matt Zimmerman and Colin Watson for spotting
> the problem and providing/testing the fix.

Thanks merged and I audited the other early options.

Please send all future x86-64 patches directly to me.


-Andi