1 files changed, 14 insertions, 4 deletions

diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
index 18997e5a1053..5b7531966b84 100644
--- a/arch/x86/boot/boot.h
+++ b/arch/x86/boot/boot.h
@@ -285,16 +285,26 @@ struct biosregs {
 void intcall(u8 int_no, const struct biosregs *ireg, struct biosregs *oreg);
 
 /* cmdline.c */
-int __cmdline_find_option(u32 cmdline_ptr, const char *option, char *buffer, int bufsize);
-int __cmdline_find_option_bool(u32 cmdline_ptr, const char *option);
+int __cmdline_find_option(unsigned long cmdline_ptr, const char *option, char *buffer, int bufsize);
+int __cmdline_find_option_bool(unsigned long cmdline_ptr, const char *option);
 static inline int cmdline_find_option(const char *option, char *buffer, int bufsize)
 {
-        return __cmdline_find_option(boot_params.hdr.cmd_line_ptr, option, buffer, bufsize);
+        unsigned long cmd_line_ptr = boot_params.hdr.cmd_line_ptr;
+
+        if (cmd_line_ptr >= 0x100000)
+                return -1;      /* inaccessible */
+
+        return __cmdline_find_option(cmd_line_ptr, option, buffer, bufsize);
 }
 
 static inline int cmdline_find_option_bool(const char *option)
 {
-        return __cmdline_find_option_bool(boot_params.hdr.cmd_line_ptr, option);
+        unsigned long cmd_line_ptr = boot_params.hdr.cmd_line_ptr;
+
+        if (cmd_line_ptr >= 0x100000)
+                return -1;      /* inaccessible */
+
+        return __cmdline_find_option_bool(cmd_line_ptr, option);
 }