eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-11 19:00:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Thanks to Milan Broz <mbroz@redhat.com> for this patch:

Browse Source 
Fix signal handler to proper close device, otherwise if the descriptor
is 0, it keeps device open and temporary-cryptsetup-$PID mapping
is not removed (leaving device open and unusable).



git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@30 36d66b0a-2a48-0410-832c-cd162a569da5
This commit is contained in:
Clemens Fruhwirth
2008-09-10 10:55:28 +00:00
parent 98cf0aedf8
commit 8003974484
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
luks/keyencryption.c
View File

@@ -97,12 +97,13 @@ static int clear_mapping(const char *name, struct setup_backend *backend)
/* I miss closures in C! */ /* I miss closures in C! */
static struct setup_backend *cleaner_backend=NULL; static struct setup_backend *cleaner_backend=NULL;
static const char *cleaner_name=NULL; static const char *cleaner_name=NULL;
static int devfd=0; static int devfd=-1;
static void sigint_handler(int sig) static void sigint_handler(int sig)
{ {
if(devfd) if(devfd >= 0)
close(devfd); close(devfd);
devfd = -1;
if(cleaner_backend && cleaner_name) if(cleaner_backend && cleaner_name)
clear_mapping(cleaner_name, cleaner_backend); clear_mapping(cleaner_name, cleaner_backend);
signal(SIGINT, SIG_DFL); signal(SIGINT, SIG_DFL);
@@ -160,7 +161,7 @@ static int LUKS_endec_template(char *src, size_t srcLength,
r = 0; r = 0;
out3: out3:
close(devfd); close(devfd);
devfd = 0; devfd = -1;
out2: out2:
clear_mapping(name,backend); clear_mapping(name,backend);
out1: out1: