From owner-freebsd-bugs@FreeBSD.ORG Tue Jul 12 21:20:02 2005 Return-Path: X-Original-To: freebsd-bugs@hub.freebsd.org Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 876A616A41F for ; Tue, 12 Jul 2005 21:20:02 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA18843D49 for ; Tue, 12 Jul 2005 21:20:01 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j6CLK1eE089907 for ; Tue, 12 Jul 2005 21:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j6CLK1kd089906; Tue, 12 Jul 2005 21:20:01 GMT (envelope-from gnats) Resent-Date: Tue, 12 Jul 2005 21:20:01 GMT Resent-Message-Id: <200507122120.j6CLK1kd089906@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dan Lukes Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D77016A41C for ; Tue, 12 Jul 2005 21:18:55 +0000 (GMT) (envelope-from dan@kulesh.obluda.cz) Received: from kulesh.obluda.cz (kulesh.obluda.cz [193.179.22.243]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1934B43D48 for ; Tue, 12 Jul 2005 21:18:53 +0000 (GMT) (envelope-from dan@kulesh.obluda.cz) Received: from kulesh.obluda.cz (localhost.eunet.cz [127.0.0.1]) by kulesh.obluda.cz (8.13.3/8.13.3) with ESMTP id j6CLInHk017403 for ; Tue, 12 Jul 2005 23:18:50 +0200 (CEST) (envelope-from dan@kulesh.obluda.cz) Received: (from root@localhost) by kulesh.obluda.cz (8.13.3/8.13.1/Submit) id j6CLInkQ017402; Tue, 12 Jul 2005 23:18:49 +0200 (CEST) (envelope-from dan) Message-Id: <200507122118.j6CLInkQ017402@kulesh.obluda.cz> Date: Tue, 12 Jul 2005 23:18:49 +0200 (CEST) From: Dan Lukes To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: bin/83352: [ PATCH ] Improper malloc failure handling within cam_device_dup() X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Dan Lukes List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jul 2005 21:20:02 -0000 >Number: 83352 >Category: bin >Synopsis: [ PATCH ] Improper malloc failure handling within cam_device_dup() >Confidential: no >Severity: serious >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Jul 12 21:20:01 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Dan Lukes >Release: FreeBSD 5.4-STABLE i386 >Organization: Obludarium >Environment: System: FreeBSD 5.4-STABLE #8: Sat Jul 9 16:31:08 CEST 2005 i386 lib/libcam/camlib.c,v 1.12 2004/07/29 15:35:45 scottl >Description: Improper malloc failure handling within cam_device_dup() can cause NULL dereference. BTW, free() can be called with NULL, so 'if(x) free(x)' construct isn't necesarry. >How-To-Repeat: >Fix: --- patch begins here --- --- lib/libcam/camlib.c.ORIG Sun Aug 8 21:03:38 2004 +++ lib/libcam/camlib.c Tue Jul 12 23:01:41 2005 @@ -97,8 +97,7 @@ void cam_freeccb(union ccb *ccb) { - if (ccb != NULL) - free(ccb); + free(ccb); } /* @@ -709,7 +708,6 @@ cam_close_spec_device(dev); - if (dev != NULL) - free(dev); + free(dev); } void @@ -757,6 +755,11 @@ } newdev = malloc(sizeof(struct cam_device)); + if (newdev == NULL) { + snprintf(cam_errbuf, CAM_ERRBUF_SIZE, + "%s: couldn't malloc CAM device structure", func_name); + return(NULL); + } bcopy(device, newdev, sizeof(struct cam_device)); --- patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: