Skip to content
Snippets Groups Projects
Commit 411737a9 authored by chrfranke's avatar chrfranke
Browse files

Cygwin smartd: Fixed crash on access of SCSI devices after fork() 

git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@1686 4ea69e1a-61f1-4043-bf83-b5c94c648137
parent 0eb73b40
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
sm5/CHANGELOG
+ 3
− 1
View file @ 411737a9
CHANGELOG for smartmontools CHANGELOG for smartmontools
$Id: CHANGELOG,v 1.403 2004/04/24 16:43:48 pjwilliams Exp $ $Id: CHANGELOG,v 1.404 2004/04/26 18:12:47 chrfranke Exp $
The most recent version of this file is: The most recent version of this file is:
http://cvs.sourceforge.net/viewcvs.py/smartmontools/sm5/CHANGELOG?sortby=date&view=markup http://cvs.sourceforge.net/viewcvs.py/smartmontools/sm5/CHANGELOG?sortby=date&view=markup
...@@ -27,6 +27,8 @@ NOTES FOR FUTURE RELEASES: see TODO file. ...@@ -27,6 +27,8 @@ NOTES FOR FUTURE RELEASES: see TODO file.
<ADDITIONS TO THE CHANGE LOG SHOULD BE ADDED JUST BELOW HERE, PLEASE> <ADDITIONS TO THE CHANGE LOG SHOULD BE ADDED JUST BELOW HERE, PLEASE>
[CF] Cygwin smartd: Fixed crash on access of SCSI devices after fork().
[PW] Added TOSHIBA MK4018GAS and the following Maxtor drive families [PW] Added TOSHIBA MK4018GAS and the following Maxtor drive families
to knowndrives table: DiamondMax D540X-4G, Fireball 541DX, to knowndrives table: DiamondMax D540X-4G, Fireball 541DX,
DiamondMax 3400 Ultra ATA, DiamondMax Plus 6800 Ultra ATA 66. DiamondMax 3400 Ultra ATA, DiamondMax Plus 6800 Ultra ATA 66.
......
sm5/os_win32.c
+ 22
− 6
View file @ 411737a9
...@@ -38,7 +38,7 @@ extern int64_t bytes; // malloc() byte count ...@@ -38,7 +38,7 @@ extern int64_t bytes; // malloc() byte count
#define ARGUSED(x) ((void)(x)) #define ARGUSED(x) ((void)(x))
// Needed by '-V' option (CVS versioning) of smartd/smartctl // Needed by '-V' option (CVS versioning) of smartd/smartctl
const char *os_XXXX_c_cvsid="$Id: os_win32.c,v 1.10 2004/04/07 10:11:34 chrfranke Exp $" const char *os_XXXX_c_cvsid="$Id: os_win32.c,v 1.11 2004/04/26 18:12:47 chrfranke Exp $"
ATACMDS_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID; ATACMDS_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
...@@ -800,7 +800,7 @@ typedef struct { ...@@ -800,7 +800,7 @@ typedef struct {
ASPI_SRB_HEAD h; // 00: Header ASPI_SRB_HEAD h; // 00: Header
unsigned char target_id; // 08: Target ID unsigned char target_id; // 08: Target ID
unsigned char lun; // 09: LUN unsigned char lun; // 09: LUN
unsigned char devtype; // 10: LUN unsigned char devtype; // 10: Device type
unsigned char reserved; // 11: Reserved unsigned char reserved; // 11: Reserved
} ASPI_SRB_DEVTYPE; } ASPI_SRB_DEVTYPE;
...@@ -877,6 +877,14 @@ static HINSTANCE h_aspi_dll; // DLL handle ...@@ -877,6 +877,14 @@ static HINSTANCE h_aspi_dll; // DLL handle
static UINT (* aspi_entry)(ASPI_SRB * srb); // ASPI entrypoint static UINT (* aspi_entry)(ASPI_SRB * srb); // ASPI entrypoint
static unsigned num_aspi_adapters; static unsigned num_aspi_adapters;
#ifdef __CYGWIN__
// h_aspi_dll+aspi_entry is not inherited by Cygwin's fork()
static DWORD aspi_dll_pid; // PID of DLL owner to detect fork()
#define aspi_entry_valid() (aspi_entry && (aspi_dll_pid == GetCurrentProcessId()))
#else
#define aspi_entry_valid() (!!aspi_entry)
#endif
static int aspi_call(ASPI_SRB * srb) static int aspi_call(ASPI_SRB * srb)
{ {
...@@ -903,6 +911,7 @@ static int aspi_call(ASPI_SRB * srb) ...@@ -903,6 +911,7 @@ static int aspi_call(ASPI_SRB * srb)
static int aspi_open_dll(int verbose) static int aspi_open_dll(int verbose)
{ {
ASPI_SRB srb; ASPI_SRB srb;
assert(!aspi_entry_valid());
// Check structure layout // Check structure layout
assert(sizeof(srb.h) == 8); assert(sizeof(srb.h) == 8);
...@@ -923,7 +932,7 @@ static int aspi_open_dll(int verbose) ...@@ -923,7 +932,7 @@ static int aspi_open_dll(int verbose)
} }
// Get ASPI entrypoint from winaspi.dll // Get ASPI entrypoint from winaspi.dll
if (!h_aspi_dll && !(h_aspi_dll = LoadLibraryA("WNASPI32.DLL"))) { if (!(h_aspi_dll = LoadLibraryA("WNASPI32.DLL"))) {
if (verbose) if (verbose)
pout("Cannot load WNASPI32.DLL, Error=%ld\n", GetLastError()); pout("Cannot load WNASPI32.DLL, Error=%ld\n", GetLastError());
h_aspi_dll = INVALID_HANDLE_VALUE; h_aspi_dll = INVALID_HANDLE_VALUE;
...@@ -960,6 +969,12 @@ static int aspi_open_dll(int verbose) ...@@ -960,6 +969,12 @@ static int aspi_open_dll(int verbose)
#ifdef _DEBUG #ifdef _DEBUG
pout("%u ASPI adapters on manager \"%.16s\"\n", num_aspi_adapters, srb.q.manager_id); pout("%u ASPI adapters on manager \"%.16s\"\n", num_aspi_adapters, srb.q.manager_id);
#endif #endif
#ifdef __CYGWIN__
// save PID to detect fork() in aspi_entry_valid()
aspi_dll_pid = GetCurrentProcessId();
#endif
assert(aspi_entry_valid());
return 0; return 0;
} }
...@@ -1004,7 +1019,7 @@ static int aspi_open(unsigned adapter, unsigned id) ...@@ -1004,7 +1019,7 @@ static int aspi_open(unsigned adapter, unsigned id)
return -1; return -1;
} }
if (!aspi_entry) { if (!aspi_entry_valid()) {
if (aspi_open_dll(1/*verbose*/)) if (aspi_open_dll(1/*verbose*/))
return -1; return -1;
} }
...@@ -1024,6 +1039,7 @@ static int aspi_open(unsigned adapter, unsigned id) ...@@ -1024,6 +1039,7 @@ static int aspi_open(unsigned adapter, unsigned id)
static void aspi_close(int fd) static void aspi_close(int fd)
{ {
// No FreeLibrary(h_aspi_dll) to prevent problems with ASPI threads
ARGUSED(fd); ARGUSED(fd);
} }
...@@ -1035,7 +1051,7 @@ static unsigned long aspi_scan() ...@@ -1035,7 +1051,7 @@ static unsigned long aspi_scan()
unsigned long drives = 0; unsigned long drives = 0;
unsigned ad, nad; unsigned ad, nad;
if (!aspi_entry) { if (!aspi_entry_valid()) {
if (aspi_open_dll(0/*quiet*/)) if (aspi_open_dll(0/*quiet*/))
return 0; return 0;
} }
...@@ -1087,7 +1103,7 @@ int do_scsi_cmnd_io(int fd, struct scsi_cmnd_io * iop, int report) ...@@ -1087,7 +1103,7 @@ int do_scsi_cmnd_io(int fd, struct scsi_cmnd_io * iop, int report)
{ {
ASPI_SRB srb; ASPI_SRB srb;
if (!aspi_entry) if (!aspi_entry_valid())
return -EBADF; return -EBADF;
if (!((fd & ~0xff) == 0x100)) if (!((fd & ~0xff) == 0x100))
return -EBADF; return -EBADF;
......
sm5/os_win32.cpp
+ 22
− 6
View file @ 411737a9
...@@ -38,7 +38,7 @@ extern int64_t bytes; // malloc() byte count ...@@ -38,7 +38,7 @@ extern int64_t bytes; // malloc() byte count
#define ARGUSED(x) ((void)(x)) #define ARGUSED(x) ((void)(x))
// Needed by '-V' option (CVS versioning) of smartd/smartctl // Needed by '-V' option (CVS versioning) of smartd/smartctl
const char *os_XXXX_c_cvsid="$Id: os_win32.cpp,v 1.10 2004/04/07 10:11:34 chrfranke Exp $" const char *os_XXXX_c_cvsid="$Id: os_win32.cpp,v 1.11 2004/04/26 18:12:47 chrfranke Exp $"
ATACMDS_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID; ATACMDS_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID SCSICMDS_H_CVSID UTILITY_H_CVSID;
...@@ -800,7 +800,7 @@ typedef struct { ...@@ -800,7 +800,7 @@ typedef struct {
ASPI_SRB_HEAD h; // 00: Header ASPI_SRB_HEAD h; // 00: Header
unsigned char target_id; // 08: Target ID unsigned char target_id; // 08: Target ID
unsigned char lun; // 09: LUN unsigned char lun; // 09: LUN
unsigned char devtype; // 10: LUN unsigned char devtype; // 10: Device type
unsigned char reserved; // 11: Reserved unsigned char reserved; // 11: Reserved
} ASPI_SRB_DEVTYPE; } ASPI_SRB_DEVTYPE;
...@@ -877,6 +877,14 @@ static HINSTANCE h_aspi_dll; // DLL handle ...@@ -877,6 +877,14 @@ static HINSTANCE h_aspi_dll; // DLL handle
static UINT (* aspi_entry)(ASPI_SRB * srb); // ASPI entrypoint static UINT (* aspi_entry)(ASPI_SRB * srb); // ASPI entrypoint
static unsigned num_aspi_adapters; static unsigned num_aspi_adapters;
#ifdef __CYGWIN__
// h_aspi_dll+aspi_entry is not inherited by Cygwin's fork()
static DWORD aspi_dll_pid; // PID of DLL owner to detect fork()
#define aspi_entry_valid() (aspi_entry && (aspi_dll_pid == GetCurrentProcessId()))
#else
#define aspi_entry_valid() (!!aspi_entry)
#endif
static int aspi_call(ASPI_SRB * srb) static int aspi_call(ASPI_SRB * srb)
{ {
...@@ -903,6 +911,7 @@ static int aspi_call(ASPI_SRB * srb) ...@@ -903,6 +911,7 @@ static int aspi_call(ASPI_SRB * srb)
static int aspi_open_dll(int verbose) static int aspi_open_dll(int verbose)
{ {
ASPI_SRB srb; ASPI_SRB srb;
assert(!aspi_entry_valid());
// Check structure layout // Check structure layout
assert(sizeof(srb.h) == 8); assert(sizeof(srb.h) == 8);
...@@ -923,7 +932,7 @@ static int aspi_open_dll(int verbose) ...@@ -923,7 +932,7 @@ static int aspi_open_dll(int verbose)
} }
// Get ASPI entrypoint from winaspi.dll // Get ASPI entrypoint from winaspi.dll
if (!h_aspi_dll && !(h_aspi_dll = LoadLibraryA("WNASPI32.DLL"))) { if (!(h_aspi_dll = LoadLibraryA("WNASPI32.DLL"))) {
if (verbose) if (verbose)
pout("Cannot load WNASPI32.DLL, Error=%ld\n", GetLastError()); pout("Cannot load WNASPI32.DLL, Error=%ld\n", GetLastError());
h_aspi_dll = INVALID_HANDLE_VALUE; h_aspi_dll = INVALID_HANDLE_VALUE;
...@@ -960,6 +969,12 @@ static int aspi_open_dll(int verbose) ...@@ -960,6 +969,12 @@ static int aspi_open_dll(int verbose)
#ifdef _DEBUG #ifdef _DEBUG
pout("%u ASPI adapters on manager \"%.16s\"\n", num_aspi_adapters, srb.q.manager_id); pout("%u ASPI adapters on manager \"%.16s\"\n", num_aspi_adapters, srb.q.manager_id);
#endif #endif
#ifdef __CYGWIN__
// save PID to detect fork() in aspi_entry_valid()
aspi_dll_pid = GetCurrentProcessId();
#endif
assert(aspi_entry_valid());
return 0; return 0;
} }
...@@ -1004,7 +1019,7 @@ static int aspi_open(unsigned adapter, unsigned id) ...@@ -1004,7 +1019,7 @@ static int aspi_open(unsigned adapter, unsigned id)
return -1; return -1;
} }
if (!aspi_entry) { if (!aspi_entry_valid()) {
if (aspi_open_dll(1/*verbose*/)) if (aspi_open_dll(1/*verbose*/))
return -1; return -1;
} }
...@@ -1024,6 +1039,7 @@ static int aspi_open(unsigned adapter, unsigned id) ...@@ -1024,6 +1039,7 @@ static int aspi_open(unsigned adapter, unsigned id)
static void aspi_close(int fd) static void aspi_close(int fd)
{ {
// No FreeLibrary(h_aspi_dll) to prevent problems with ASPI threads
ARGUSED(fd); ARGUSED(fd);
} }
...@@ -1035,7 +1051,7 @@ static unsigned long aspi_scan() ...@@ -1035,7 +1051,7 @@ static unsigned long aspi_scan()
unsigned long drives = 0; unsigned long drives = 0;
unsigned ad, nad; unsigned ad, nad;
if (!aspi_entry) { if (!aspi_entry_valid()) {
if (aspi_open_dll(0/*quiet*/)) if (aspi_open_dll(0/*quiet*/))
return 0; return 0;
} }
...@@ -1087,7 +1103,7 @@ int do_scsi_cmnd_io(int fd, struct scsi_cmnd_io * iop, int report) ...@@ -1087,7 +1103,7 @@ int do_scsi_cmnd_io(int fd, struct scsi_cmnd_io * iop, int report)
{ {
ASPI_SRB srb; ASPI_SRB srb;
if (!aspi_entry) if (!aspi_entry_valid())
return -EBADF; return -EBADF;
if (!((fd & ~0xff) == 0x100)) if (!((fd & ~0xff) == 0x100))
return -EBADF; return -EBADF;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

AEI Privacy Policy Imprint