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

Fix bug in the fcntl syscall where 'arg' was not set properly.

Browse Source 
PR: 12147
Submitted by: Allan Saddi <asaddi@philosophysw.com>
This commit is contained in:
marcel 1999-08-15 14:22:30 +00:00
parent 3760a527a6
commit 4b99c12e08
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/compat/linux/linux_file.c
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: linux_file.c,v 1.29 1999/08/13 09:27:54 marcel Exp $ * $Id: linux_file.c,v 1.30 1999/08/14 18:20:44 marcel Exp $
*/ */
#include "opt_compat.h" #include "opt_compat.h"
@ -217,11 +217,11 @@ linux_fcntl(struct proc *p, struct linux_fcntl_args *args)
p->p_pid, args->fd, args->cmd); p->p_pid, args->fd, args->cmd);
#endif #endif
fcntl_args.fd = args->fd; fcntl_args.fd = args->fd;
fcntl_args.arg = 0;
switch (args->cmd) { switch (args->cmd) {
case LINUX_F_DUPFD: case LINUX_F_DUPFD:
fcntl_args.cmd = F_DUPFD; fcntl_args.cmd = F_DUPFD;
fcntl_args.arg = args->arg;
return fcntl(p, &fcntl_args); return fcntl(p, &fcntl_args);
case LINUX_F_GETFD: case LINUX_F_GETFD:
@ -230,6 +230,7 @@ linux_fcntl(struct proc *p, struct linux_fcntl_args *args)
case LINUX_F_SETFD: case LINUX_F_SETFD:
fcntl_args.cmd = F_SETFD; fcntl_args.cmd = F_SETFD;
fcntl_args.arg = args->arg;
return fcntl(p, &fcntl_args); return fcntl(p, &fcntl_args);
case LINUX_F_GETFL: case LINUX_F_GETFL:
@ -247,6 +248,7 @@ linux_fcntl(struct proc *p, struct linux_fcntl_args *args)
return error; return error;
case LINUX_F_SETFL: case LINUX_F_SETFL:
fcntl_args.arg = 0;
if (args->arg & LINUX_O_NDELAY) fcntl_args.arg |= O_NONBLOCK; if (args->arg & LINUX_O_NDELAY) fcntl_args.arg |= O_NONBLOCK;
if (args->arg & LINUX_O_APPEND) fcntl_args.arg |= O_APPEND; if (args->arg & LINUX_O_APPEND) fcntl_args.arg |= O_APPEND;
if (args->arg & LINUX_O_SYNC) fcntl_args.arg |= O_FSYNC; if (args->arg & LINUX_O_SYNC) fcntl_args.arg |= O_FSYNC;

6
sys/i386/linux/linux_file.c
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: linux_file.c,v 1.29 1999/08/13 09:27:54 marcel Exp $ * $Id: linux_file.c,v 1.30 1999/08/14 18:20:44 marcel Exp $
*/ */
#include "opt_compat.h" #include "opt_compat.h"
@ -217,11 +217,11 @@ linux_fcntl(struct proc *p, struct linux_fcntl_args *args)
p->p_pid, args->fd, args->cmd); p->p_pid, args->fd, args->cmd);
#endif #endif
fcntl_args.fd = args->fd; fcntl_args.fd = args->fd;
fcntl_args.arg = 0;
switch (args->cmd) { switch (args->cmd) {
case LINUX_F_DUPFD: case LINUX_F_DUPFD:
fcntl_args.cmd = F_DUPFD; fcntl_args.cmd = F_DUPFD;
fcntl_args.arg = args->arg;
return fcntl(p, &fcntl_args); return fcntl(p, &fcntl_args);
case LINUX_F_GETFD: case LINUX_F_GETFD:
@ -230,6 +230,7 @@ linux_fcntl(struct proc *p, struct linux_fcntl_args *args)
case LINUX_F_SETFD: case LINUX_F_SETFD:
fcntl_args.cmd = F_SETFD; fcntl_args.cmd = F_SETFD;
fcntl_args.arg = args->arg;
return fcntl(p, &fcntl_args); return fcntl(p, &fcntl_args);
case LINUX_F_GETFL: case LINUX_F_GETFL:
@ -247,6 +248,7 @@ linux_fcntl(struct proc *p, struct linux_fcntl_args *args)
return error; return error;
case LINUX_F_SETFL: case LINUX_F_SETFL:
fcntl_args.arg = 0;
if (args->arg & LINUX_O_NDELAY) fcntl_args.arg |= O_NONBLOCK; if (args->arg & LINUX_O_NDELAY) fcntl_args.arg |= O_NONBLOCK;
if (args->arg & LINUX_O_APPEND) fcntl_args.arg |= O_APPEND; if (args->arg & LINUX_O_APPEND) fcntl_args.arg |= O_APPEND;
if (args->arg & LINUX_O_SYNC) fcntl_args.arg |= O_FSYNC; if (args->arg & LINUX_O_SYNC) fcntl_args.arg |= O_FSYNC;