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>

diff --git a/security/min_addr.c b/security/min_addr.c
index df1bc643d886bd746953e4175e10e1de6f4f1ca0..c55bb84b86320957c6471fc29c03d90b69fe4276 100644 (file)
--- 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