提交 55aa42f2 编写于 作者: J James Bates 提交者: Tomi Valkeinen

efifb: prevent null-deref when iterating dmi_list

The dmi_list array is initialized using gnu designated initializers, and
therefore may contain fewer explicitly defined entries as there are
elements in it. This is because the enum above with M_xyz constants
contains more items than the designated initializer. Those elements not
explicitly initialized are implicitly set to 0.

Now efifb_setup() loops through all these array elements, and performs
a strcmp on each item. For non explicitly initialized elements this will
be a null pointer:

This patch swaps the check order in the if statement, thus checks first
whether dmi_list[i].base is null.
Signed-off-by: NJames Bates <james.h.bates@gmail.com>
Signed-off-by: NDavid Herrmann <dh.herrmann@gmail.com>
Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
上级 e8ddb0cf
...@@ -108,8 +108,8 @@ static int efifb_setup(char *options) ...@@ -108,8 +108,8 @@ static int efifb_setup(char *options)
if (!*this_opt) continue; if (!*this_opt) continue;
for (i = 0; i < M_UNKNOWN; i++) { for (i = 0; i < M_UNKNOWN; i++) {
if (!strcmp(this_opt, efifb_dmi_list[i].optname) && if (efifb_dmi_list[i].base != 0 &&
efifb_dmi_list[i].base != 0) { !strcmp(this_opt, efifb_dmi_list[i].optname)) {
screen_info.lfb_base = efifb_dmi_list[i].base; screen_info.lfb_base = efifb_dmi_list[i].base;
screen_info.lfb_linelength = efifb_dmi_list[i].stride; screen_info.lfb_linelength = efifb_dmi_list[i].stride;
screen_info.lfb_width = efifb_dmi_list[i].width; screen_info.lfb_width = efifb_dmi_list[i].width;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册