CVS log for src/sys/compat/common/uipc_syscalls_40.c

Up to [cvs.NetBSD.org] / src / sys / compat / common

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

ifioctl(9): Don't touch ifconf or ifreq until command is validated.

sys_ioctl validates the data pointer according to the command's size
and direction.  But userland may ioctl commands other than
OSIOCGIFCONF or OOSIOCGIFCONF -- and if userland passes an IOC_VOID
command, the argument is passed through verbatim and may be null.

Reported-by: syzbot+19b1bf83e5481273eafc@syzkaller.appspotmail.com
https://syzkaller.appspot.com/bug?id=f4c91a7dcd31901c80d91af6ed01456faf0a7286

Reported-by: syzbot+442c033feb784d055185@syzkaller.appspotmail.com
https://syzkaller.appspot.com/bug?id=4a3a4b92dbe9695046ff17a5474cef52aed23e0b

Reported-by: syzbot+4c87d0cdf7025741ea7a@syzkaller.appspotmail.com
https://syzkaller.appspot.com/bug?id=3e5f42c998e43ad42da40dec3c7873e6aae187e4

Pull up following revision(s) (requested by msaitoh in ticket #1576):

	sys/net/if.c: revision 1.479
	sys/compat/common/uipc_syscalls_40.c: revision 1.23
	sys/compat/linux/common/linux_socket.c: revision 1.150
	sys/compat/linux32/common/linux32_socket.c: revision 1.31

 Don't accept negative value.

Pull up following revision(s) (requested by msaitoh in ticket #1018):

	sys/net/if.c: revision 1.479
	sys/compat/common/uipc_syscalls_40.c: revision 1.23
	sys/compat/linux/common/linux_socket.c: revision 1.150
	sys/compat/linux32/common/linux32_socket.c: revision 1.31

 Don't accept negative value.

 Don't accept negative value.

Reported-by: syzbot+e71a77402d6668f1868d@syzkaller.appspotmail.com

Merge changes from current as of 20200406

Sync with head.

pass the address of the field, instead of relying on it being the first
field of the structure, no functional change

Rather than keeping a separate mutex, condvar, and pserialize for each
module hook, we can share a common set of synchronization structures.
This cuts the amount of cacheline_aligned data for these structures by
50%.

Note that we still have a per-hook localcount, since we need to count
individual references.

As discussed with riastradh@

Welcome to 9.99.22 !

Sync with HEAD

 KNF. No functional change.

Pull up following revision(s) via patch (requested by christos in ticket #1689):

	sys/compat/linux/common/linux_socket.c: revision 1.145
	sys/net/if.c: revision 1.449
	sys/compat/linux32/common/linux32_socket.c: revision 1.30
	sys/compat/common/uipc_syscalls_40.c: revision 1.19

Zero out the ifreq struct for SIOCGIFCONF to avoid up to 127 bytes of stack
disclosure. From Andy Nguyen, many thanks!

 -

Zero out the ifreq struct for SIOCGIFCONF to avoid up to 127 bytes of stack
disclosure. From Andy Nguyen, many thanks! This is the compat code part
pointed out by ozaki-r@

Pull up following revision(s) via patch (requested by christos in ticket #1689):

	sys/compat/linux/common/linux_socket.c: revision 1.145
	sys/net/if.c: revision 1.449
	sys/compat/linux32/common/linux32_socket.c: revision 1.30
	sys/compat/common/uipc_syscalls_40.c: revision 1.19

Zero out the ifreq struct for SIOCGIFCONF to avoid up to 127 bytes of stack
disclosure. From Andy Nguyen, many thanks!

 -

Zero out the ifreq struct for SIOCGIFCONF to avoid up to 127 bytes of stack
disclosure. From Andy Nguyen, many thanks! This is the compat code part
pointed out by ozaki-r@

Pull up following revision(s) via patch (requested by christos in ticket #1689):

	sys/compat/linux/common/linux_socket.c: revision 1.145
	sys/net/if.c: revision 1.449
	sys/compat/linux32/common/linux32_socket.c: revision 1.30
	sys/compat/common/uipc_syscalls_40.c: revision 1.19

Zero out the ifreq struct for SIOCGIFCONF to avoid up to 127 bytes of stack
disclosure. From Andy Nguyen, many thanks!

 -

Zero out the ifreq struct for SIOCGIFCONF to avoid up to 127 bytes of stack
disclosure. From Andy Nguyen, many thanks! This is the compat code part
pointed out by ozaki-r@

Pull up following revision(s) (requested by christos in ticket #1233):

	sys/compat/linux/common/linux_socket.c: revision 1.145
	sys/net/if.c: revision 1.449
	sys/compat/linux32/common/linux32_socket.c: revision 1.30
	sys/compat/common/uipc_syscalls_40.c: revision 1.19

Zero out the ifreq struct for SIOCGIFCONF to avoid up to 127 bytes of stack
disclosure. From Andy Nguyen, many thanks!

 -

Zero out the ifreq struct for SIOCGIFCONF to avoid up to 127 bytes of stack
disclosure. From Andy Nguyen, many thanks! This is the compat code part
pointed out by ozaki-r@

Zero out the ifreq struct for SIOCGIFCONF to avoid up to 127 bytes of stack
disclosure. From Andy Nguyen, many thanks! This is the compat code part
pointed out by ozaki-r@

Rename the MODULE_*_HOOK() macros to MODULE_HOOK_*() as briefly
discussed on irc.

NFCI intended.

Ride the earlier kernel bump - it;s getting crowded.

Merge the [pgoyette-compat] branch

Convert the macros for setting and unsetting a hook to generate
in-line code rather than using an intermediary hook##set routine.
Hooks are set and unset only in one place, so the intermediary
routine provides no benefit.  IMHO using the macro at the point-
of-call is more readable than using it elsewhere in the code and
then calling the generated intermediary routine (for which you
won't even find its declaration or definition unless you remember
to search for the HOOK_SET macro instead).

NFC intended, will verify with a bulk build and an atf test run.

Convert a couple more hooks to the MP-safe mechanism.

While here, clean up some headers and remove any that are now empty.

#include "opt_compat_netbsd.h" for all sources that provide compat code.

Use the MP-safe hooks mechanism for the uipc_syscalls_40 and _50
routines.

Rename if_[45]0_{init,fini} entry points to more appropriate and more
consistent uipc_syscalls_[45]0_{init,fini} and remove some multiple
declarations.

Sync with HEAD, resolve some conflicts

Make compat_ifconf() and compat_ifdatareq() static

Merge christos's recent changes on HEAD

provide vectors for the ifconf compat code and ifdatareq compat code.

Remove unnecessary conditionals.  These files aren't built unless
their content is needed (via config option or module configuration).

Handle ifconf() compat vectors

Use a .h file for declaring the if_40_{init, fini} routines

Typo in function declaration.

Untangle some networking compat code so we can build a kernel with
networking and MODULAR, but without any actual COMPAT_* code (ie,
assuming that all the compat stuff can be added later via modules).

Additionaly pull up rev 1.15 for ticket #407, requested by ozaki-r:
#idef the label next_ifa: just like the only goto using it.

update from HEAD

Pull up following revision(s) (requested by ozaki-r in ticket #407):
	sys/compat/linux32/common/linux32_socket.c: revision 1.28
	sys/net/if.c: revision 1.400
	sys/netipsec/key.c: revision 1.243
	sys/compat/linux/common/linux_socket.c: revision 1.139
	sys/netinet/ip_carp.c: revision 1.93
	sys/netinet6/in6.c: revision 1.252
	sys/netinet6/in6.c: revision 1.253
	sys/netinet6/in6.c: revision 1.254
	sys/net/if_spppsubr.c: revision 1.173
	sys/net/if_spppsubr.c: revision 1.174
	sys/compat/common/uipc_syscalls_40.c: revision 1.14
Protect IFADDR_READER_FOREACH and obtained ifa with psz/psref
Fix usage of FOREACH macro
key_sad.lock is held there so SAVLIST_WRITER_FOREACH is enough.
Protect IFADDR_READER_FOREACH and obtained ifa with psz/psref
Protect IFADDR_READER_FOREACH and obtained ifa with psz/psref (more)
Fix and make consistent of usages of psz/psref in ifconf variants
Remove unnecessary goto because there is no cleanup code to share (NFC)
Tweak a condition; we don't need to care ifacount to be negative
Fix a race condition of in6_ifinit
in6_ifinit checks the number of IPv6 addresses on a given interface and
if it's zero (i.e., an IPv6 address being assigned to the interface
is the first one), call if_addr_init. However, the actual assignment of
the address (ifa_insert) is out of in6_ifinit. The check and the
assignment must be done atomically.
Fix it by holding in6_ifaddr_lock during in6_ifinit and ifa_insert.
And also add missing pserialize to IFADDR_READER_FOREACH.

#idef the label next_ifa: just like the only goto using it.

Fix and make consistent of usages of psz/psref in ifconf variants

Sync with HEAD

Sync with HEAD

Sync with HEAD

Use if_acquire and if_release instead of using psref API directly

- Provide if_release for consistency to if_acquire
- Use if_acquire and if_release for ifp iterations
- Make ifnet_psref_class static

Sync with HEAD

Sync with HEAD

Apply pserialize and psref to struct ifaddr and its variants

This change makes struct ifaddr and its variants (in_ifaddr and in6_ifaddr)
MP-safe by using pserialize and psref. At this moment, pserialize_perform
and psref_target_destroy are disabled because (1) we don't need them
because of softnet_lock (2) they cause a deadlock because of softnet_lock.
So we'll enable them when we remove softnet_lock in the future.

Sync with HEAD

Switch the address list of intefaces to pslist(9)

As usual, we leave the old list to avoid breaking kvm(3) users.

Use curlwp_bind and curlwp_bindx instead of open-coding LP_BOUND

Sync with HEAD

Protect ifnet list with psz and psref

The change ensures that ifnet objects in the ifnet list aren't freed during
list iterations by using pserialize(9) and psref(9).

Note that the change adds a pslist(9) for ifnet but doesn't remove the
original ifnet list (ifnet_list) to avoid breaking kvm(3) users. We
shouldn't use the original list in the kernel anymore.

Tweak ifconf variants

The tweaks make the code intention clear and make further changes easy.

No functional change.

Sync with HEAD.

sync with head

Remove includes <sys/mount.h> and <sys/sched.h> added for <sys/syscallargs.h>.
Now they are handled by $sysarghdrextra in sys/kern/syscalls.conf.

sync with HEAD

Sync with HEAD.

Sync with HEAD.

Sync with head.

sync with head

Use IFADDR_EMPTY().

Use IFADDR_FOREACH().

sync with head.

Sync with head.

Sync with head.

Sync with head.

file uipc_syscalls_40.c was added on branch yamt-lazymbuf on 2007-09-03 14:31:52 +0000

file uipc_syscalls_40.c was added on branch mjf-ufs-trans on 2007-07-11 20:03:49 +0000

file uipc_syscalls_40.c was added on branch vmlocking on 2007-06-09 21:37:08 +0000

Reduce difference between compat_ifconf() and ifconf():
- exit on error rather than proceeding to next interface.
- make code simpler.

Move the nasty ifdefs in one place. Requested by ad and dyoung.

wrap the whole function in COMPAT_40

Add a sockaddr_storage member to "struct ifreq" maintaining backwards
compatibility with the older ioctls. This avoids stack smashing and
abuse of "struct sockaddr" when ioctls placed "struct sockaddr_foo's" that
were longer than "struct sockaddr".
XXX: Some of the emulations might be broken; I tried to add code for
them but I did not test them.