diff options
| author | Qianfeng Rong <rongqianfeng@vivo.com> | 2025-08-15 11:56:03 +0800 |
|---|---|---|
| committer | Paul Moore <paul@paul-moore.com> | 2025-08-18 15:41:47 -0400 |
| commit | e73f759d2e98c729ca6f98dad4ca6d7b9120e576 (patch) | |
| tree | 664b347f403e36548c68a11e9a7c239cdead7620 /security/min_addr.c | |
| parent | lsm,selinux: Add LSM blob support for BPF objects (diff) | |
| download | linux-e73f759d2e98c729ca6f98dad4ca6d7b9120e576.tar.gz linux-e73f759d2e98c729ca6f98dad4ca6d7b9120e576.zip | |
security: use umax() to improve code
Use umax() to reduce the code in update_mmap_min_addr() and improve its
readability.
Signed-off-by: Qianfeng Rong <rongqianfeng@vivo.com>
[PM: subj line tweak]
Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'security/min_addr.c')
| -rw-r--r-- | security/min_addr.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/security/min_addr.c b/security/min_addr.c index df1bc643d886..c55bb84b8632 100644 --- a/security/min_addr.c +++ b/security/min_addr.c @@ -3,6 +3,7 @@ #include <linux/mm.h> #include <linux/security.h> #include <linux/sysctl.h> +#include <linux/minmax.h> /* amount of vm to protect from userspace access by both DAC and the LSM*/ unsigned long mmap_min_addr; @@ -16,10 +17,7 @@ unsigned long dac_mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR; static void update_mmap_min_addr(void) { #ifdef CONFIG_LSM_MMAP_MIN_ADDR - if (dac_mmap_min_addr > CONFIG_LSM_MMAP_MIN_ADDR) - mmap_min_addr = dac_mmap_min_addr; - else - mmap_min_addr = CONFIG_LSM_MMAP_MIN_ADDR; + mmap_min_addr = umax(dac_mmap_min_addr, CONFIG_LSM_MMAP_MIN_ADDR); #else mmap_min_addr = dac_mmap_min_addr; #endif |