Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1473624

[RESEND PATCH v2] memory-hotplug: fix store_mem_state() return value

Show all headers | View raw

Attempting to online memory which is already online will cause this:

1. store_mem_state() called with buf="online"
2. device_online() returns 1 because device is already online
3. store_mem_state() returns 1
4. calling code interprets this as 1-byte buffer read
5. store_mem_state() called again with buf="nline"
6. store_mem_state() returns -EINVAL

Example:

$ cat /sys/devices/system/memory/memory0/state
online
$ echo online > /sys/devices/system/memory/memory0/state
-bash: echo: write error: Invalid argument

Fix the return value of store_mem_state() so this doesn't happen.

Signed-off-by: Reza Arbab <arbab@linux.vnet.ibm.com>
---
Andrew et al, Greg asked that this come in through the -mm tree, as
you know this code better than him.

 drivers/base/memory.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 1cea0ba..8e385ea 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -359,7 +359,7 @@ store_mem_state(struct device *dev,
 err:
 	unlock_device_hotplug();
 
-	if (ret)
+	if (ret < 0)
 		return ret;
 	return count;
 }
-- 
1.8.3.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

Re: [PATCH v2] memory-hotplug: fix store_mem_state() return value Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-08-31 14:30 +0200
  Re: [PATCH v2] memory-hotplug: fix store_mem_state() return value Reza Arbab <arbab@linux.vnet.ibm.com> - 2016-08-31 16:40 +0200
    Re: [PATCH v2] memory-hotplug: fix store_mem_state() return value Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-08-31 17:10 +0200
      [RESEND PATCH v2] memory-hotplug: fix store_mem_state() return value Reza Arbab <arbab@linux.vnet.ibm.com> - 2016-08-31 17:50 +0200
        Re: [RESEND PATCH v2] memory-hotplug: fix store_mem_state() return  value Andrew Morton <akpm@linux-foundation.org> - 2016-08-31 22:30 +0200
          Re: [RESEND PATCH v2] memory-hotplug: fix store_mem_state() return  value David Rientjes <rientjes@google.com> - 2016-08-31 23:10 +0200
            Re: [RESEND PATCH v2] memory-hotplug: fix store_mem_state() return  value Reza Arbab <arbab@linux.vnet.ibm.com> - 2016-09-01 01:40 +0200
              Re: [RESEND PATCH v2] memory-hotplug: fix store_mem_state() return  value David Rientjes <rientjes@google.com> - 2016-09-01 02:10 +0200
                Re: [RESEND PATCH v2] memory-hotplug: fix store_mem_state() return  value Reza Arbab <arbab@linux.vnet.ibm.com> - 2016-09-01 02:20 +0200
                Re: [RESEND PATCH v2] memory-hotplug: fix store_mem_state() return  value David Rientjes <rientjes@google.com> - 2016-09-01 02:30 +0200
                Re: [RESEND PATCH v2] memory-hotplug: fix store_mem_state() return  value Reza Arbab <arbab@linux.vnet.ibm.com> - 2016-09-01 04:00 +0200
  [RESEND PATCH v2] memory-hotplug: fix store_mem_state() return value Reza Arbab <arbab@linux.vnet.ibm.com> - 2016-08-31 16:40 +0200

csiph-web