Module Name: src Committed By: martin Date: Mon Oct 21 20:06:17 UTC 2019
Modified Files: src/sys/compat/common [netbsd-9]: kern_uipc_socket_50.c src/sys/kern [netbsd-9]: uipc_socket.c src/sys/sys [netbsd-9]: compat_stub.h Log Message: Pull up following revision(s) (requested by pgoyette in ticket #339): sys/compat/common/kern_uipc_socket_50.c: revision 1.3 sys/sys/compat_stub.h: revision 1.19 sys/kern/uipc_socket.c: revision 1.284 Actually return the updated pointer-to-mbuf-pointer to the caller rather than discarding-after-assignment. Introduced from the [pgoyette-compat] branch work. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.6.1 src/sys/compat/common/kern_uipc_socket_50.c cvs rdiff -u -r1.281 -r1.281.2.1 src/sys/kern/uipc_socket.c cvs rdiff -u -r1.18 -r1.18.2.1 src/sys/sys/compat_stub.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/compat/common/kern_uipc_socket_50.c diff -u src/sys/compat/common/kern_uipc_socket_50.c:1.2 src/sys/compat/common/kern_uipc_socket_50.c:1.2.6.1 --- src/sys/compat/common/kern_uipc_socket_50.c:1.2 Mon Apr 15 10:53:17 2019 +++ src/sys/compat/common/kern_uipc_socket_50.c Mon Oct 21 20:06:17 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_uipc_socket_50.c,v 1.2 2019/04/15 10:53:17 pgoyette Exp $ */ +/* $NetBSD: kern_uipc_socket_50.c,v 1.2.6.1 2019/10/21 20:06:17 martin Exp $ */ /* * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -101,7 +101,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kern_uipc_socket_50.c,v 1.2 2019/04/15 10:53:17 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_uipc_socket_50.c,v 1.2.6.1 2019/10/21 20:06:17 martin Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -210,7 +210,7 @@ uipc_socket_50_setopt1(int opt, struct s } static int -uipc_socket_50_sbts(int opt, struct mbuf **mp) +uipc_socket_50_sbts(int opt, struct mbuf ***mp) { struct timeval50 tv50; struct timeval tv; @@ -220,10 +220,10 @@ uipc_socket_50_sbts(int opt, struct mbuf if (opt & SO_OTIMESTAMP) { timeval_to_timeval50(&tv, &tv50); - *mp = sbcreatecontrol(&tv50, sizeof(tv50), SCM_OTIMESTAMP, + **mp = sbcreatecontrol(&tv50, sizeof(tv50), SCM_OTIMESTAMP, SOL_SOCKET); - if (*mp) - mp = &(*mp)->m_next; + if (**mp) + *mp = &(**mp)->m_next; return 0; } else return EPASSTHROUGH; Index: src/sys/kern/uipc_socket.c diff -u src/sys/kern/uipc_socket.c:1.281 src/sys/kern/uipc_socket.c:1.281.2.1 --- src/sys/kern/uipc_socket.c:1.281 Tue Jul 16 22:57:55 2019 +++ src/sys/kern/uipc_socket.c Mon Oct 21 20:06:17 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket.c,v 1.281 2019/07/16 22:57:55 pgoyette Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.281.2.1 2019/10/21 20:06:17 martin Exp $ */ /* * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.281 2019/07/16 22:57:55 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.281.2.1 2019/10/21 20:06:17 martin Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -2420,7 +2420,7 @@ sbsavetimestamp(int opt, struct mbuf **m microtime(&tv); - MODULE_HOOK_CALL(uipc_socket_50_sbts_hook, (opt, mp), enosys(), error); + MODULE_HOOK_CALL(uipc_socket_50_sbts_hook, (opt, &mp), enosys(), error); if (error == 0) return mp; Index: src/sys/sys/compat_stub.h diff -u src/sys/sys/compat_stub.h:1.18 src/sys/sys/compat_stub.h:1.18.2.1 --- src/sys/sys/compat_stub.h:1.18 Sat Jul 20 20:59:05 2019 +++ src/sys/sys/compat_stub.h Mon Oct 21 20:06:17 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_stub.h,v 1.18 2019/07/20 20:59:05 mrg Exp $ */ +/* $NetBSD: compat_stub.h,v 1.18.2.1 2019/10/21 20:06:17 martin Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -231,7 +231,7 @@ MODULE_HOOK(uipc_socket_50_setopt1_hook, (int, struct socket *, const struct sockopt *)); MODULE_HOOK(uipc_socket_50_getopt1_hook, int, (int, struct socket *, struct sockopt *)); -MODULE_HOOK(uipc_socket_50_sbts_hook, int, (int, struct mbuf **)); +MODULE_HOOK(uipc_socket_50_sbts_hook, int, (int, struct mbuf ***)); /* * uipc_syscalls_50 compatibility