d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

We don't end up checking for a return value of EFAULT from the copyinstr()

Browse Source 
in the pathname translation procedure. This proves fatal, and can be
easily fixed. This or a similar change needs to be committed to svr4_util.h
and ibcs2_util.h. I will update ibcs2_util.h, if noone else thinks of a
better way to do this, in the same manner. I will leave svr4 to the
respective maintainer.

This closes the problem of the only crash I've been able to produce as
a user recently, except for (currently not-in-the-source tree) fd
table sharing fixes. Thanks goes to pho for his stress-testers.
This commit is contained in:
green 1999-08-07 05:33:35 +00:00
parent a5df34bc5f
commit d0cd160775
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/compat/linux/linux_util.h
View File

@ -28,7 +28,7 @@
*
* from: svr4_util.h,v 1.5 1994/11/18 02:54:31 christos Exp
* from: linux_util.h,v 1.2 1995/03/05 23:23:50 fvdl Exp
* $Id: linux_util.h,v 1.6 1998/06/30 08:40:33 jmg Exp $
* $Id: linux_util.h,v 1.7 1998/12/16 16:28:57 bde Exp $
*/
/*
@ -83,10 +83,17 @@ stackgap_alloc(sgp, sz)
int linux_emul_find __P((struct proc *, caddr_t *, const char *, char *,
char **, int));
#define CHECKALTEXIST(p, sgp, path) \
linux_emul_find(p, sgp, linux_emul_path, path, &(path), 0)
#define CHECKALT(p, sgp, path, i) \
do { \
int _error; \
\
_error = linux_emul_find(p, sgp, linux_emul_path, path, \
&path, i); \
if (_error == EFAULT) \
return (_error); \
} while (0)
#define CHECKALTCREAT(p, sgp, path) \
linux_emul_find(p, sgp, linux_emul_path, path, &(path), 1)
#define CHECKALTEXIST(p, sgp, path) CHECKALT(p, sgp, path, 0)
#define CHECKALTCREAT(p, sgp, path) CHECKALT(p, sgp, path, 1)
#endif /* !_LINUX_UTIL_H_ */

17
sys/i386/linux/linux_util.h
View File

@ -28,7 +28,7 @@
*
* from: svr4_util.h,v 1.5 1994/11/18 02:54:31 christos Exp
* from: linux_util.h,v 1.2 1995/03/05 23:23:50 fvdl Exp
* $Id: linux_util.h,v 1.6 1998/06/30 08:40:33 jmg Exp $
* $Id: linux_util.h,v 1.7 1998/12/16 16:28:57 bde Exp $
*/
/*
@ -83,10 +83,17 @@ stackgap_alloc(sgp, sz)
int linux_emul_find __P((struct proc *, caddr_t *, const char *, char *,
char **, int));
#define CHECKALTEXIST(p, sgp, path) \
linux_emul_find(p, sgp, linux_emul_path, path, &(path), 0)
#define CHECKALT(p, sgp, path, i) \
do { \
int _error; \
\
_error = linux_emul_find(p, sgp, linux_emul_path, path, \
&path, i); \
if (_error == EFAULT) \
return (_error); \
} while (0)
#define CHECKALTCREAT(p, sgp, path) \
linux_emul_find(p, sgp, linux_emul_path, path, &(path), 1)
#define CHECKALTEXIST(p, sgp, path) CHECKALT(p, sgp, path, 0)
#define CHECKALTCREAT(p, sgp, path) CHECKALT(p, sgp, path, 1)
#endif /* !_LINUX_UTIL_H_ */