From owner-svn-src-all@FreeBSD.ORG  Tue Jul  6 18:05:06 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 17F7F1065675;
	Tue,  6 Jul 2010 18:05:06 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 089918FC16;
	Tue,  6 Jul 2010 18:05:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o66I55nM043915;
	Tue, 6 Jul 2010 18:05:05 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o66I55IG043913;
	Tue, 6 Jul 2010 18:05:05 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201007061805.o66I55IG043913@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Tue, 6 Jul 2010 18:05:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209737 - head/sys/dev/fb
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jul 2010 18:05:06 -0000

Author: jkim
Date: Tue Jul  6 18:05:05 2010
New Revision: 209737
URL: http://svn.freebsd.org/changeset/base/209737

Log:
  Fix a possible null pointer dereference.  A patch for -STABLE was
  
  Submitted by:	Yamagi Burmeister (lists at yamagi dot org)

Modified:
  head/sys/dev/fb/vesa.c

Modified: head/sys/dev/fb/vesa.c
==============================================================================
--- head/sys/dev/fb/vesa.c	Tue Jul  6 17:20:08 2010	(r209736)
+++ head/sys/dev/fb/vesa.c	Tue Jul  6 18:05:05 2010	(r209737)
@@ -536,6 +536,8 @@ vesa_bios_save_restore(int code, void *p
 		return (1);
 
 	buf = x86bios_alloc(&offs, size, M_NOWAIT);
+	if (buf == NULL)
+		return (1);
 
 	x86bios_init_regs(&regs);
 	regs.R_AX = 0x4f04;