Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle case where compat_ifioctl() is called with ocmd != cmd, as found in 

compat Linux. Do not crash by ensuring that oifr is correctly set.

Fix crash reported by Robert Swindells on tech-kern@.
This commit is contained in:
njoly 2015-07-11 07:43:32 +00:00
parent 887da82a3d
commit fc005ae43f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/compat/common/if_43.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_43.c,v 1.10 2015/05/12 20:42:46 christos Exp $ */
/* $NetBSD: if_43.c,v 1.11 2015/07/11 07:43:32 njoly Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1990, 1993
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.10 2015/05/12 20:42:46 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.11 2015/07/11 07:43:32 njoly Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@ -231,11 +231,11 @@ compat_ifioctl(struct socket *so, u_long ocmd, u_long cmd, void *data,
*/
if (cmd == ocmd) {
cmd = compat_cvtcmd(ocmd);
if (cmd != ocmd) {
oifr = data;
data = ifr = &ifrb;
ifreqo2n(oifr, ifr);
}
}
if (cmd != ocmd) {
oifr = data;
data = ifr = &ifrb;
ifreqo2n(oifr, ifr);
}
switch (ocmd) {