On 01/06/2016 09:10 AM, Borislav Petkov wrote: >> > diff -puN arch/x86/lib/cmdline.c~x86-early-command-line-non-term >> > arch/x86/lib/cmdline.c >> > --- a/arch/x86/lib/cmdline.c~x86-early-command-line-non-term >> > 2015-12-22 11:56:59.454186167 -0800 >> > +++ b/arch/x86/lib/cmdline.c 2015-12-22 11:56:59.457186302 -0800 >> > @@ -39,9 +39,6 @@ int cmdline_find_option_bool(const char >> > if (!cmdline) >> > return -1; /* No command line */ >> > >> > - if (!strlen(cmdline)) >> > - return 0; >> > - > Patch 1 adds the strlen(), this patch removes it. Please merge both patches.
Yes, it adds a line that uses strlen. But, there was already the use in the min_t() "call": > - len = min_t(int, strlen(cmdline), COMMAND_LINE_SIZE); > - if (!len) > + if (!strlen(cmdline)) > return 0; I wanted to separate the two things because they really fix two separate issues. I also want to ensure that any problems that this patch causes can be isolated to the smallest change possible. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/