From patchwork Mon Oct 3 15:24:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Jarosch X-Patchwork-Id: 117470 X-Patchwork-Delegate: shemminger@vyatta.com 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 74382B6F18 for ; Tue, 4 Oct 2011 02:32:01 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932210Ab1JCPb4 (ORCPT ); Mon, 3 Oct 2011 11:31:56 -0400 Received: from rs04.intra2net.com ([85.214.66.2]:59724 "EHLO rs04.intra2net.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754869Ab1JCPby (ORCPT ); Mon, 3 Oct 2011 11:31:54 -0400 X-Greylist: delayed 339 seconds by postgrey-1.27 at vger.kernel.org; Mon, 03 Oct 2011 11:31:54 EDT Received: from intranator.m.i2n (unknown [172.16.1.99]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by rs04.intra2net.com (Postfix) with ESMTP id 1067722015A for ; Mon, 3 Oct 2011 17:26:17 +0200 (CEST) Received: from localhost (intranator.m.i2n [127.0.0.1]) by localhost (Postfix) with ESMTP id C32502AC53 for ; Mon, 3 Oct 2011 17:26:16 +0200 (CEST) X-Virus-Scanned: by Intranator (www.intra2net.com) with AMaViS and F-Secure AntiVirus (fsavdb 2011-10-03_03) X-Spam-Status: X-Spam-Level: 0 Received: from pikkukde.a.i2n (unknown [192.168.12.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by intranator.m.i2n (Postfix) with ESMTPS id D0FA72AC57 for ; Mon, 3 Oct 2011 17:26:15 +0200 (CEST) Message-ID: <4E89D3A2.1060605@intra2net.com> Date: Mon, 03 Oct 2011 17:24:18 +0200 From: Thomas Jarosch User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.22) Gecko/20110906 Fedora/3.1.14-1.fc14 Thunderbird/3.1.14 MIME-Version: 1.0 To: netdev@vger.kernel.org Subject: [iproute2 PATCH 09/11] Fix file descriptor leak on error in read_mroute_list() Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Detected by cppcheck. Signed-off-by: Thomas Jarosch --- ip/ipmroute.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ip/ipmroute.c b/ip/ipmroute.c index f033349..945727d 100644 --- a/ip/ipmroute.c +++ b/ip/ipmroute.c @@ -85,8 +85,10 @@ static void read_mroute_list(FILE *ofp) if (!fp) return; - if (!fgets(buf, sizeof(buf), fp)) + if (!fgets(buf, sizeof(buf), fp)) { + fclose(fp); return; + } while (fgets(buf, sizeof(buf), fp)) { inet_prefix maddr, msrc;