public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Ben Hutchings <ben@decadent.org.uk>
To: Greg Kroah-Hartman <gregkh@suse.de>,
	Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org, Thomas Renninger <trenn@suse.de>,
	Andi Kleen <ak@linux.intel.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH 1/5] x86/cpu: Fix overrun check in arch_print_cpu_modalias()
Date: Sat, 11 Feb 2012 22:46:17 +0000	[thread overview]
Message-ID: <1329000377.325.49.camel@deadeye> (raw)
In-Reply-To: <1329000256.325.48.camel@deadeye>

snprintf() does not return a negative value when truncating.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 arch/x86/kernel/cpu/match.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/cpu/match.c b/arch/x86/kernel/cpu/match.c
index 940e2d4..2dfa52b 100644
--- a/arch/x86/kernel/cpu/match.c
+++ b/arch/x86/kernel/cpu/match.c
@@ -67,7 +67,7 @@ ssize_t arch_print_cpu_modalias(struct device *dev,
 	for (i = 0; i < NCAPINTS*32; i++) {
 		if (boot_cpu_has(i)) {
 			n = snprintf(buf, size, ",%04X", i);
-			if (n < 0) {
+			if (n >= size) {
 				WARN(1, "x86 features overflow page\n");
 				break;
 			}
-- 
1.7.9




  reply	other threads:[~2012-02-11 22:46 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-11 22:44 [PATCH 0/5] Clean up x86 CPU auto-loading Ben Hutchings
2012-02-11 22:46 ` Ben Hutchings [this message]
2012-02-11 22:52 ` [PATCH 2/5] x86/cpu: Clean up modalias feature matching Ben Hutchings
2012-02-11 22:54 ` [PATCH 3/5] intel_idle: Fix ID for Nehalem-EX Xeon in device ID table Ben Hutchings
2012-02-11 22:55 ` [PATCH 4/5] intel_idle: Revert change of auto_demotion_flags for Nehalem Ben Hutchings
2012-02-12 17:10   ` Thomas Renninger
2012-02-11 22:55 ` [PATCH 5/5] powernow-k7: Fix CPU family number Ben Hutchings
2012-02-12 23:10 ` [PATCH 0/5] Clean up x86 CPU auto-loading Thomas Renninger
2012-02-13  1:26   ` H. Peter Anvin
2012-02-13 22:26     ` Greg KH
2012-02-13 22:55       ` H. Peter Anvin
2012-02-13  2:18   ` Greg KH
2012-02-13  3:00     ` H. Peter Anvin
2012-02-13  6:43       ` Greg KH

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=1329000377.325.49.camel@deadeye \
    --to=ben@decadent.org.uk \
    --cc=ak@linux.intel.com \
    --cc=gregkh@suse.de \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=tglx@linutronix.de \
    --cc=trenn@suse.de \
    --cc=x86@kernel.org \
    /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