提交 0d845d50 编写于 作者: L liqiong 提交者: Yongqiang Liu

mm: fix dereference a null pointer in migrate[_huge]_page_move_mapping()

stable inclusion
from linux-4.19.236
commit deebce9df9ffaa62613bfcd8351d0c43a9a66108
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5646A
CVE: NA

--------------------------------

Upstream doesn't use radix tree any more in migrate.c, no need this patch.

The two functions look up a slot and dereference the pointer,
If the pointer is null, the kernel would crash and dump.

The 'numad' service calls 'migrate_pages' periodically. If some slots
being replaced (Cache Eviction), the radix_tree_lookup_slot() returns
a null pointer that causes kernel crash.

"numad":  crash> bt
[exception RIP: migrate_page_move_mapping+337]

Introduce pointer checking to avoid dereference a null pointer.

Cc: <stable@vger.kernel.org> # linux-4.19.y
Signed-off-by: Nliqiong <liqiong@nfschina.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NYongqiang Liu <liuyongqiang13@huawei.com>
上级 9fcc65d0
...@@ -473,6 +473,10 @@ int migrate_page_move_mapping(struct address_space *mapping, ...@@ -473,6 +473,10 @@ int migrate_page_move_mapping(struct address_space *mapping,
pslot = radix_tree_lookup_slot(&mapping->i_pages, pslot = radix_tree_lookup_slot(&mapping->i_pages,
page_index(page)); page_index(page));
if (pslot == NULL) {
xa_unlock_irq(&mapping->i_pages);
return -EAGAIN;
}
expected_count += hpage_nr_pages(page) + page_has_private(page); expected_count += hpage_nr_pages(page) + page_has_private(page);
if (page_count(page) != expected_count || if (page_count(page) != expected_count ||
...@@ -596,6 +600,10 @@ int migrate_huge_page_move_mapping(struct address_space *mapping, ...@@ -596,6 +600,10 @@ int migrate_huge_page_move_mapping(struct address_space *mapping,
xa_lock_irq(&mapping->i_pages); xa_lock_irq(&mapping->i_pages);
pslot = radix_tree_lookup_slot(&mapping->i_pages, page_index(page)); pslot = radix_tree_lookup_slot(&mapping->i_pages, page_index(page));
if (pslot == NULL) {
xa_unlock_irq(&mapping->i_pages);
return -EAGAIN;
}
expected_count = 2 + page_has_private(page); expected_count = 2 + page_has_private(page);
if (page_count(page) != expected_count || if (page_count(page) != expected_count ||
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册