aboutsummaryrefslogtreecommitdiffstats
path: root/sys
Commit message (Collapse)AuthorAgeFilesLines
* Fix OpenSSL NULL pointer de-reference.releng/12.2Gordon Tetlow2020-12-081-1/+1
| | | | | | | | | Approved by: so Security: FreeBSD-SA-20:33.openssl Security: CVE-2020-1971 Notes: svn path=/releng/12.2/; revision=368463
* Add UPDATING entries and bump version.Gordon Tetlow2020-12-011-1/+1
| | | | | | | Approved by: so Notes: svn path=/releng/12.2/; revision=368257
* Fix ICMPv6 use-after-free in error message handling.Gordon Tetlow2020-12-011-9/+5
| | | | | | | | | Approved by: so Security: FreeBSD-SA-20:31.icmp6 Security: CVE-2020-7469 Notes: svn path=/releng/12.2/; revision=368255
* Fix race condition in callout CPU migration.Gordon Tetlow2020-12-011-2/+2
| | | | | | | | Approved by: so Security: FreeBSD-EN-20:22.callout Notes: svn path=/releng/12.2/; revision=368254
* Fix execve/fexecve system call auditing.Gordon Tetlow2020-12-017-0/+27
| | | | | | | | Approved by: so Security: FreeBSD-EN-20:19.audit Notes: svn path=/releng/12.2/; revision=368249
* - Switch releng/12.2 from RC3 to RELEASE.release/12.2.0Glen Barber2020-10-231-1/+1
| | | | | | | | | | | | | - Add the anticipated 12.2-RELEASE date to UPDATING. Fix a missing colon in the previous UPDATING entry while here. - Set a static __FreeBSD_version. Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com) Notes: svn path=/releng/12.2/; revision=366954 svn path=/release/12.2.0/; revision=367086; tag=release/12.2.0
* Update releng/12.2 to RC3 as part of the 12.2-RELEASE cycle.Glen Barber2020-10-161-1/+1
| | | | | | | | Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com) Notes: svn path=/releng/12.2/; revision=366739
* MFS r365964:Ganael LAPLANCHE2020-10-141-3/+4
| | | | | | | | | | | Allow slow USB devices to be given more time to return their USB descriptors, like Logitech HD Pro Webcam C920. PR: 248926 Approved by: re (gjb), hselasky Notes: svn path=/releng/12.2/; revision=366693
* Update releng/12.2 to RC2 as part of the 12.2-RELEASE cycle.Glen Barber2020-10-081-1/+1
| | | | | | | | Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com) Notes: svn path=/releng/12.2/; revision=366553
* MFS r366360,r366361:Mitchell Horne2020-10-071-1/+1
| | | | | | | | | | MFC r366271: arm64: set the correct HWCAP Approved by: re (gjb) Notes: svn path=/releng/12.2/; revision=366520
* MFS r366438:Navdeep Parhar2020-10-051-26/+41
| | | | | | | | | | cxgbe(4): set up the firmware flowc for the tid before send_abort_rpl. Approved by: re@ (gjb@) Sponsored by: Chelsio Communications Notes: svn path=/releng/12.2/; revision=366451
* MFS r366395: Fix Typo in ng_hci_le_connection_complete_ep struct.Kyle Evans2020-10-041-1/+1
| | | | | | | Approved by: re (gjb) Notes: svn path=/releng/12.2/; revision=366419
* Rename releng/12.2 to RC1 as part of the 12.2-RELEASE cycle.Glen Barber2020-10-021-1/+1
| | | | | | | | Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com) Notes: svn path=/releng/12.2/; revision=366352
* MFS r366324:Michael Tuexen2020-10-013-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Improve the handling of receiving unordered and unreliable user messages using DATA chunks. Don't use fsn_included when not being sure that it is set to an appropriate value. If the default is used, which is -1, this can result in SCTP associaitons not making any user visible progress. Thanks to Yutaka Takeda for reporting this issue for the the userland stack in https://github.com/pion/sctp/issues/138. MFS r366329: Improve the input validation and processing of cookies. This avoids setting the association in an inconsistent state, which could result in a use-after-free situation. This can be triggered by a malicious peer, if the peer can modify the cookie without the local endpoint recognizing it. Thanks to Ned Williamson for reporting the issue. Approved by: re (gjb) Notes: svn path=/releng/12.2/; revision=366335
* MFS 366297: Revert most of r360179.John Baldwin2020-10-011-24/+1
| | | | | | | | | | | | I had failed to notice that sgsendccb() was using cam_periph_mapmem() and thus was not passing down user pointers directly to drivers. In practice this broke requests submitted from userland. PR: 249395 Approved by: re (gjb) Notes: svn path=/releng/12.2/; revision=366332
* MFS r365996:Mitchell Horne2020-09-301-28/+57
| | | | | | | | | | | | | MFC r365304: arm64: update the set of HWCAP definitions MFC r365459: arm64: fix incorrect HWCAP definitions Approved by: re (gjb) Notes: svn path=/releng/12.2/; revision=366301
* MFC r357530/MFS r357530:Konstantin Belousov2020-09-301-5/+1
| | | | | | | | | Remove unneeded assert for curproc. Simplify. Approved by: re (gjb) Notes: svn path=/releng/12.2/; revision=366292
* MFS: r366238Rick Macklem2020-09-291-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bjorn reported a problem where the Linux NFSv4.1 client is using an open_to_lock_owner4 when that lock_owner4 has already been created by a previous open_to_lock_owner4. This caused the NFS server to reply NFSERR_INVAL. For NFSv4.0, this is an error, although the updated NFSv4.0 RFC7530 notes that the correct error reply is NFSERR_BADSEQID (RFC3530 did not specify what error to return). For NFSv4.1, it is not obvious whether or not this is allowed by RFC5661, but the NFSv4.1 server can handle this case without error. This patch changes the NFSv4.1 (and NFSv4.2) server to handle multiple uses of the same lock_owner in open_to_lock_owner so that it now correctly interoperates with the Linux NFS client. It also changes the error returned for NFSv4.0 to be NFSERR_BADSEQID. Thanks go to Bjorn for diagnosing this and testing the patch. He also provided a program that I could use to reproduce the problem. PR: 249567 Approved by: re (gjb) Notes: svn path=/releng/12.2/; revision=366256
* MFS r366220:Mark Johnston2020-09-281-5/+7
| | | | | | | | | | | MFC r366167: ng_l2tp: Fix callout synchronization in the rexmit timeout handler PR: 241133 Approved by: re (gjb) Notes: svn path=/releng/12.2/; revision=366223
* MFS r366179: Make nvmecontrol work with nda like it does with nvd, andColin Percival2020-09-283-3/+97
| | | | | | | | | | associated bits. Approved by: re (delphij) Sponsored by: https://www.patreon.com/cperciva Notes: svn path=/releng/12.2/; revision=366213
* MF stable/12 r366190:Alan Somers2020-09-281-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | fusefs: fix mmap'd writes in direct_io mode If a FUSE server returns FOPEN_DIRECT_IO in response to FUSE_OPEN, that instructs the kernel to bypass the page cache for that file. This feature is also known by libfuse's name: "direct_io". However, when accessing a file via mmap, there is no possible way to bypass the cache completely. This change fixes a deadlock that would happen when an mmap'd write tried to invalidate a portion of the cache, wrongly assuming that a write couldn't possibly come from cache if direct_io were set. Arguably, we could instead disable mmap for files with FOPEN_DIRECT_IO set. But allowing it is less likely to cause user complaints, and is more in keeping with the spirit of open(2), where O_DIRECT instructs the kernel to "reduce", not "eliminate" cache effects. PR: 247276 Approved by: re (gjb) Reported by: trapexit@spawn.link Reviewed by: cem Differential Revision: https://reviews.freebsd.org/D26485 Notes: svn path=/releng/12.2/; revision=366211
* MFS r366154:Mark Johnston2020-09-251-16/+30
| | | | | | | | | | | MFC r366005: udf: Validate the full file entry length PR: 248613 Approved by: re (gjb) Notes: svn path=/releng/12.2/; revision=366160
* Update releng/12.2 to BETA3 as part of the 12.2-RELEASE cycle.Glen Barber2020-09-251-1/+1
| | | | | | | | Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com) Notes: svn path=/releng/12.2/; revision=366133
* MFS: r366050, r366117Rick Macklem2020-09-241-4/+6
| | | | | | | | | | | | | | | | | | | | | | | Fix a LOR between the NFS server and server side krpc. Recent testing of the NFS-over-TLS code found a LOR between the mutex lock used for sessions and the sleep lock used for server side krpc socket structures. The code in nfsrv_checksequence() and nfsrv_bindconnsess() would call SVC_RELEASE() with mutex(es) held. Normally this is ok, since all that happens is SVC_RELEASE() decrements the reference count. However, if the socket has just been shut down, SVC_RELEASE() drops the reference count to 0 and acquires a sleep lock during destruction of the server side krpc structure. This patch fixes the problem by moving the SVC_RELEASE() call in nfsrv_checksequence() and nfsrv_bindconnsess() down a few lines to below where the mutex(es) are released. Approved by: re (gjb) Notes: svn path=/releng/12.2/; revision=366120
* MFS: r365703Rick Macklem2020-09-241-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a case where the NFSv4.0 server might crash if delegations are enabled. asomers@ reported a crash on an NFSv4.0 server with a backtrace of: kdb_backtrace vpanic panic nfsrv_docallback nfsrv_checkgetattr nfsrvd_getattr nfsrvd_dorpc nfssvc_program svc_run_internal svc_thread_start fork_exit fork_trampoline where the panic message was "docallb", which indicates that a callback was attempted when the ClientID is unconfirmed. This would not normally occur, but it is possible to have an unconfirmed ClientID structure with delegation structure(s) chained off it if the client were to issue a SetClientID with the same "id" but different "verifier" after acquiring delegations on the previously confirmed ClientID. The bug appears to be that nfsrv_checkgetattr() failed to check for this uncommon case of an unconfirmed ClientID with a delegation structure that no longer refers to a delegation the client knows about. This patch adds a check for this case, handling it as if no delegation exists, which is the case when the above occurs. Although difficult to reproduce, this change should avoid the panic(). PR: 249127 Approved by: re (gjb) Notes: svn path=/releng/12.2/; revision=366116
* MFS r365983Eric Joyner2020-09-232-1/+6
| | | | | | | | | | | | Contains fixes for issues in em(4)/igb(4): - Fix define and includes with RSS option enabled - Properly retain promisc flag in init PR: 249191, 248869 Approved by: re (gjb@) Notes: svn path=/releng/12.2/; revision=366097
* MFS r365979:Mark Johnston2020-09-221-4/+4
| | | | | | | | | Mark sysctls added in r365689 as MPSAFE. Approved by: re (gjb) Notes: svn path=/releng/12.2/; revision=365985
* MFS r365937, which merged r365861 and r365872 from head to stable/12.Navdeep Parhar2020-09-2113-24/+72
| | | | | | | | | | | | | | r365861: cxgbe(4): Update T4/5/6 firmwares to 1.25.0.0. r365872: cxgbe(4): add the firmware binaries instead of the empty files that were added in r365861. Approved by: re@ (gjb@) Notes: svn path=/releng/12.2/; revision=365961
* MFS r365667,r365920: extend kern.geom.part.check_integrity to work on GPTEugene Grosbein2020-09-212-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are multiple USB/SATA bridges on the market that unconditionally cut some LBAs off connected media. This could be a problem for pre-partitioned drives so GEOM complains and does not create devices in /dev for slices/partitions preventing access to existing data. We have a knob kern.geom.part.check_integrity that allows us to correct partitioning if changed from default 1 to 0 but it works for MBR only. If backup copy of GPT is unavailable due to decreased number of LBAs, the kernel does not give access to partitions still and prints to dmesg: GEOM: md0: corrupt or invalid GPT detected. GEOM: md0: GPT rejected -- may not be recoverable. This change makes it work for GPT too, so it created partitions in /dev and prints to dmesg this instead: GEOM: md0: the secondary GPT table is corrupt or invalid. GEOM: md0: using the primary only -- recovery suggested. Then "gpart recover" re-creates backup copy of GPT and allows further manipulations with partitions. This change is no-op for default configuration having kern.geom.part.check_integrity=1 Reported by: Alex Korchmar Approved by: re (gjb) Notes: svn path=/releng/12.2/; revision=365944
* MFS r365928:Mark Johnston2020-09-211-2/+7
| | | | | | | | | | MFC r365841: Increase the default vm.max_user_wired value. Approved by: re (gjb) Notes: svn path=/releng/12.2/; revision=365933
* MFS r365689,r365808,r365860Allan Jude2020-09-1914-12/+392
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MFOpenZFS: Introduce read/write kstats per dataset The following patch introduces a few statistics on reads and writes grouped by dataset. These statistics are implemented as kstats (backed by aggregate sums for performance) and can be retrieved by using the dataset objset ID number. The motivation for this change is to provide some preliminary analytics on dataset usage/performance. Reviewed-by: Richard Elling <Richard.Elling@RichardElling.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed by: Matthew Ahrens <mahrens@delphix.com> Signed-off-by: Serapheim Dimitropoulos <serapheim@delphix.com> openzfs/zfs@a448a2557ec4938ed6944c7766fe0b8e6e5f6456 Also contains parts of: MFOpenZFS: Connect dataset_kstats for FreeBSD Example output: kstat.zfs.mypool.dataset.objset-0x10b.nread: 150528 kstat.zfs.mypool.dataset.objset-0x10b.reads: 48 kstat.zfs.mypool.dataset.objset-0x10b.nwritten: 134217728 kstat.zfs.mypool.dataset.objset-0x10b.writes: 1024 kstat.zfs.mypool.dataset.objset-0x10b.dataset_name: mypool/datasetname Reviewed-by: Ryan Moeller <ryan@iXsystems.com> Reviewed by: Sean Eric Fagan <sef@ixsystems.com> Reviewed-by: Serapheim Dimitropoulos <serapheim@delphix.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Allan Jude <allan@klarasystems.com> openzfs/zfs@4547fc4e071ceb1818b3a46c3035b923e06e5390 Approved by: re (gjb) Relnotes: yes Sponsored by: Klara Inc. Notes: svn path=/releng/12.2/; revision=365917
* Rename releng/12.2 to BETA2 as part of the 12.2-RELEASE cycle.Glen Barber2020-09-181-1/+1
| | | | | | | | Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com) Notes: svn path=/releng/12.2/; revision=365865
* MFS12 r365838:Glen Barber2020-09-171-1/+4
| | | | | | | | | | | | | | | | | | MFC r365646, r365720: r365646: Enclose BRANCH_OVERRIDE in quotes in order to fix an issue with freebsd-update(8) builds, where BRANCH is suffixed with -p0 for builds. r365720 (gordon): Partially revert r346018 and use the if/then construct instead of shell. Approved by: re (kib) Sponsored by: Rubicon Communications, LLC (netgate.com) Notes: svn path=/releng/12.2/; revision=365839
* Add UPDATING entries and bump version.Gordon Tetlow2020-09-151-1/+1
| | | | | | | | Approved by: so Approved by: re (implicit for releng/12.2) Notes: svn path=/releng/12.2/; revision=365782
* Fix bhyve SVM guest escape.Gordon Tetlow2020-09-151-2/+11
| | | | | | | | | | | | | This actually has a patch to sys/amd64/vmm/amd/svm.c that was accidentally committed as part of r365779. Approved by: so Approved by: re (implicit for releng/12.2) Security: FreeBSD-SA-20:29.bhyve_svm Security: CVE-2020-7467 Notes: svn path=/releng/12.2/; revision=365780
* Fix bhyve privilege escalation via VMCS access.Gordon Tetlow2020-09-152-37/+73
| | | | | | | | | | Approved by: so Approved by: re (implicit for releng/12.2) Security: FreeBSD-SA-20:28.bhyve_vmcs Security: CVE-2020-24718 Notes: svn path=/releng/12.2/; revision=365779
* Fix ure device driver susceptible to packet-in-packet attack.Gordon Tetlow2020-09-151-3/+4
| | | | | | | | | | Approved by: so Approved by: re (implicit for releng/12.2) Security: FreeBSD-SA-20:27.ure Security: CVE-2020-7464 Notes: svn path=/releng/12.2/; revision=365778
* MFC r365606 and MF12 r365744:Li-Wen Hsu2020-09-151-0/+3
| | | | | | | | | | | | | urndis(4): Add support of Inseego/Novatel Wireless MiFi 8800/8000 PR: 245152 Submitted by: rootless@gmail.com Reviewed by: hselasky Approved by: re (gjb) Notes: svn path=/releng/12.2/; revision=365748
* MFS r365647: ixl powerpc64 fixesEric Joyner2020-09-142-13/+15
| | | | | | | | PR: 249254 Approved by: re (gjb@) Notes: svn path=/releng/12.2/; revision=365736
* ice(4): Add Intel 100GbE Ethernet Driver to kernelEric Joyner2020-09-1459-0/+64819
| | | | | | | | | | | | | | This also adds the "package" file that's loaded by the device for configuration, used in the included ice_ddp kernel module. MFS of r365612 and r365731. Approved by: re (gjb@) Relnotes: yes Sponsored by: Intel Corporation Notes: svn path=/releng/12.2/; revision=365733
* MFS r365718:Mark Johnston2020-09-141-4/+19
| | | | | | | | | | MFC r365437: vm_object_split(): Handle orig_object type changes. Approved by: re (gjb) Notes: svn path=/releng/12.2/; revision=365728
* MFC r360229, r363255Allan Jude2020-09-132-31/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MFS r365614 r360229: Add VIRTIO_BLK_T_DISCARD (TRIM) support to the bhyve virtio-blk backend This will advertise support for TRIM to the guest virtio-blk driver and perform the DIOCGDELETE ioctl on the backing storage if it supports it. Thanks to Jason King and others at Joyent and illumos for expanding on my original patch, adding improvements including better error handling and making sure to following the virtio spec. r363255: Add VIRTIO_BLK_T_DISCARD support to the virtio-blk driver If the hypervisor advertises support for the DISCARD command then the guest can perform TRIM commands, freeing space on the backing store. If VIRTIO_BLK_F_DISCARD is enabled, advertise DISKFLAG_CANDELETE Tested with FreeBSD guests on bhyve and KVM Approved by: re (gjb) Relnotes: yes Sponsored by: Klara Inc. Notes: svn path=/releng/12.2/; revision=365702
* MFS r365608:Bjoern A. Zeeb2020-09-12308-1682/+3472
| | | | | | | | | | | | | | | | | | | | | | | | | Merge WiFi net80211, drivers, and management in order to support better 11n and upcoming 11ac. This includes an ath(4) update, some run(4) 11n support, 11n for otus(4), A-MPDU, A-MSDU, A-MPDU+A-MSDU and Fast frames options, scanning fixes, enhanced PRIV checks for jails, restored parent device name printing, improvements for upcoming VHT support, lots of under-the-hood infrastructure improvements, new device ID, debug tools updates, some whitespace changes (to make future MFCs easier). This does not include (most) epoch(9) related changes as too much other infrastructure was not merged for that. Tested on: some ath(4) AP, run(4) STA, and rtwn(4) STA Discussed with: adrian (extremely briefly) Sponsored by: Rubicon Communications, LLC (d/b/a "Netgate") [partially] Approved by: re (gjb) Relnotes: yes Notes: svn path=/releng/12.2/; revision=365670
* MFC r365457:Kristof Provost2020-09-122-2/+12
| | | | | | | | | | | | | | | | | | | | | net: mitigate vnet / epair cleanup races There's a race where dying vnets move their interfaces back to their original vnet, and if_epair cleanup (where deleting one interface also deletes the other end of the epair). This is commonly triggered by the pf tests, but also by cleanup of vnet jails. As we've not yet been able to fix the root cause of the issue work around the panic by not dereferencing a NULL softc in epair_qflush() and by not re-attaching DYING interfaces. This isn't a full fix, but makes a very common panic far less likely. PR: 244703, 238870 Approved by: re (gjb) Notes: svn path=/releng/12.2/; revision=365669
* MFC r342852 (by cem): powerpc: Fix regression introduced in r342771Alexander Motin2020-09-117-22/+61
| | | | | | | | | | | | | | | | | | | In r342771, I introduced a regression in Power by abusing the platform smp_topo() method as a shortcut for providing the MI information needed for the stated sysctls. The smp_topo() method was already called later by sched_ule (under the name cpu_topo()), and initializes a static array of scheduler topology information. I had skimmed the smp_topo_foo() functions and assumed they were idempotent; empirically, they are not (or at least, detect re-initialization and panic). Do the cleaner thing I should have done in the first place and add a platform method specifically for core- and thread-count probing. PR: 249250 Approved by: re (gjb) Notes: svn path=/releng/12.2/; revision=365634
* - Copy stable/12@r365545 to releng/12.2 as part of the 12.2-RELEASEGlen Barber2020-09-102-2/+2
| | | | | | | | | | | | | | | cycle. - Update from PRERELEASE to BETA1. - Set the default pkg(7) repository to 'quarterly'. - Bump __FreeBSD_version. - Prune svn:mergeinfo from the new branch. Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com) Notes: svn path=/releng/12.2/; revision=365618
* MFC r365284:Brooks Davis2020-09-091-1/+2
| | | | | | | | | | | | | | | | | Always report ENOSYS in init While rare, encountering an unimplemented system call early in init is catastrophic and difficult to debug. Even after a SIGSYS handler is registered, such configurations are problematic. As such, always report such events for pid 1 (following kern.lognosys if non-zero). Reviewed by: kevans, imp Obtained from: CheriBSD (plus suggestions from kevans) Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D26288 Notes: svn path=/stable/12/; revision=365545
* MFC r365015:Warner Losh2020-09-096-3/+9
| | | | | | | | | | | | | | | | | | | r365015 | imp | 2020-08-31 17:31:16 -0600 (Mon, 31 Aug 2020) | 12 lines Warn for the non pccard attachments These devices have non-pccard attachments. Warn for those as well. Both an and wi don't do the modern cyrpto needed to use these cards on secure wifi networks. an needs firmware from Cisco, which I don't think was ever produced. wi could in theory do it with raw frames and on-host encryption, but nobody has written that in the 15 years since WEP was cracked. MFC After: 3 days Noticed by: rgrimes Differential Revision: https://reviews.freebsd.org/D26138 Notes: svn path=/stable/12/; revision=365543
* MFC: r365009Warner Losh2020-09-091-0/+2
| | | | | | | | | | | | | | | | | r365009 | imp | 2020-08-31 15:04:00 -0600 (Mon, 31 Aug 2020) | 10 lines Add deprecation notice for apm BIOS Add deprecation notice for apm bios, aka the apm(4) device. The apm(8) command will remain, at least for a while, since ACPI emulates the apm ioctl interface. Discussed on: arch@ Relnotes: yes MFC After: 3 days Notes: svn path=/stable/12/; revision=365542
* MFC r364725, r364726Warner Losh2020-09-091-2/+4
| | | | | | | | | | | | | | | | | | | | r364725 | imp | 2020-08-24 13:35:15 -0600 (Mon, 24 Aug 2020) | 9 lines Change the resume notification event from 'kern' to 'kernel' We have both a system of 'kern' and of 'kernel'. Prefer the latter and convert this notification to use 'kernel' instead of 'kern'. As a transition period, continue to also generate the 'kern' notification until sometime after FreeBSD 13 is branched. r364726 | imp | 2020-08-24 13:35:27 -0600 (Mon, 24 Aug 2020) | 4 lines Document the kern -> kernel name change for resume events. Relnotes: YES Notes: svn path=/stable/12/; revision=365540