Skip to content

Commit

Permalink
drivers/base/memory.c: prohibit offlining of memory blocks with missi…
Browse files Browse the repository at this point in the history
…ng sections

Commit bdee237 ("x86: mm: Use 2GB memory block size on large-memory
x86-64 systems") and 982792c ("x86, mm: probe memory block size for
generic x86 64bit") introduced large block sizes for x86.  This made it
possible to have multiple sections per memory block where previously,
there was a only every one section per block.

Since blocks consist of contiguous ranges of section, there can be holes
in the blocks where sections are not present.  If one attempts to
offline such a block, a crash occurs since the code is not designed to
deal with this.

This patch is a quick fix to gaurd against the crash by not allowing
blocks with non-present sections to be offlined.

Addresses https://bugzilla.kernel.org/show_bug.cgi?id=107781

Signed-off-by: Seth Jennings <[email protected]>
Reported-by: Andrew Banman <[email protected]>
Cc: Daniel J Blueman <[email protected]>
Cc: Yinghai Lu <[email protected]>
Cc: Greg KH <[email protected]>
Cc: Russ Anderson <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Seth Jennings authored and torvalds committed Dec 12, 2015
1 parent 267a4c7 commit 26bbe7e
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/base/memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,10 @@ static int memory_subsys_offline(struct device *dev)
if (mem->state == MEM_OFFLINE)
return 0;

/* Can't offline block with non-present sections */
if (mem->section_count != sections_per_block)
return -EINVAL;

return memory_block_change_state(mem, MEM_OFFLINE, MEM_ONLINE);
}

Expand Down

0 comments on commit 26bbe7e

Please sign in to comment.