Commit Graph

230647 Commits

Author SHA1 Message Date
snj 074b05d323 Pull up following revision(s) (requested by mbalmer in ticket #952):
share/man/man7/hier.7: revision 1.110
Lua 5.1 -> Lua 5.3
From Kamil Rytarowski.
2015-08-21 17:24:01 +00:00
msaitoh 0d3cbec3b0 Ticket 949 and 950. 2015-08-14 05:33:34 +00:00
msaitoh ecf5733d37 Pull up following revision(s) (requested by christos in ticket #950):
crypto/external/bsd/openssh/dist/monitor.c	patch

	OpenSSH PAM fix (BFS-SA-2015-002).
2015-08-14 05:32:39 +00:00
msaitoh a23b292638 Pull up following revision(s) (requested by riastradh in ticket #949):
sys/ufs/ffs/ffs_alloc.c: revision 1.151
Need wapbl transaction around ffs_blkfree_cg.  Fixes wapbl+discard.
2015-08-14 05:29:14 +00:00
sborrill 1d01e8a9b9 Fix typos 2015-08-11 08:29:03 +00:00
snj 810f58a3ee Welcome to 7.0_RC3! 2015-08-11 05:37:41 +00:00
snj 64e72296b0 945-948 2015-08-11 05:18:15 +00:00
snj b92e1eb930 Pull up following revision(s) (requested by msaitoh in ticket #947):
sys/arch/x86/x86/mpacpi.c: revision 1.98
Fix wrong output in mpacpi_pci_foundbus() with MPVERBOSE. Assign
vaues before printing them.
2015-08-11 05:15:25 +00:00
snj d8e4dc21f3 Pull up following revision(s) (requested by msaitoh in ticket #945):
sys/arch/x86/x86/cpu_ucode_intel.c: revisions 1.7, 1.8
Re-allocale buffer if a buffer for microcode is not 16byte aligned.
--
Use roundup2() and uintptr_t. Adviced by riastradh@.
2015-08-11 05:13:44 +00:00
snj 7a93abab25 Pull up following revision(s) (requested by msaitoh in ticket #946):
sys/arch/x86/x86/coretemp.c: revision 1.34
- Change the Upper limit of Tjmax from 100 to 110 because some new
  CPUs have 105. This change is the same as FreeBSD.
- Print Tjmax with aprint_verbose().
- Reduce the diff against FreeBSD.
2015-08-11 05:11:08 +00:00
snj f33b7c6d75 Pull up following revision(s) (requested by msaitoh in ticket #948):
sys/arch/x86/x86/mpacpi.c: revisions 1.99, 1.100
	sys/arch/x86/x86/lapic.c: revision 1.49
- Add lapic_dump() to print lapic's setting.
- Add mpacpi_dump() to dump mp_intrs[].
--
Configure ioapic before lapic because lapic(lapic_set_lvt()) checks the
existence of ioapic. This change fixes a problem that some machines hang
after attaching ehci (little after writing EHCI_USBINTR to enable interrupt).
Even though cold == 1, LAPIC_LVINT0 was not set as masked. Perhaps it's the
reason of the problem.
This problem was observed on SuperMicro X10SLX-F, X10SDV-TLN4F and
Shuttle DS57U without wm(4) driver.
2015-08-11 05:07:16 +00:00
martin d07eef6ec5 Ticket #943 2015-08-09 10:16:35 +00:00
martin 3eb2f2ce5b Pull up following revision(s) (requested by mlelstv in ticket #943):
sys/kern/vfs_wapbl.c: revision 1.62
Refactor disk address calculation from physical block numbers in
the journal into a function. Make that function work correctly with
sector sizes != DEV_BSIZE when compiled outside the kernel (i.e.
fsck_ffs).
Fixes PR bin/45933
2015-08-09 10:15:15 +00:00
martin 6c9eb9fe6d Ticket #942 2015-08-08 15:46:48 +00:00
martin a0e5c8a575 Pull up following revision(s) (requested by maxv in ticket #942):
sys/kern/uipc_syscalls.c: revision 1.179
Memory leak. Triggerable from an unprivileged user via COMPAT_43.
2015-08-08 15:45:47 +00:00
martin 665baf8450 Ticket #941 2015-08-08 15:43:00 +00:00
martin 40be23e7da Pull up following revision(s) (requested by maxv in ticket #941):
sys/compat/netbsd32/netbsd32_socket.c: revision 1.42
Memory leak, triggerable from an unprivileged user.
2015-08-08 15:41:54 +00:00
martin ab39fc3d62 Ticket #939 2015-08-08 10:11:52 +00:00
martin 36c3bf3db9 Pull up following revision(s) (requested by prlw1 in ticket #939):
sys/external/bsd/ipf/netinet/ip_nat.h: revision 1.7
	sys/external/bsd/ipf/netinet/ip_nat.c: revision 1.14
	sys/external/bsd/ipf/netinet/ip_nat6.c: revision 1.8
Avoid panic in SIOCGNATL dereferencing a NULL softc.
Solution suggestion from Martin Husemann.
2015-08-08 10:09:57 +00:00
martin 4259fa6442 Ticket #938 2015-08-07 13:45:33 +00:00
martin 15799b4211 Pull up following revision(s) (requested by skrll in ticket #938):
distrib/utils/embedded/conf/armv7.conf: revision 1.5
Turn resize on
2015-08-07 13:44:27 +00:00
msaitoh 8ed9f32a61 Ticket 937. 2015-08-07 06:23:58 +00:00
msaitoh 45d140c840 Pull up following revision(s) (requested by snj in ticket #937):
usr.sbin/postinstall/postinstall: revision 1.191 via patch
Add resize_root
2015-08-07 06:22:10 +00:00
snj 0a3e6085c0 922 2015-08-07 04:13:55 +00:00
snj 4996ce520d Pull up following revision(s) (requested by christos in ticket #922):
external/bsd/blacklist/bin/blacklistctl.c: revision 1.18
	external/bsd/blacklist/bin/blacklistd.c: revision 1.33
	external/bsd/blacklist/bin/run.c: revision 1.13
	external/bsd/blacklist/bin/conf.c: revisions 1.21-1.23
	external/bsd/blacklist/bin/state.c: revisions 1.16, 1.17
	external/bsd/blacklist/bin/support.c: revision 1.7
	external/bsd/blacklist/bin/support.h: revision 1.6
	external/bsd/blacklist/etc/blacklistd.conf: revisions 1.5, 1.6
	external/bsd/blacklist/libexec/blacklistd-helper: revision 1.5
print the key in human readable form when debugging.
--
Add more debugging, simplify.
Use symbolic constants: -2=FEQUALS, -1=FSTAR
--
make proto and port optional
--
restore address length before printing.
--
dissallow interface spec in remote config (since we check against the remote
address, it does not make sense).
--
remove interface example from remote config.
--
simplify, comment out testing entries
--
Restart the loop each time we delete an entry because the hash code does
not handle it well. Is that a db bug?
2015-08-07 04:10:23 +00:00
snj 0d4150dd2b 909, 912, 921, 923, 935, 936 2015-08-06 22:03:14 +00:00
snj 26c7c1a4b2 Pull up following revision(s) (requested by jnemeth in ticket #936):
usr.sbin/mountd/mountd.c: revision 1.127
PR/50125 - Jarle Greipsland -- Incorrect PID in /var/run/mountd.pid
Move call to pidfile() after daemon() so that correct (child) pid is
written to pidfile.
2015-08-06 21:59:04 +00:00
snj aafcbf7a9d Apply patch (requested by dholland in ticket #935):
Comment out some KASSERTs.
2015-08-06 21:57:28 +00:00
snj 1d9e0bab9d Pull up following revision(s) (requested by christos in ticket #923):
lib/libperfuse/perfuse.c: revision 1.37
Deal with limits properly.
Don't print strerror() 2ice.
XXX: pullup-7
2015-08-06 21:52:13 +00:00
snj 97b33af004 Pull up following revision(s) (requested by christos in ticket #921):
lib/libc/db/hash/hash.c: revision 1.34
	lib/libc/db/hash/hash.c: revision 1.35
Delay moving to the next key until the next iteration. This avoids returning
invalid data to the user if the user deletes the current key, but it also
fails to iterate over some keys as will be shown by a unit test. From FreeBSD.
--
Fix hash iteration that deletes the current element under the cursor by
adjusting the position of the iterator appropriately.
2015-08-06 21:50:36 +00:00
snj f3ef739816 Pull up following revision(s) (requested by maxv in ticket #912):
sys/kern/sys_pset.c: revision 1.19
Don't forget to unlock the LWP.
ok rmind@
2015-08-06 21:47:11 +00:00
snj e8c0536867 Pull up following revision(s) (requested by skrll in ticket #909):
distrib/sets/lists/etc/mi: revision 1.237
	distrib/sets/lists/tests/mi: revision 1.613
	distrib/utils/embedded/conf/armv7.conf: revisions 1.1, 1.2
	distrib/utils/embedded/conf/beagleboard.conf: delete
	distrib/utils/embedded/conf/evbarm.conf: revisions 1.21, 1.22
	distrib/utils/embedded/conf/rpi.conf: revisions 1.28, 1.29
	distrib/utils/embedded/conf/rpi_inst.conf: revisions 1.7, 1.8
	distrib/utils/embedded/conf/usermode.conf: revision 1.5
	distrib/utils/embedded/conf/x86.conf: revision 1.5
	distrib/utils/embedded/files/resize_disklabel: revision 1.1
	distrib/utils/embedded/mkimage: revisions 1.49, 1.55-1.59
	etc/defaults/rc.conf: revision 1.133
	etc/etc.evbarm/Makefile.inc: revisions 1.72, 1.76
	etc/rc.d/Makefile: revision 1.93 via patch
	etc/rc.d/resize_root: revisions 1.1-1.3
	etc/rc.d/root: revision 1.5
	sbin/resize_ffs/Makefile: revision 1.5
	sbin/resize_ffs/resize_ffs.8: revisions 1.14-1.16
	sbin/resize_ffs/resize_ffs.c: revisions 1.39-1.44
	share/man/man5/rc.conf.5: revision 1.158, 1.159
	tests/sbin/resize_ffs/Makefile: revision 1.4
	tests/sbin/resize_ffs/common.sh: revision 1.14
	tests/sbin/resize_ffs/t_check.sh: revision 1.1
	tests/sbin/resize_ffs/t_grow.sh: revision 1.9
	tests/sbin/resize_ffs/t_grow_swapped.sh: revision 1.3
	tests/sbin/resize_ffs/t_shrink.sh: revision 1.8
	tests/sbin/resize_ffs/t_shrink_swapped.sh: revision 1.2
fix image building:
         - round up the total size of the disk image
         - fix fdisk offset for netbsd ffs images
--
Make get_dev_size work on regular files too.
--
Use `!= -1' instead of `== 0' out of paranoia.
--
- Add -c to check to see if grow/shrink is required
- Divide by DEV_BSIZE when returning size of file.
- Update manpage
--
New sentence, new line. Sort option descriptions.
--
Add resize_root boot operation. If resize_root=YES in rc.conf then
the system attempts to resize the root file system to fill it's
partition prior to mounting read-write. Useful for things like AMI
file system images. May eventually be used by arm images after
coming up with similar solution for increasing the parition size.
--
- Add new tests for -c check flag in resize_ffs
--
Bump date for previous.
it's -> its
--
Handle case in grow() where last cylinder group is too small for ufs2.
Align with code in shrink().
--
factor out geometry calculation and use this also in CheckOnly mode.
be a bit more verbose in Verbose mode.
--
Add support for auto-growing the root partition. Enable it for rpi.img.
--
initialize resize before pulling in board config
--
add KEYWORD: interactive, honour resize_root_flags and
resize_root_postcmd rc vars
--
if the -p flag is specified, display a progress bar while growing the
file-system
--
show resize_ffs progress bar when resizing root partition
--
fix typo in previous; pass -y unconditionally to resize_ffs, not -p
--
Rename beagleboard.img to armv7.img. The new image includes the same
kernels as beagleboard.img plus support for Raspberry Pi 2, ODROID-C1,
Cubieboard2, Cubietruck, Hummingbird A31, and Banana Pi.
--
Properly spell X' name. From X(7):
        The  X.Org  Foundation  requests  that the following names be
used when
        referring to this software:
                                           X
                                    X Window System
                                     X Version 11
                              X Window System, Version 11
                                          X11
--
Add some documentation:
Tell what this does, and what it expects from conf files
--
Cleanup: make_filesystems is not used any longer, purge remains
--
More cleanup:
Instead of first overwriting the *_evbarm functions with own code,
and then calling them from the regular functions, directly put the
code into the regular functions.
No more functions from evbarm.conf are used now.
Some variables are still used!
--
define TOOL_MKUBOOTIMAGE for mkimage
--
fix mkubootimage
2015-08-06 21:13:43 +00:00
snj 7074a40cfb 91[348] 2015-08-04 21:33:07 +00:00
snj 49908678ea Pull up following revision(s) (requested by maxv in ticket #914):
sys/dev/pci/if_et.c: revision 1.9
Use-after-free.
ok christos@
Found by Brainy.
2015-08-04 21:16:43 +00:00
snj 8c7343de46 Pull up following revision(s) (requested by maxv in ticket #913):
sys/dev/pci/if_ti.c: revisions 1.94, 1.95
fix mbuf leak on failure (Brainy)
--
Memory leak. Same as r1.93. I don't know why Brainy didn't detect it
earlier; or perhaps I forgot to report it.
Found by Brainy.
2015-08-04 21:14:49 +00:00
snj f741a9244b Pull up following revision(s) (requested by christos in ticket #918):
usr.bin/patch/patch.1: revisions 1.18, 1.19
	usr.bin/patch/common.h: revision 1.21
	usr.bin/patch/inp.c: revision 1.24
From Martin Natano @bitrig: Use execve(2) instead of system to apply patches
that require rcs command execution instead system(3) to avoid malicious
filenames in patches causing bad things to happen. In the process, lose SCCS
support. It is not like we are shipping sccs commands for that to work.
--
Use absolute paths for RCS commands (Martin Natano)
--
remove reference to SCCS which is not supported anymore.
--
Fix two typos.
2015-08-04 21:03:33 +00:00
snj 8e304b9431 929, 931-934 2015-08-04 18:16:00 +00:00
snj a7264f23c5 Pull up following revision(s) (requested by prlw1 in ticket #934):
sys/arch/xen/x86/cpu.c: revision 1.100
Move all pmap-related cpu_info initialisations, including
initializing ci_kpm_mtx, in cpu_attach_common() from cpu_init()
(ci_pmap and ci_tlbstate as already initialized in cpu_attach_common()).
2015-08-04 18:12:28 +00:00
snj 909b53e441 Pull up following revision(s) (requested by christos in ticket #933):
sys/kern/kern_descrip.c: revision 1.229
1. mask fflags so we don't tack on whateve oflags were passed from userland
2. honor O_CLOEXEC, so the children of daemons that use cloning devices, don't
   end up with the parents descriptors
fd_clone and in general the fd approach of 'allocate' > 'play with guts' >
'attach' should be converted to be more constructor like.
2015-08-04 17:24:59 +00:00
snj 195291cacc Pull up following revision(s) (requested by dholland in ticket #932):
sys/ufs/lfs/lfs_segment.c: revision 1.247 via patch
Fix catastrophic bug in lfs_rewind() that changed segment numbers
(lfs_curseg/lfs_nextseg in the superblock) using the wrong units.
These fields are for whatever reason the start addresses of segments
(measured in frags) rather than the segment numbers 0..n.
This only apparently affects dumping from a mounted fs; however, it
trashes the fs.
I would really, really like to have a static analysis tool that can
keep track of the units things are measured in, since fs code is full
of conversion macros and the macros are named inscrutable things like
"sntod" whose letters don't necessarily even correspond to the units
they convert. It is surprising that more of these are not wrong.
2015-08-04 17:20:58 +00:00
snj 9d223c0ed9 Pull up following revision(s) (requested by tsutsui in ticket #931):
sys/external/bsd/drm2/dist/drm/i915/i915_gem.c: revision 1.32
Pull upstream fix to avoid kernel panic on starting X on Intel 855GM machines.
Reported in PR kern/49875, and ok'ed to commit by riastradh@.
2015-08-04 17:18:39 +00:00
snj 4826bf7f64 Pull up following revision(s) (requested by martin in ticket #929):
distrib/sets/join.awk: revision 1.4
Add an unvis function and use it on file names in mtree specs.
This should correct the problem that ./bin/[ was missing from the
base.tgz set, despite being listed in src/distrib/sets/base/mi
and being present in METALOG.  The corresponding entry in
METALOG.sanitised has ./bin/\133 instead of ./bin/[, and that made
join.awk omit it.
XXX: The unvis() implementation in join.awk handles only a subset
of the syntax, but it's probably good enough for now.
XXX: The file names should probably be canonicalised by
vis(unvis(name)), but at present none of the file names in the set
lists really need it.
XXX: It may be a bug that entries in the set lists without
corresponding entries in METALOG are silently ignored by join.awk.
2015-08-04 17:16:33 +00:00
martin 6828e57cb2 Ticket #930 2015-08-02 11:30:45 +00:00
martin 361594579a Pull up following revision(s) (requested by maxv in ticket #930):
sys/compat/netbsd32/netbsd32_ioctl.c: revision 1.82
Wrong logic. Here, userland can control the size and the data copied, which
basically means it can overflow kernel memory.
ok martin@ christos@
2015-08-02 11:29:10 +00:00
snj e7cd0865d9 tickets 915-917, 919, 924, 926 2015-07-31 17:55:21 +00:00
snj b1d90f8563 Pull up following revision(s) (requested by christos in ticket #924):
sys/dev/ccd.c: revision 1.163
initialized sc_unit (from Riastradh)
XXX: pullup-7
2015-07-31 17:29:45 +00:00
snj ab58cfaff5 Pull up following revision(s) (requested by christos in ticket #926):
external/bsd/blacklist/bin/blacklistd.8: revisions 1.12-1.14
Document the options as a list instead of embedded text.
--
Whitespace and macro fixes.
--
prune bogus comma from Nm args
2015-07-31 17:26:13 +00:00
snj 907cefd2ba Pull up following revision(s) (requested by christos in ticket #919):
usr.sbin/ypserv/ypserv/ypserv_proc.c: revision 1.17
PR/50057: Wolfgang Stukenbrock: yp-map transfer removes SECURE-flag
2015-07-31 17:06:56 +00:00
snj 06cb46469b Pull up following revision(s) (requested by christos in ticket #917):
doc/3RDPARTY: patch
	external/bsd/bind/dist/CHANGES: up to 1.16
	external/bsd/bind/dist/README: up to 1.4
	external/bsd/bind/dist/doc/arm/Bv9ARM.ch01.html: up to 1.1.1.14
	external/bsd/bind/dist/doc/arm/Bv9ARM.ch02.html: up to 1.1.1.11
	external/bsd/bind/dist/doc/arm/Bv9ARM.ch03.html: up to 1.1.1.16
	external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html: up to 1.4
	external/bsd/bind/dist/doc/arm/Bv9ARM.ch05.html: up to 1.1.1.17
	external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html: up to 1.4
	external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html: up to 1.4
	external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html: up to 1.4
	external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html: up to 1.4
	external/bsd/bind/dist/doc/arm/Bv9ARM.ch10.html: up to 1.1.1.13
	external/bsd/bind/dist/doc/arm/Bv9ARM.ch11.html: up to 1.1.1.2
	external/bsd/bind/dist/doc/arm/Bv9ARM.ch12.html: up to 1.1.1.2
	external/bsd/bind/dist/doc/arm/Bv9ARM.ch13.html: up to 1.1.1.2
	external/bsd/bind/dist/doc/arm/Bv9ARM.html: up to 1.4
	external/bsd/bind/dist/doc/arm/Bv9ARM.pdf: up to 1.10
	external/bsd/bind/dist/doc/arm/man.arpaname.html: up to 1.4
	external/bsd/bind/dist/doc/arm/man.ddns-confgen.html: up to 1.4
	external/bsd/bind/dist/doc/arm/man.delv.html: up to 1.4
	external/bsd/bind/dist/doc/arm/man.dig.html: up to 1.4
	external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html: up to 1.4
	external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html: up to 1.4
	external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html: up to 1.4
	external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html: up to 1.4
	external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html: up to 1.4
	external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html: up to 1.4
	external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html: up to 1.4
	external/bsd/bind/dist/doc/arm/man.dnssec-settime.html: up to 1.4
	external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html: up to 1.4
	external/bsd/bind/dist/doc/arm/man.dnssec-verify.html: up to 1.4
	external/bsd/bind/dist/doc/arm/man.genrandom.html: up to 1.4
	external/bsd/bind/dist/doc/arm/man.host.html: up to 1.4
	external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html: up to 1.4
	external/bsd/bind/dist/doc/arm/man.named-checkconf.html: up to 1.4
	external/bsd/bind/dist/doc/arm/man.named-checkzone.html: up to 1.4
	external/bsd/bind/dist/doc/arm/man.named-journalprint.html: up to 1.4
	external/bsd/bind/dist/doc/arm/man.named-rrchecker.html: up to 1.4
	external/bsd/bind/dist/doc/arm/man.named.html: up to 1.4
	external/bsd/bind/dist/doc/arm/man.nsec3hash.html: up to 1.4
	external/bsd/bind/dist/doc/arm/man.nsupdate.html: up to 1.4
	external/bsd/bind/dist/doc/arm/man.rndc-confgen.html: up to 1.4
	external/bsd/bind/dist/doc/arm/man.rndc.conf.html: up to 1.4
	external/bsd/bind/dist/doc/arm/man.rndc.html: up to 1.4
	external/bsd/bind/dist/doc/arm/notes.html: up to 1.1.1.2
	external/bsd/bind/dist/doc/arm/notes.pdf: up to 1.1.1.2
	external/bsd/bind/dist/doc/arm/notes.xml: up to 1.1.1.2
	external/bsd/bind/dist/lib/dns/api: up to 1.4
	external/bsd/bind/dist/lib/dns/tkey.c: up to 1.9
	external/bsd/bind/dist/srcid: up to 1.10
	external/bsd/bind/dist/version: up to 1.14
Update BIND to 9.10.2-P3, addressing CVE-2015-5477.
2015-07-31 16:59:43 +00:00
snj ca2e1ecb05 Pull up following revision(s) (requested by christos in ticket #916):
crypto/external/bsd/openssh/dist/auth2-chall.c: revision 1.8
From FreeBSD:
A remote attacker may effectively bypass MaxAuthTries settings, which would
enable them to brute force passwords. [CVE-2015-5600]
2015-07-31 16:49:41 +00:00