SHA256
1
0
forked from pool/grub2
grub2/0005-grub-fstest-fix-descriptor-leak.patch
Andrei Borzenkov 1a0ddd28c8 Accepting request 336940 from home:michael-chang:branches:Base:System
- Upstream patches for fixing file descriptor leakage (bsc#943784) 
  * added 0001-unix-password-Fix-file-descriptor-leak.patch
  * added 0002-linux-getroot-fix-descriptor-leak.patch
  * added 0003-util-grub-mount-fix-descriptor-leak.patch
  * added 0004-linux-ofpath-fix-descriptor-leak.patch
  * added 0005-grub-fstest-fix-descriptor-leak.patch

OBS-URL: https://build.opensuse.org/request/show/336940
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=181
2015-10-12 08:10:07 +00:00

29 lines
916 B
Diff

From 151c19a42a8ea76395fdb579221198156da9c026 Mon Sep 17 00:00:00 2001
From: Andrei Borzenkov <arvidjaar@gmail.com>
Date: Fri, 30 Jan 2015 22:45:58 +0300
Subject: [PATCH] grub-fstest: fix descriptor leak
Found by: Coverity scan.
---
util/grub-fstest.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Index: grub-2.02~beta2/util/grub-fstest.c
===================================================================
--- grub-2.02~beta2.orig/util/grub-fstest.c 2013-12-25 00:40:31.000000000 +0800
+++ grub-2.02~beta2/util/grub-fstest.c 2015-09-22 17:16:23.177530851 +0800
@@ -570,12 +570,12 @@
return 0;
}
real_size = fread (buf, 1, 1024, f);
+ fclose (f);
if (real_size < 0)
{
printf (_("%s: error:"), program_name);
printf (_("cannot read `%s': %s"), arg, strerror (errno));
printf ("\n");
- fclose (f);
return 0;
}
grub_zfs_add_key (buf, real_size, 0);