From owner-freebsd-bugs@FreeBSD.ORG Thu Aug 30 14:30:04 2012 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 405051065673 for ; Thu, 30 Aug 2012 14:30:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 190188FC16 for ; Thu, 30 Aug 2012 14:30:04 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q7UEU35K084299 for ; Thu, 30 Aug 2012 14:30:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q7UEU3iG084297; Thu, 30 Aug 2012 14:30:03 GMT (envelope-from gnats) Resent-Date: Thu, 30 Aug 2012 14:30:03 GMT Resent-Message-Id: <201208301430.q7UEU3iG084297@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, Mark Johnston Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AA0C7106566C for ; Thu, 30 Aug 2012 14:22:14 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 94F3B8FC0A for ; Thu, 30 Aug 2012 14:22:14 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q7UEME3P090941 for ; Thu, 30 Aug 2012 14:22:14 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id q7UEMESc090940; Thu, 30 Aug 2012 14:22:14 GMT (envelope-from nobody) Message-Id: <201208301422.q7UEMESc090940@red.freebsd.org> Date: Thu, 30 Aug 2012 14:22:14 GMT From: Mark Johnston To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: bin/171187: [patch][libfetch] missing returns in error cases in file.c X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Aug 2012 14:30:04 -0000 >Number: 171187 >Category: bin >Synopsis: [patch][libfetch] missing returns in error cases in file.c >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Aug 30 14:30:03 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Mark Johnston >Release: CURRENT >Organization: >Environment: FreeBSD oddish 10.0-CURRENT FreeBSD 10.0-CURRENT #4 r239361+382bdfb-dirty: Sun Aug 19 23:06:24 EDT 2012 mark@oddish:/home/mark/src/freebsd-obj/usr/home/mark/src/freebsd/sys/GENERIC amd64 >Description: Some of the file scheme code doesn't handle errors properly. Specifically, it doesn't return to the caller if an error occurs. >How-To-Repeat: The following program segfaults: #include #include #include #include int main() { FILE *f = fetchGetURL("file:///home/mark/nonexistent-file", ""); return (0); } >Fix: Apply the patch below. Patch attached with submission follows: diff --git a/lib/libfetch/file.c b/lib/libfetch/file.c index 8569ff3..8c1d404 100644 --- a/lib/libfetch/file.c +++ b/lib/libfetch/file.c @@ -50,12 +50,15 @@ fetchXGetFile(struct url *u, struct url_stat *us, const char *flags) f = fopen(u->doc, "r"); - if (f == NULL) + if (f == NULL) { fetch_syserr(); + return (NULL); + } if (u->offset && fseeko(f, u->offset, SEEK_SET) == -1) { fclose(f); fetch_syserr(); + return (NULL); } fcntl(fileno(f), F_SETFD, FD_CLOEXEC); @@ -78,12 +81,15 @@ fetchPutFile(struct url *u, const char *flags) else f = fopen(u->doc, "w+"); - if (f == NULL) + if (f == NULL) { fetch_syserr(); + return (NULL); + } if (u->offset && fseeko(f, u->offset, SEEK_SET) == -1) { fclose(f); fetch_syserr(); + return (NULL); } fcntl(fileno(f), F_SETFD, FD_CLOEXEC); >Release-Note: >Audit-Trail: >Unformatted: