From patchwork Sat Dec 4 03:56:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julian Calaby X-Patchwork-Id: 74235 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2BC76B70A3 for ; Sat, 4 Dec 2010 14:56:52 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754378Ab0LDD4v (ORCPT ); Fri, 3 Dec 2010 22:56:51 -0500 Received: from mail-gy0-f174.google.com ([209.85.160.174]:35796 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754303Ab0LDD4u (ORCPT ); Fri, 3 Dec 2010 22:56:50 -0500 Received: by gyb11 with SMTP id 11so5156771gyb.19 for ; Fri, 03 Dec 2010 19:56:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :content-type:content-transfer-encoding; bh=D9jQM/Ek7Xom4K9ctKU/aPAHVxulY66ysXICinT764E=; b=flZFjweV2mw3KoH9MU4mDR4LXj+c+hiyrENhIHBVbO5Jf4lazyqPFH9no6uWqdrAFn 5a7kD1PAN8Xvt2/SvS8twtmlYPunCvVOoz5Mjur+HNOsaMzAwYUIMBDMKJlUjLVOjp42 ghCtKF95pQY21sXFVP3OLQO7TNu9jO0a8P9jI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; b=iIflBhZ5POVi4UhMfnFj6FBtNqq69UOeXvF39Esoaf2gxSMfNWXrQlvC1f2LNcf44L ns0NDuAjGi2NiR53Ii2jkTqiivb9lE6R5+MnXRCFBCMgCyMmMA5jRh7d8pHe0aGSnOPJ +2gQoldvYcaQvTgTihwvnK6HinaOkLztsl99o= Received: by 10.150.196.2 with SMTP id t2mr5040971ybf.205.1291435010029; Fri, 03 Dec 2010 19:56:50 -0800 (PST) Received: from [192.168.2.4] (124-168-89-61.dyn.iinet.net.au [124.168.89.61]) by mx.google.com with ESMTPS id z30sm1548080yhc.42.2010.12.03.19.56.47 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 03 Dec 2010 19:56:49 -0800 (PST) Message-ID: <4CF9BBFD.70503@gmail.com> Date: Sat, 04 Dec 2010 14:56:45 +1100 From: Julian Calaby User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.15) Gecko/20101030 Icedove/3.0.10 MIME-Version: 1.0 To: sparclinux@vger.kernel.org CC: davem@davemloft.net Subject: [RFC 1/8] sparc: prom: Sanitize return value from prom_nbputchar() References: In-Reply-To: Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org Signed-off-by: Julian Calaby --- Sorry about the dupe, wrong from address. arch/sparc/prom/console_32.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/sparc/prom/console_32.c b/arch/sparc/prom/console_32.c index 4886310..b05e3db 100644 --- a/arch/sparc/prom/console_32.c +++ b/arch/sparc/prom/console_32.c @@ -27,13 +27,14 @@ static int prom_nbputchar(const char *buf) spin_lock_irqsave(&prom_lock, flags); switch(prom_vers) { case PROM_V0: - i = (*(romvec->pv_nbputchar))(*buf); + if ((*(romvec->pv_nbputchar))(*buf)) + i = 1; break; case PROM_V2: case PROM_V3: if ((*(romvec->pv_v2devops).v2_dev_write)(*romvec->pv_v2bootargs.fd_stdout, buf, 0x1) == 1) - i = 0; + i = 1; break; default: break; @@ -47,7 +48,7 @@ void prom_console_write_buf(const char *buf, int len) { while (len) { int n = prom_nbputchar(buf); - if (n) + if (n < 0) continue; len--; buf++;