From 3c3549f6e7232f727ffbe58b42b6a8b781a59c6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Schmidt?= Date: Sun, 10 Aug 1997 18:15:20 +0000 Subject: [PATCH] Ops the arguments to copyin was in the wrong order.. This has survived since the first version, sigh. --- sys/compat/linux/linux_ipc.c | 4 ++-- sys/i386/linux/linux_ipc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c index dd4007b684e..988e574e54b 100644 --- a/sys/compat/linux/linux_ipc.c +++ b/sys/compat/linux/linux_ipc.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id$ + * $Id: linux_ipc.c,v 1.10 1997/02/22 09:38:22 peter Exp $ */ @@ -276,7 +276,7 @@ linux_shmctl(struct proc *p, struct linux_ipc_args *args, int *retval) bsd_args.buf = (struct shmid_ds*)stackgap_alloc(&sg, sizeof(struct shmid_ds)); if ((error = shmctl(p, &bsd_args, retval))) return error; - if ((error = copyin((caddr_t)&bsd_shmid, (caddr_t)bsd_args.buf, + if ((error = copyin((caddr_t)bsd_args.buf, (caddr_t)&bsd_shmid, sizeof(struct shmid_ds)))) return error; bsd_to_linux_shmid_ds(&bsd_shmid, &linux_shmid); diff --git a/sys/i386/linux/linux_ipc.c b/sys/i386/linux/linux_ipc.c index dd4007b684e..988e574e54b 100644 --- a/sys/i386/linux/linux_ipc.c +++ b/sys/i386/linux/linux_ipc.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id$ + * $Id: linux_ipc.c,v 1.10 1997/02/22 09:38:22 peter Exp $ */ @@ -276,7 +276,7 @@ linux_shmctl(struct proc *p, struct linux_ipc_args *args, int *retval) bsd_args.buf = (struct shmid_ds*)stackgap_alloc(&sg, sizeof(struct shmid_ds)); if ((error = shmctl(p, &bsd_args, retval))) return error; - if ((error = copyin((caddr_t)&bsd_shmid, (caddr_t)bsd_args.buf, + if ((error = copyin((caddr_t)bsd_args.buf, (caddr_t)&bsd_shmid, sizeof(struct shmid_ds)))) return error; bsd_to_linux_shmid_ds(&bsd_shmid, &linux_shmid);