Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 297bbec9 authored by Patrick Daly's avatar Patrick Daly
Browse files

mm: swap: Add null pointer check 



Address an unlikely null pointer dereference.
Fixes commit 7b5df13b ("mm: swap: free up swap on mm reap").

The expected usage of free_swap_slot is that the caller has already
checked that the swap_entry_t is valid.

Change-Id: I85331f817458df7f6cb0c0b387ca34c345f8c513
Signed-off-by: default avatarPatrick Daly <pdaly@codeaurora.org>
parent 55cb9664

mm/swap_slots.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -282,7 +282,7 @@ int free_swap_slot(swp_entry_t entry) 




	si = swp_swap_info(entry);

	si = swp_swap_info(entry);

	cache = raw_cpu_ptr(&swp_slots);

	cache = raw_cpu_ptr(&swp_slots);

	if (!(si->flags & SWP_SYNCHRONOUS_IO) &&

	if ((si && !(si->flags & SWP_SYNCHRONOUS_IO)) &&

				use_swap_slot_cache && cache->slots_ret) {

				use_swap_slot_cache && cache->slots_ret) {

		spin_lock_irq(&cache->free_lock);

		spin_lock_irq(&cache->free_lock);

		/* Swap slots cache may be deactivated before acquiring lock */

		/* Swap slots cache may be deactivated before acquiring lock */