From: Greg Kroah-Hartman <gregkh@suse.de>
To: linux-kernel@vger.kernel.org
Cc: David Rientjes <rientjes@google.com>, Ingo Molnar <mingo@elte.hu>,
Greg Kroah-Hartman <gregkh@suse.de>
Subject: [PATCH 12/12] driver core: numa: fix BUILD_BUG_ON for node_read_distance
Date: Fri, 19 Mar 2010 08:18:55 -0700 [thread overview]
Message-ID: <1269011935-8886-12-git-send-email-gregkh@suse.de> (raw)
In-Reply-To: <20100319151311.GA8541@kroah.com>
From: David Rientjes <rientjes@google.com>
node_read_distance() has a BUILD_BUG_ON() to prevent buffer overruns when
the number of nodes printed will exceed the buffer length.
Each node only needs four chars: three for distance (maximum distance is
255) and one for a seperating space or a trailing newline.
Signed-off-by: David Rientjes <rientjes@google.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/base/node.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/base/node.c b/drivers/base/node.c
index ad43185..93b3ac6 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -165,8 +165,11 @@ static ssize_t node_read_distance(struct sys_device * dev,
int len = 0;
int i;
- /* buf currently PAGE_SIZE, need ~4 chars per node */
- BUILD_BUG_ON(MAX_NUMNODES*4 > PAGE_SIZE/2);
+ /*
+ * buf is currently PAGE_SIZE in length and each node needs 4 chars
+ * at the most (distance + space or newline).
+ */
+ BUILD_BUG_ON(MAX_NUMNODES * 4 > PAGE_SIZE);
for_each_online_node(i)
len += sprintf(buf + len, "%s%d", i ? " " : "", node_distance(nid, i));
--
1.7.0.2
prev parent reply other threads:[~2010-03-19 15:21 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-19 15:13 [GIT PATCH] driver core fixes for 2.6.34-git Greg KH
2010-03-19 15:18 ` [PATCH 01/12] sysfs: use sysfs_bin_attr_init in firmware class driver Greg Kroah-Hartman
2010-03-19 15:18 ` [PATCH 02/12] sysfs: Initialised pci bus legacy_mem field before use Greg Kroah-Hartman
2010-03-19 15:18 ` [PATCH 03/12] sysfs: fix sysfs lockdep warning in ipmi code Greg Kroah-Hartman
2010-03-19 15:18 ` [PATCH 04/12] sysfs: fix sysfs lockdep warning in infiniband code Greg Kroah-Hartman
2010-03-19 15:18 ` [PATCH 05/12] sysfs: fix sysfs lockdep warning in mlx4 code Greg Kroah-Hartman
2010-03-19 15:18 ` [PATCH 06/12] Driver core: Early platform kernel-doc update Greg Kroah-Hartman
2010-03-19 15:18 ` [PATCH 07/12] driver-core: fix missing kernel-doc in firmware_class Greg Kroah-Hartman
2010-03-19 15:18 ` [PATCH 08/12] kobject: documentation: Fix erroneous example in kobject doc Greg Kroah-Hartman
2010-03-19 15:18 ` [PATCH 09/12] sysdev: the cpu probe/release attributes should be sysdev_class_attributes Greg Kroah-Hartman
2010-03-19 15:18 ` [PATCH 10/12] kobject: documentation: Update to refer to kset-example.c Greg Kroah-Hartman
2010-03-19 15:18 ` [PATCH 11/12] driver-core: document ERR_PTR() return values Greg Kroah-Hartman
2010-03-19 15:18 ` Greg Kroah-Hartman [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1269011935-8886-12-git-send-email-gregkh@suse.de \
--to=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rientjes@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome