hpet, allow user controlled mmap for user processes
PATCH 1/1 hpet, allow user controlled mmap for user processes
The CONFIG_HPET_MMAP Kconfig option exposes the memory map of the HPET registers to userspace. The Kconfig help points out that in some cases this can be a security risk as some systems may erroneously configure the map such that additional data is exposed to userspace.
This is a problem for distributions -- some users want the MMAP functionality can verify that their systems are secure, but it comes with a significant security risk for those who do not want the functionality. In an effort to mitigate this risk, and due to the low number of users of the MMAP functionality I've introduced a kernel parameter, hpet_mmap_enable, that is required in order to actually have the HPET MMAP exposed.
--- Documentation/kernel-parameters.txt | 3 +++ drivers/char/hpet.c | 20 ++++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-)
Documentation/kernel-parameters.txt +3 -0
@@ -962,6 +962,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. VIA, nVidia) verbose: show contents of HPET registers during setup + hpet_mmap_enable [X86, HPET_MMAP] option to expose HPET MMAP to + userspace. By default this is disabled. + hugepages= [HW,X86-32,IA-64] HugeTLB pages to allocate at boot. hugepagesz= [HW,IA-64,PPC,X86-64] The size of the HugeTLB pages. On x86-64 and powerpc, this option can be specified
drivers/char/hpet.c +18 -2
@@ -367,12 +367,25 @@ static unsigned int hpet_poll(struct file *file, poll_table * wait)return 0 ; } +#ifdef CONFIG_HPET_MMAP +static int hpet_mmap_enabled; + +static __init int hpet_mmap_enable (char *str) +{ +pr_info (KERN_INFO "HPET MMAP enabled\n" ); + hpet_mmap_enabled =1 ; +return 1 ; +} +__setup ("hpet_mmap_enable" , hpet_mmap_enable); +static int hpet_mmap (struct file *file,struct vm_area_struct *vma) { -#ifdef CONFIG_HPET_MMAP struct hpet_dev *devp;unsigned long addr; +if (!hpet_mmap_enabled) +return -EACCES ; +if (((vma->vm_end - vma->vm_start) !=PAGE_SIZE ) || vma->vm_pgoff)return -EINVAL ;
@@ -393,10 +406,13 @@ static int hpet_mmap(struct file *file, struct vm_area_struct *vma) }return 0 ; +}#else +static int hpet_mmap (struct file *file,struct vm_area_struct *vma) +{return -ENOSYS ; -#endif } +#endif static int hpet_fasync (int fd,struct file *file,int on) {
Signature · 1 line
1.7.9.3
Clemens Ladisch
maintainerQuoted 4 lines · Prarit Bhargava
The
CONFIG_HPET_MMAPKconfigoption exposes the memory map of the HPET registers to userspace. TheKconfighelp points out that in some cases this can be a security risk as some systems may erroneously configure the map such that additional data is exposed to userspace.
I'm not aware of any such system (but cannot rule out the possibility).
Quoted 4 lines
In an effort to mitigate this risk, and due to the low number of users of the MMAP functionality I've introduced a kernel parameter,
hpet_mmap_enable, that is required in order to actually have the HPET MMAP exposed.
This introduces a regression for all users. At least make the default state (allowed/forbidden) configurable.
Also, this patch makes the Kconfig help text a lie.
Regards,
Clemens
The CONFIG_HPET_MMAP Kconfig option exposes the memory map of the HPET registers to userspace. The Kconfig help points out that in some cases this can be a security risk as some systems may erroneously configure the map such that additional data is exposed to userspace.
This is a problem for distributions -- some users want the MMAP functionality but it comes with a significant security risk. In an effort to mitigate this risk, and due to the low number of users of the MMAP functionality, I've introduced a kernel parameter, hpet_mmap_enable, that is required in order to actually have the HPET MMAP exposed.
[v2]: Clemens suggested modifying the Kconfig help text and making the default setting configurable.
--- Documentation/kernel-parameters.txt | 3 +++ drivers/char/Kconfig | 10 ++++++++-- drivers/char/hpet.c | 21 +++++++++++++++++++-- 3 files changed, 30 insertions(+), 4 deletions(-)
Documentation/kernel-parameters.txt +3 -0
@@ -962,6 +962,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. VIA, nVidia) verbose: show contents of HPET registers during setup + hpet_mmap_enable [X86, HPET_MMAP] option to expose HPET MMAP to + userspace. By default this is disabled. + hugepages= [HW,X86-32,IA-64] HugeTLB pages to allocate at boot. hugepagesz= [HW,IA-64,PPC,X86-64] The size of the HugeTLB pages. On x86-64 and powerpc, this option can be specified
drivers/char/Kconfig +8 -2
@@ -534,10 +534,16 @@ config HPET_MMAP If you say Y here, user applications will be able to mmap the HPET registers. +config HPET_MMAP_DEFAULT + int "Enable HPET MMAP access by default" + depends on HPET_MMAP + range 0 1 + default 0 + help In some hardware implementations, the page containing HPET registers may also contain other things that shouldn't be - exposed to the user. If this applies to your hardware, - say N here. + exposed to the user. This option selects the default user access + to the HPET registers for applications that require it. (0=off, 1=on) config HANGCHECK_TIMER tristate "Hangcheck timer"
drivers/char/hpet.c +19 -2
@@ -367,12 +367,26 @@ static unsigned int hpet_poll(struct file *file, poll_table * wait)return 0 ; } +#ifdef CONFIG_HPET_MMAP +static int hpet_mmap_enabled =CONFIG_HPET_MMAP_DEFAULT ; + +static __init int hpet_mmap_enable (char *str) +{ +get_option (&str, &hpet_mmap_enabled); +pr_info (KERN_INFO "HPET MMAP %s\n" , + hpet_mmap_enabled ?"disabled" :"enabled" ); +return 1 ; +} +__setup ("hpet_mmap" , hpet_mmap_enable); +static int hpet_mmap (struct file *file,struct vm_area_struct *vma) { -#ifdef CONFIG_HPET_MMAP struct hpet_dev *devp;unsigned long addr; +if (!hpet_mmap_enabled) +return -EACCES ; +if (((vma->vm_end - vma->vm_start) !=PAGE_SIZE ) || vma->vm_pgoff)return -EINVAL ;
@@ -393,10 +407,13 @@ static int hpet_mmap(struct file *file, struct vm_area_struct *vma) }return 0 ; +}#else +static int hpet_mmap (struct file *file,struct vm_area_struct *vma) +{return -ENOSYS ; -#endif } +#endif static int hpet_fasync (int fd,struct file *file,int on) {
Signature · 1 line
1.7.9.3
Clemens Ladisch
maintainerQuoted 18 lines · Prarit Bhargava
The
CONFIG_HPET_MMAPKconfigoption exposes the memory map of the HPET registers to userspace. TheKconfighelp points out that in some cases this can be a security risk as some systems may erroneously configure the map such that additional data is exposed to userspace.This is a problem for distributions -- some users want the MMAP functionality but it comes with a significant security risk. In an effort to mitigate this risk, and due to the low number of users of the MMAP functionality, I've introduced a kernel parameter,
hpet_mmap_enable, that is required in order to actually have the HPET MMAP exposed.[v2]: Clemens suggested modifying the
Kconfighelp text and making the default setting configurable.Signed-off-by Prarit Bhargava <[email protected]>Cc Clemens Ladisch <[email protected]>+++
b/Documentation/kernel-parameters.txt
Documentation/kernel-parameters.txt bytes respectively. Such letter suffixes can also be entirely omitted. · line 966
Quoted 2 lines
Documentation/kernel-parameters.txt +2
-0+ hpet_mmap_enable [X86, HPET_MMAP] option to expose HPET MMAP to + userspace. By default this is disabled.
This now takes a value.
drivers/char/Kconfig config HPET_MMAP · line 540
Quoted 2 lines
drivers/char/Kconfig +2
-0+ int "Enable HPET MMAP access by default" + range 0 1
Shouldn't this be bool?
drivers/char/Kconfig config HPET_MMAP · line 541
Quoted 1 line
drivers/char/Kconfig +1
-0+ default 0
This breaks backwards compatibility.
Regards,
Clemens
Quoted 24 lines · Clemens Ladisch
Quoted 18 lines · Prarit Bhargava
The
CONFIG_HPET_MMAPKconfigoption exposes the memory map of the HPET registers to userspace. TheKconfighelp points out that in some cases this can be a security risk as some systems may erroneously configure the map such that additional data is exposed to userspace.This is a problem for distributions -- some users want the MMAP functionality but it comes with a significant security risk. In an effort to mitigate this risk, and due to the low number of users of the MMAP functionality, I've introduced a kernel parameter,
hpet_mmap_enable, that is required in order to actually have the HPET MMAP exposed.[v2]: Clemens suggested modifying the
Kconfighelp text and making the default setting configurable.Signed-off-by Prarit Bhargava <[email protected]>Cc Clemens Ladisch <[email protected]>+++
b/Documentation/kernel-parameters.txtDocumentation/kernel-parameters.txt bytes respectively. Such letter suffixes can also be entirely omitted. · line 966
Quoted 2 lines
Documentation/kernel-parameters.txt +2
-0+ hpet_mmap_enable [X86, HPET_MMAP] option to expose HPET MMAP to + userspace. By default this is disabled.This now takes a value.
Quoted 4 lines
drivers/char/Kconfig config HPET_MMAP · line 540
Quoted 2 lines
drivers/char/Kconfig +2
-0+ int "Enable HPET MMAP access by default" + range 0 1Shouldn't this be bool?
I'll fix those in v3.
Quoted 4 lines
drivers/char/Kconfig config HPET_MMAP · line 541
Quoted 2 lines
drivers/char/Kconfig +1
-0+ default 0This breaks backwards compatibility.
Does backwards compatibility matter for something like? I have no problem setting it to 1 but I'm more curious from a general kernel point of view.
I'll change this in v3 as well.
P.
P.
Quoted 4 lines
Regards,
Clemens
Clemens Ladisch
maintainerQuoted 9 lines · Prarit Bhargava
Quoted 5 lines · Clemens Ladisch
drivers/char/Kconfig config HPET_MMAP · line 541
Quoted 2 lines · Prarit Bhargava
drivers/char/Kconfig +2
-0+ int "Enable HPET MMAP access by default" + default 0This breaks backwards compatibility.
Does backwards compatibility matter for something like? I have no problem setting it to 1 but I'm more curious from a general kernel point of view.
When somebody updates from some old kernel where HPET mmap was explicitly enabled, this default value will now disable it. The default behaviour should always be to be compatible with older kernels.
Regards,
Clemens
PATCH 1/1 hpet, allow user controlled mmap for user processes
The CONFIG_HPET_MMAP Kconfig option exposes the memory map of the HPET registers to userspace. The Kconfig help points out that in some cases this can be a security risk as some systems may erroneously configure the map such that additional data is exposed to userspace.
This is a problem for distributions -- some users want the MMAP functionality but it comes with a significant security risk. In an effort to mitigate this risk, and due to the low number of users of the MMAP functionality, I've introduced a kernel parameter, hpet_mmap_enable, that is required in order to actually have the HPET MMAP exposed.
[v2]: Clemens suggested modifying the Kconfig help text and making the default setting configurable.
[v3]: Fixed up Documentation and Kconfig entries, default now "Y" [v4]: After testing, found that I need to modify CONFIG_HPET_MMAP_DEFAULT usage
--- Documentation/kernel-parameters.txt | 4 ++++ drivers/char/Kconfig | 9 +++++++-- drivers/char/hpet.c | 25 +++++++++++++++++++++++-- 3 files changed, 34 insertions(+), 4 deletions(-)
Documentation/kernel-parameters.txt +4 -0
@@ -962,6 +962,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. VIA, nVidia) verbose: show contents of HPET registers during setup + hpet_mmap= [X86, HPET_MMAP] option to expose HPET MMAP to + userspace. By default this is disabled. Values are + 0(disabled) or 1(enabled). + hugepages= [HW,X86-32,IA-64] HugeTLB pages to allocate at boot. hugepagesz= [HW,IA-64,PPC,X86-64] The size of the HugeTLB pages. On x86-64 and powerpc, this option can be specified
drivers/char/Kconfig +7 -2
@@ -534,10 +534,15 @@ config HPET_MMAP If you say Y here, user applications will be able to mmap the HPET registers. +config HPET_MMAP_DEFAULT + bool "Enable HPET MMAP access by default" + default y + depends on HPET_MMAP + help In some hardware implementations, the page containing HPET registers may also contain other things that shouldn't be - exposed to the user. If this applies to your hardware, - say N here. + exposed to the user. This option selects the default user access + to the HPET registers for applications that require it. config HANGCHECK_TIMER tristate "Hangcheck timer"
drivers/char/hpet.c +23 -2
@@ -367,12 +367,30 @@ static unsigned int hpet_poll(struct file *file, poll_table * wait)return 0 ; } +#ifdef CONFIG_HPET_MMAP +#ifdef CONFIG_HPET_MMAP_DEFAULT +static int hpet_mmap_enabled =1 ; +#else +static int hpet_mmap_enabled =0 ; +#endif + +static __init int hpet_mmap_enable (char *str) +{ +get_option (&str, &hpet_mmap_enabled); +pr_info (KERN_INFO "HPET MMAP %s\n" , + hpet_mmap_enabled ?"disabled" :"enabled" ); +return 1 ; +} +__setup ("hpet_mmap" , hpet_mmap_enable); +static int hpet_mmap (struct file *file,struct vm_area_struct *vma) { -#ifdef CONFIG_HPET_MMAP struct hpet_dev *devp;unsigned long addr; +if (!hpet_mmap_enabled) +return -EACCES ; +if (((vma->vm_end - vma->vm_start) !=PAGE_SIZE ) || vma->vm_pgoff)return -EINVAL ;
@@ -393,10 +411,13 @@ static int hpet_mmap(struct file *file, struct vm_area_struct *vma) }return 0 ; +}#else +static int hpet_mmap (struct file *file,struct vm_area_struct *vma) +{return -ENOSYS ; -#endif } +#endif static int hpet_fasync (int fd,struct file *file,int on) {
Signature · 1 line
1.7.9.3
Quoted 16 lines · Prarit Bhargava
The
CONFIG_HPET_MMAPKconfigoption exposes the memory map of the HPET registers to userspace. TheKconfighelp points out that in some cases this can be a security risk as some systems may erroneously configure the map such that additional data is exposed to userspace.This is a problem for distributions -- some users want the MMAP functionality but it comes with a significant security risk. In an effort to mitigate this risk, and due to the low number of users of the MMAP functionality, I've introduced a kernel parameter,
hpet_mmap_enable, that is required in order to actually have the HPET MMAP exposed.[v2]: Clemens suggested modifying the
Kconfighelp text and making the default setting configurable.
[v3]: Fixed up Documentation andKconfigentries, default now "Y" [v4]: After testing, found that I need to modifyCONFIG_HPET_MMAP_DEFAULTusage
Quoted 7 lines
Signed-off-by Prarit Bhargava <[email protected]>Cc Clemens Ladisch <[email protected]>--- Documentation/kernel-parameters.txt | 4 ++++ drivers/char/Kconfig | 9 +++++++-- drivers/char/hpet.c | 25 +++++++++++++++++++++++-- 3 files changed, 34 insertions(+), 4 deletions(-)
It doesn't seem like this patch got picked up and seems like a good idea to me. Clemens, what do you think?
--msw
Quoted 25 lines · Matt Wilson
Quoted 16 lines · Prarit Bhargava
The
CONFIG_HPET_MMAPKconfigoption exposes the memory map of the HPET registers to userspace. TheKconfighelp points out that in some cases this can be a security risk as some systems may erroneously configure the map such that additional data is exposed to userspace.This is a problem for distributions -- some users want the MMAP functionality but it comes with a significant security risk. In an effort to mitigate this risk, and due to the low number of users of the MMAP functionality, I've introduced a kernel parameter,
hpet_mmap_enable, that is required in order to actually have the HPET MMAP exposed.[v2]: Clemens suggested modifying the
Kconfighelp text and making the default setting configurable.
[v3]: Fixed up Documentation andKconfigentries, default now "Y" [v4]: After testing, found that I need to modifyCONFIG_HPET_MMAP_DEFAULTusageQuoted 7 lines
Signed-off-by Prarit Bhargava <[email protected]>Cc Clemens Ladisch <[email protected]>--- Documentation/kernel-parameters.txt | 4 ++++ drivers/char/Kconfig | 9 +++++++-- drivers/char/hpet.c | 25 +++++++++++++++++++++++-- 3 files changed, 34 insertions(+), 4 deletions(-)
Quoted 5 lines
It doesn't seem like this patch got picked up and seems like a good idea to me. Clemens, what do you think?
Acked-by Matt Wilson <[email protected]>
Clemens? I didn't see a reply...
P.
Clemens Ladisch
maintainerPATCH 1/1 hpet: allow user controlled mmap for user processes
From: Prarit Bhargava <[email protected]>
The CONFIG_HPET_MMAP Kconfig option exposes the memory map of the HPET registers to userspace. The Kconfig help points out that in some cases this can be a security risk as some systems may erroneously configure the map such that additional data is exposed to userspace.
This is a problem for distributions -- some users want the MMAP functionality but it comes with a significant security risk. In an effort to mitigate this risk, and due to the low number of users of the MMAP functionality, I've introduced a kernel parameter, hpet_mmap_enable, that is required in order to actually have the HPET MMAP exposed.
[v2]: Clemens suggested modifying the Kconfig help text and making the
default setting configurable.
[v3]: Fixed up Documentation and Kconfig entries, default now "Y" [v4]: After testing, found that I need to modify CONFIG_HPET_MMAP_DEFAULT usage [v5]: Fixed up Documentation, Kconfig entry, and log message [CL]
--- Documentation/kernel-parameters.txt | 3 +++ drivers/char/Kconfig | 10 ++++++++-- drivers/char/hpet.c | 24 ++++++++++++++++++++++-- 3 files changed, 33 insertions(+), 4 deletions(-)
Documentation/kernel-parameters.txt +3 -0
@@ -1064,6 +1064,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. VIA, nVidia) verbose: show contents of HPET registers during setup + hpet_mmap= [X86, HPET_MMAP] Allow userspace to mmap HPET + registers. Default set by CONFIG_HPET_MMAP_DEFAULT. + hugepages= [HW,X86-32,IA-64] HugeTLB pages to allocate at boot. hugepagesz= [HW,IA-64,PPC,X86-64] The size of the HugeTLB pages. On x86-64 and powerpc, this option can be specified
drivers/char/Kconfig +8 -2
@@ -522,10 +522,16 @@ config HPET_MMAP If you say Y here, user applications will be able to mmap the HPET registers. +config HPET_MMAP_DEFAULT + bool "Enable HPET MMAP access by default" + default y + depends on HPET_MMAP + help In some hardware implementations, the page containing HPET registers may also contain other things that shouldn't be - exposed to the user. If this applies to your hardware, - say N here. + exposed to the user. This option selects the default (if + kernel parameter hpet_mmap is not set) user access to the + registers for applications that require it. config HANGCHECK_TIMER tristate "Hangcheck timer"
drivers/char/hpet.c +22 -2
@@ -367,12 +367,29 @@ static unsigned int hpet_poll(struct file *file, poll_table * wait)return 0 ; } +#ifdef CONFIG_HPET_MMAP +#ifdef CONFIG_HPET_MMAP_DEFAULT +static int hpet_mmap_enabled =1 ; +#else +static int hpet_mmap_enabled =0 ; +#endif + +static __init int hpet_mmap_enable (char *str) +{ +get_option (&str, &hpet_mmap_enabled); +pr_info ("HPET mmap %s\n" , hpet_mmap_enabled ?"enabled" :"disabled" ); +return 1 ; +} +__setup ("hpet_mmap" , hpet_mmap_enable); +static int hpet_mmap (struct file *file,struct vm_area_struct *vma) { -#ifdef CONFIG_HPET_MMAP struct hpet_dev *devp;unsigned long addr; +if (!hpet_mmap_enabled) +return -EACCES ; + devp = file->private_data; addr = devp->hd_hpets->hp_hpet_phys;
@@ -381,10 +398,13 @@ static int hpet_mmap(struct file *file, struct vm_area_struct *vma) vma->vm_page_prot =pgprot_noncached (vma->vm_page_prot); return vm_iomap_memory(vma, addr, PAGE_SIZE); +}#else +static int hpet_mmap (struct file *file,struct vm_area_struct *vma) +{return -ENOSYS ; -#endif } +#endif static int hpet_fasync (int fd,struct file *file,int on) {
The CONFIG_HPET_MMAP Kconfig option exposes the memory map of the HPET registers to userspace. The Kconfig help points out that in some cases this can be a security risk as some systems may erroneously configure the map such that additional data is exposed to userspace.
This is a problem for distributions -- some users want the MMAP functionality but it comes with a significant security risk. In an effort to mitigate this risk, and due to the low number of users of the MMAP functionality, I've introduced a kernel parameter, hpet_mmap_enable, that is required in order to actually have the HPET MMAP exposed.
[v2]: Clemens suggested modifying the Kconfig help text and making the default setting configurable.
[v3]: Fixed up Documentation and Kconfig entries, default now "Y"
--- Documentation/kernel-parameters.txt | 4 ++++ drivers/char/Kconfig | 9 +++++++-- drivers/char/hpet.c | 21 +++++++++++++++++++-- 3 files changed, 30 insertions(+), 4 deletions(-)
Documentation/kernel-parameters.txt +4 -0
@@ -962,6 +962,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. VIA, nVidia) verbose: show contents of HPET registers during setup + hpet_mmap= [X86, HPET_MMAP] option to expose HPET MMAP to + userspace. By default this is disabled. Values are + 0(disabled) or 1(enabled). + hugepages= [HW,X86-32,IA-64] HugeTLB pages to allocate at boot. hugepagesz= [HW,IA-64,PPC,X86-64] The size of the HugeTLB pages. On x86-64 and powerpc, this option can be specified
drivers/char/Kconfig +7 -2
@@ -534,10 +534,15 @@ config HPET_MMAP If you say Y here, user applications will be able to mmap the HPET registers. +config HPET_MMAP_DEFAULT + bool "Enable HPET MMAP access by default" + default y + depends on HPET_MMAP + help In some hardware implementations, the page containing HPET registers may also contain other things that shouldn't be - exposed to the user. If this applies to your hardware, - say N here. + exposed to the user. This option selects the default user access + to the HPET registers for applications that require it. config HANGCHECK_TIMER tristate "Hangcheck timer"
drivers/char/hpet.c +19 -2
@@ -367,12 +367,26 @@ static unsigned int hpet_poll(struct file *file, poll_table * wait)return 0 ; } +#ifdef CONFIG_HPET_MMAP +static int hpet_mmap_enabled =CONFIG_HPET_MMAP_DEFAULT ; + +static __init int hpet_mmap_enable (char *str) +{ +get_option (&str, &hpet_mmap_enabled); +pr_info (KERN_INFO "HPET MMAP %s\n" , + hpet_mmap_enabled ?"disabled" :"enabled" ); +return 1 ; +} +__setup ("hpet_mmap" , hpet_mmap_enable); +static int hpet_mmap (struct file *file,struct vm_area_struct *vma) { -#ifdef CONFIG_HPET_MMAP struct hpet_dev *devp;unsigned long addr; +if (!hpet_mmap_enabled) +return -EACCES ; +if (((vma->vm_end - vma->vm_start) !=PAGE_SIZE ) || vma->vm_pgoff)return -EINVAL ;
@@ -393,10 +407,13 @@ static int hpet_mmap(struct file *file, struct vm_area_struct *vma) }return 0 ; +}#else +static int hpet_mmap (struct file *file,struct vm_area_struct *vma) +{return -ENOSYS ; -#endif } +#endif static int hpet_fasync (int fd,struct file *file,int on) {
Signature · 1 line
1.8.1