4.9.186-stable review
Subsystems (2)
Greg Kroah-Hartman
maintainercover 4.9.186-stable review
This is the start of the stable review cycle for the 4.9.186 release. There are 54 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat 20 Jul 2019 02:59:27 AM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.186-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.9.186-rc1
Julian Wiedmann <[email protected]>
s390/qdio: don't touch the dsci in tiqdio_add_input_queues()
Julian Wiedmann <[email protected]>
s390/qdio: (re-)initialize tiqdio list entries
Heiko Carstens <[email protected]>
s390: fix stfle zero padding
Arnd Bergmann <[email protected]>
ARC: hide unused function unw_hdr_alloc
Milan Broz <[email protected]>
dm verity: use message limit for data block corruption message
Sébastien Szymanski <[email protected]>
ARM: dts: imx6ul: fix PWM[1-4] interrupts
Sergej Benilov <[email protected]>
sis900: fix TX completion
Takashi Iwai <[email protected]>
ppp: mppe: Add softdep to arc4
Petr Oros <[email protected]>
be2net: fix link failure after ethtool offline test
Arnd Bergmann <[email protected]>
ARM: omap2: remove incorrect __init annotation
Peter Zijlstra <[email protected]>
perf/core: Fix perf_sample_regs_user() mm check
Mark Rutland <[email protected]>
arm64: crypto: remove accidentally backported files
Masahiro Yamada <[email protected]>
nilfs2: do not use unexported cpu_to_le32()/le32_to_cpu() in uapi header
Konstantin Khlebnikov <[email protected]>
e1000e: start network tx queue only when link is up
Konstantin Khlebnikov <[email protected]>
Revert "e1000e: fix cyclic resets at link up with active tx"
Sean Young <[email protected]>
MIPS: Remove superfluous check for __linux__
Vishnu DASA <[email protected]>
VMCI: Fix integer overflow in VMCI handle arrays
Christian Lamparter <[email protected]>
carl9170: fix misuse of device driver API
Ian Abbott <[email protected]>
staging: comedi: amplc_pci230: fix null pointer deref on interrupt
Ian Abbott <[email protected]>
staging: comedi: dt282x: fix a null pointer deref on interrupt
Yoshihiro Shimoda <[email protected]>
usb: renesas_usbhs: add a workaround for a race condition of workqueue
Kiruthika Varadarajan <[email protected]>
usb: gadget: ether: Fix race between gether_disconnect and rx_submit
Alan Stern <[email protected]>
p54usb: Fix race between disconnect and firmware loading
Oliver Barta <[email protected]>
Revert "serial: 8250: Don't service RX FIFO if interrupts are disabled"
Jörgen Storvist <[email protected]>
USB: serial: option: add support for GosunCn ME3630 RNDIS mode
Andreas Fritiofson <[email protected]>
USB: serial: ftdi_sio: add ID for isodebug v1
Brian Norris <[email protected]>
mwifiex: Don't abort on small, spec-compliant vendor IEs
Hongjie Fang <[email protected]>
fscrypt: don't set policy for a dead directory
Takashi Iwai <[email protected]>
mwifiex: Fix heap overflow in mwifiex_uap_parse_tail_ies()
Takashi Iwai <[email protected]>
mwifiex: Abort at too short BSS descriptor element
Dianzhang Chen <[email protected]>
x86/tls: Fix possible spectre-v1 in do_get_thread_area()
Dianzhang Chen <[email protected]>
x86/ptrace: Fix possible spectre-v1 in ptrace_get_debugreg()
Steven J. Magnani <[email protected]>
udf: Fix incorrect final NOT_ALLOCATED (hole) extent length
Lin Yi <[email protected]>
net :sunrpc :clnt :Fix xps refcount imbalance on the error path
Xin Long <[email protected]>
ip6_tunnel: allow not to count pkts on tstats by passing dev as NULL
Mauro S. M. Rodrigues <[email protected]>
bnx2x: Check if transceiver implements DDM before access
Mariusz Tkaczyk <[email protected]>
md: fix for divide error in status_resync
Yibo Zhao <[email protected]>
mac80211: only warn once on chanctx_conf being NULL
Bartosz Golaszewski <[email protected]>
ARM: davinci: da8xx: specify dma_coherent_mask for lcdc
Bartosz Golaszewski <[email protected]>
ARM: davinci: da850-evm: call regulator_has_full_constraints()
Ido Schimmel <[email protected]>
mlxsw: spectrum: Disallow prio-tagged packets when PVID is removed
Dave Martin <[email protected]>
KVM: arm/arm64: vgic: Fix kvm_device leak in vgic_its_destroy
Anson Huang <[email protected]>
Input: imx_keypad - make sure keyboard can always wake up system
Sean Nyekjaer <[email protected]>
can: mcp251x: add support for mcp25625
Sean Nyekjaer <[email protected]>
dt-bindings: can: mcp251x: add mcp25625 support
Guillaume Nault <[email protected]>
netfilter: ipv6: nf_defrag: accept duplicate fragments again
Guillaume Nault <[email protected]>
netfilter: ipv6: nf_defrag: fix leakage of unqueued fragments
Takashi Iwai <[email protected]>
mwifiex: Fix possible buffer overflows at parsing bss descriptor
Pradeep Kumar Chitrapu <[email protected]>
mac80211: free peer keys before vif down in mesh
Thomas Pedersen <[email protected]>
mac80211: mesh: fix RCU warning
Melissa Wen <[email protected]>
staging:iio:ad7150: fix threshold mode config bit
Chang-Hsien Tsai <[email protected]>
samples, bpf: fix to change the buffer size for read()
Aaron Ma <[email protected]>
Input: elantech - enable middle button support on 2 ThinkPads
Christophe Leroy <[email protected]>
crypto: talitos - rename alternative AEAD algos.
-------------
Diffstat:
.../bindings/net/can/microchip,mcp251x.txt | 1 + Makefile | 4 +- arch/arc/kernel/unwind.c | 9 +- arch/arm/boot/dts/imx6ul.dtsi | 8 +- arch/arm/mach-davinci/board-da850-evm.c | 2 + arch/arm/mach-davinci/devices-da8xx.c | 3 + arch/arm/mach-omap2/prm3xxx.c | 2 +- arch/arm64/crypto/sha256-core.S | 2061 -------------------- arch/arm64/crypto/sha512-core.S | 1085 ----------- arch/mips/include/uapi/asm/sgidefs.h | 8 - arch/s390/include/asm/facility.h | 21 +- arch/x86/kernel/ptrace.c | 5 +- arch/x86/kernel/tls.c | 9 +- drivers/crypto/talitos.c | 16 +- drivers/input/keyboard/imx_keypad.c | 18 +- drivers/input/mouse/elantech.c | 2 + drivers/md/dm-verity-target.c | 4 +- drivers/md/md.c | 36 +- drivers/misc/vmw_vmci/vmci_context.c | 80 +- drivers/misc/vmw_vmci/vmci_handle_array.c | 38 +- drivers/misc/vmw_vmci/vmci_handle_array.h | 29 +- drivers/net/can/spi/Kconfig | 5 +- drivers/net/can/spi/mcp251x.c | 25 +- .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 3 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 1 + drivers/net/ethernet/emulex/benet/be_ethtool.c | 28 +- drivers/net/ethernet/intel/e1000e/netdev.c | 21 +- drivers/net/ethernet/mellanox/mlxsw/reg.h | 2 +- drivers/net/ethernet/sis/sis900.c | 16 +- drivers/net/ppp/ppp_mppe.c | 1 + drivers/net/wireless/ath/carl9170/usb.c | 39 +- drivers/net/wireless/intersil/p54/p54usb.c | 43 +- drivers/net/wireless/marvell/mwifiex/fw.h | 12 +- drivers/net/wireless/marvell/mwifiex/ie.c | 45 +- drivers/net/wireless/marvell/mwifiex/scan.c | 31 +- drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 4 +- drivers/net/wireless/marvell/mwifiex/wmm.c | 2 +- drivers/s390/cio/qdio_setup.c | 2 + drivers/s390/cio/qdio_thinint.c | 5 +- drivers/staging/comedi/drivers/amplc_pci230.c | 3 +- drivers/staging/comedi/drivers/dt282x.c | 3 +- drivers/staging/iio/cdc/ad7150.c | 19 +- drivers/tty/serial/8250/8250_port.c | 3 +- drivers/usb/gadget/function/u_ether.c | 6 +- drivers/usb/renesas_usbhs/fifo.c | 34 +- drivers/usb/serial/ftdi_sio.c | 1 + drivers/usb/serial/ftdi_sio_ids.h | 6 + drivers/usb/serial/option.c | 1 + fs/crypto/policy.c | 2 + fs/udf/inode.c | 93 +- include/linux/vmw_vmci_defs.h | 11 +- include/net/ip6_tunnel.h | 9 +- include/uapi/linux/nilfs2_ondisk.h | 24 +- kernel/events/core.c | 2 +- net/ipv6/netfilter/nf_conntrack_reasm.c | 22 +- net/mac80211/ieee80211_i.h | 2 +- net/mac80211/mesh.c | 6 +- net/sunrpc/clnt.c | 1 + samples/bpf/bpf_load.c | 2 +- virt/kvm/arm/vgic/vgic-its.c | 1 + 60 files changed, 516 insertions(+), 3461 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/54 crypto: talitos - rename alternative AEAD algos.
From: Christophe Leroy <[email protected]>
commit a1a42f84011fae6ff08441a91aefeb7febc984fc upstream.
The talitos driver has two ways to perform AEAD depending on the HW capability. Some HW support both. It is needed to give them different names to distingish which one it is for instance when a test fails.
--- drivers/crypto/talitos.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/crypto/talitos.c +8 -8
@@ -2185,7 +2185,7 @@ static struct talitos_alg_template drive .base = { .cra_name = "authenc(hmac(sha1),cbc(aes))", .cra_driver_name ="authenc-hmac-sha1-" - "cbc-aes-talitos", + "cbc-aes-talitos-hsna", .cra_blocksize = AES_BLOCK_SIZE, .cra_flags = CRYPTO_ALG_ASYNC, },
@@ -2229,7 +2229,7 @@ static struct talitos_alg_template drive .cra_name = "authenc(hmac(sha1)," "cbc(des3_ede))", .cra_driver_name ="authenc-hmac-sha1-" - "cbc-3des-talitos", + "cbc-3des-talitos-hsna", .cra_blocksize = DES3_EDE_BLOCK_SIZE, .cra_flags = CRYPTO_ALG_ASYNC, },
@@ -2271,7 +2271,7 @@ static struct talitos_alg_template drive .base = { .cra_name = "authenc(hmac(sha224),cbc(aes))", .cra_driver_name ="authenc-hmac-sha224-" - "cbc-aes-talitos", + "cbc-aes-talitos-hsna", .cra_blocksize = AES_BLOCK_SIZE, .cra_flags = CRYPTO_ALG_ASYNC, },
@@ -2315,7 +2315,7 @@ static struct talitos_alg_template drive .cra_name = "authenc(hmac(sha224)," "cbc(des3_ede))", .cra_driver_name ="authenc-hmac-sha224-" - "cbc-3des-talitos", + "cbc-3des-talitos-hsna", .cra_blocksize = DES3_EDE_BLOCK_SIZE, .cra_flags = CRYPTO_ALG_ASYNC, },
@@ -2357,7 +2357,7 @@ static struct talitos_alg_template drive .base = { .cra_name = "authenc(hmac(sha256),cbc(aes))", .cra_driver_name ="authenc-hmac-sha256-" - "cbc-aes-talitos", + "cbc-aes-talitos-hsna", .cra_blocksize = AES_BLOCK_SIZE, .cra_flags = CRYPTO_ALG_ASYNC, },
@@ -2401,7 +2401,7 @@ static struct talitos_alg_template drive .cra_name = "authenc(hmac(sha256)," "cbc(des3_ede))", .cra_driver_name ="authenc-hmac-sha256-" - "cbc-3des-talitos", + "cbc-3des-talitos-hsna", .cra_blocksize = DES3_EDE_BLOCK_SIZE, .cra_flags = CRYPTO_ALG_ASYNC, },
@@ -2527,7 +2527,7 @@ static struct talitos_alg_template drive .base = { .cra_name = "authenc(hmac(md5),cbc(aes))", .cra_driver_name ="authenc-hmac-md5-" - "cbc-aes-talitos", + "cbc-aes-talitos-hsna", .cra_blocksize = AES_BLOCK_SIZE, .cra_flags = CRYPTO_ALG_ASYNC, },
@@ -2569,7 +2569,7 @@ static struct talitos_alg_template drive .base = { .cra_name = "authenc(hmac(md5),cbc(des3_ede))", .cra_driver_name ="authenc-hmac-md5-" - "cbc-3des-talitos", + "cbc-3des-talitos-hsna", .cra_blocksize = DES3_EDE_BLOCK_SIZE, .cra_flags = CRYPTO_ALG_ASYNC, },
Greg Kroah-Hartman
maintainerPATCH 2/54 Input: elantech - enable middle button support on 2 ThinkPads
In reply to Greg Kroah-Hartman[ Upstream commit aa440de3058a3ef530851f9ef373fbb5f694dbc3 ]
Adding 2 new touchpad PNPIDs to enable middle button support.
--- drivers/input/mouse/elantech.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/input/mouse/elantech.c +2 -0
@@ -1187,6 +1187,8 @@ static const char * const middle_button_pnp_ids[] = {"LEN2132" ,/* ThinkPad P52 */ "LEN2133" ,/* ThinkPad P72 w/ NFC */ "LEN2134" ,/* ThinkPad P72 */ +"LEN0407" , +"LEN0408" , NULL };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 3/54 samples, bpf: fix to change the buffer size for read()
In reply to Greg Kroah-Hartman[ Upstream commit f7c2d64bac1be2ff32f8e4f500c6e5429c1003e0 ]
If the trace for read is larger than 4096, the return value sz will be 4096. This results in off-by-one error on buf:
static char buf[4096];
ssize_t sz;
sz = read(trace_fd, buf, sizeof(buf));
if (sz > 0) {
buf[sz] = 0;
puts(buf);
}--- samples/bpf/bpf_load.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
samples/bpf/bpf_load.c +1 -1
@@ -369,7 +369,7 @@ void read_trace_pipe(void)static char buf[4096 ];ssize_t sz; - sz =read (trace_fd, buf,sizeof (buf)); + sz =read (trace_fd, buf,sizeof (buf) -1 );if (sz >0 ) { buf[sz] =0 ;puts (buf);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 4/54 staging:iio:ad7150: fix threshold mode config bit
In reply to Greg Kroah-Hartman[ Upstream commit df4d737ee4d7205aaa6275158aeebff87fd14488 ]
According to the AD7150 configuration register description, bit 7 assumes value 1 when the threshold mode is fixed and 0 when it is adaptive, however, the operation that identifies this mode was considering the opposite values.
This patch renames the boolean variable to describe it correctly and properly replaces it in the places where it is used.
--- drivers/staging/iio/cdc/ad7150.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
drivers/staging/iio/cdc/ad7150.c +11 -8
@@ -6,6 +6,7 @@* Licensed under the GPL-2 or later. */ +#include <linux/bitfield.h> #include <linux/interrupt.h> #include <linux/device.h> #include <linux/kernel.h>
@@ -129,7 +130,7 @@ static int ad7150_read_event_config(struct iio_dev *indio_dev, {int ret;u8 threshtype; -bool adaptive; +bool thrfixed;struct ad7150_chip_info *chip =iio_priv (indio_dev); ret =i2c_smbus_read_byte_data (chip->client,AD7150_CFG );
@@ -137,21 +138,23 @@ static int ad7150_read_event_config(struct iio_dev *indio_dev,return ret; threshtype = (ret >>5 ) &0x03 ; - adaptive = !!(ret &0x80 ); + +/*check if threshold mode is fixed or adaptive*/ + thrfixed =FIELD_GET (AD7150_CFG_FIX , ret);switch (type) {case IIO_EV_TYPE_MAG_ADAPTIVE :if (dir ==IIO_EV_DIR_RISING ) -return adaptive && (threshtype ==0x1 ); -return adaptive && (threshtype ==0x0 ); +return !thrfixed && (threshtype ==0x1 ); +return !thrfixed && (threshtype ==0x0 );case IIO_EV_TYPE_THRESH_ADAPTIVE :if (dir ==IIO_EV_DIR_RISING ) -return adaptive && (threshtype ==0x3 ); -return adaptive && (threshtype ==0x2 ); +return !thrfixed && (threshtype ==0x3 ); +return !thrfixed && (threshtype ==0x2 );case IIO_EV_TYPE_THRESH :if (dir ==IIO_EV_DIR_RISING ) -return !adaptive && (threshtype ==0x1 ); -return !adaptive && (threshtype ==0x0 ); +return thrfixed && (threshtype ==0x1 ); +return thrfixed && (threshtype ==0x0 );default :break ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 5/54 mac80211: mesh: fix RCU warning
In reply to Greg Kroah-Hartman[ Upstream commit 551842446ed695641a00782cd118cbb064a416a1 ]
ifmsh->csa is an RCU-protected pointer. The writer context in ieee80211_mesh_finish_csa() is already mutually exclusive with wdev->sdata.mtx, but the RCU checker did not know this. Use rcu_dereference_protected() to avoid a warning.
fixes the following warning:
[ 12.519089] =============================
[ 12.520042] WARNING: suspicious RCU usage
[ 12.520652] 5.1.0-rc7-wt+ #16 Tainted: G W
[ 12.521409] -----------------------------
[ 12.521972] net/mac80211/mesh.c:1223 suspicious rcu_dereference_check() usage!
[ 12.522928] other info that might help us debug this:
[ 12.523984] rcu_scheduler_active = 2, debug_locks = 1
[ 12.524855] 5 locks held by kworker/u8:2/152:
[ 12.525438] #0: 00000000057be08c ((wq_completion)phy0){+.+.}, at: process_one_work+0x1a2/0x620
[ 12.526607] #1: 0000000059c6b07a ((work_completion)(&sdata->csa_finalize_work)){+.+.}, at: process_one_work+0x1a2/0x620
[ 12.528001] #2: 00000000f184ba7d (&wdev->mtx){+.+.}, at: ieee80211_csa_finalize_work+0x2f/0x90
[ 12.529116] #3: 00000000831a1f54 (&local->mtx){+.+.}, at: ieee80211_csa_finalize_work+0x47/0x90
[ 12.530233] #4: 00000000fd06f988 (&local->chanctx_mtx){+.+.}, at: ieee80211_csa_finalize_work+0x51/0x90--- net/mac80211/mesh.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
net/mac80211/mesh.c +4 -1
@@ -1135,7 +1135,8 @@ int ieee80211_mesh_finish_csa(struct ieee80211_sub_if_data *sdata) ifmsh->chsw_ttl =0 ;/* Remove the CSA and MCSP elements from the beacon */ - tmp_csa_settings =rcu_dereference (ifmsh->csa); + tmp_csa_settings =rcu_dereference_protected (ifmsh->csa, +lockdep_is_held (&sdata->wdev.mtx));RCU_INIT_POINTER (ifmsh->csa,NULL );if (tmp_csa_settings)kfree_rcu (tmp_csa_settings, rcu_head);
@@ -1157,6 +1158,8 @@ int ieee80211_mesh_csa_beacon(struct ieee80211_sub_if_data *sdata,struct mesh_csa_settings *tmp_csa_settings;int ret =0 ; +lockdep_assert_held (&sdata->wdev.mtx); + tmp_csa_settings =kmalloc (sizeof (*tmp_csa_settings),GFP_ATOMIC );if (!tmp_csa_settings)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 6/54 mac80211: free peer keys before vif down in mesh
In reply to Greg Kroah-Hartman[ Upstream commit 0112fa557c3bb3a002bc85760dc3761d737264d3 ]
freeing peer keys after vif down is resulting in peer key uninstall to fail due to interface lookup failure. so fix that.
--- net/mac80211/mesh.c | 1 + 1 file changed, 1 insertion(+)
net/mac80211/mesh.c +1 -0
@@ -885,6 +885,7 @@ void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata)/* flush STAs and mpaths on this iface */ sta_info_flush (sdata); +ieee80211_free_keys (sdata, true);mesh_path_flush_by_iface (sdata);/* stop the beacon */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 7/54 mwifiex: Fix possible buffer overflows at parsing bss descriptor
In reply to Greg Kroah-Hartman[ Upstream commit 13ec7f10b87f5fc04c4ccbd491c94c7980236a74 ]
mwifiex_update_bss_desc_with_ie() calls memcpy() unconditionally in a couple places without checking the destination size. Since the source is given from user-space, this may trigger a heap buffer overflow.
Fix it by putting the length check before performing memcpy().
This fix addresses CVE-2019-3846.
--- drivers/net/wireless/marvell/mwifiex/scan.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/marvell/mwifiex/scan.c +4 -0
@@ -1236,6 +1236,8 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter, }switch (element_id) {case WLAN_EID_SSID : +if (element_len >IEEE80211_MAX_SSID_LEN ) +return -EINVAL ; bss_entry->ssid.ssid_len = element_len;memcpy (bss_entry->ssid.ssid, (current_ptr +2 ), element_len);
@@ -1245,6 +1247,8 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,break ;case WLAN_EID_SUPP_RATES : +if (element_len >MWIFIEX_SUPPORTED_RATES ) +return -EINVAL ;memcpy (bss_entry->data_rates, current_ptr +2 , element_len); memcpy(bss_entry->supported_rates, current_ptr + 2,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 8/54 netfilter: ipv6: nf_defrag: fix leakage of unqueued fragments
In reply to Greg Kroah-Hartman[ Upstream commit a0d56cb911ca301de81735f1d73c2aab424654ba ]
With commit 997dd9647164 ("net: IP6 defrag: use rbtrees in nf_conntrack_reasm.c"), nf_ct_frag6_reasm() is now called from nf_ct_frag6_queue(). With this change, nf_ct_frag6_queue() can fail after the skb has been added to the fragment queue and nf_ct_frag6_gather() was adapted to handle this case.
But nf_ct_frag6_queue() can still fail before the fragment has been queued. nf_ct_frag6_gather() can't handle this case anymore, because it has no way to know if nf_ct_frag6_queue() queued the fragment before failing. If it didn't, the skb is lost as the error code is overwritten with -EINPROGRESS.
Fix this by setting -EINPROGRESS directly in nf_ct_frag6_queue(), so that nf_ct_frag6_gather() can propagate the error as is.
--- net/ipv6/netfilter/nf_conntrack_reasm.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
net/ipv6/netfilter/nf_conntrack_reasm.c +5 -7
@@ -292,7 +292,11 @@ static int nf_ct_frag6_queue(struct frag_queue *fq, struct sk_buff *skb, skb->_skb_refdst =0UL ; err =nf_ct_frag6_reasm (fq, skb, prev, dev); skb->_skb_refdst = orefdst; -return err; + +/* After queue has assumed skb ownership, only 0 or +* -EINPROGRESS must be returned. +*/ +return err ? -EINPROGRESS :0 ; }skb_dst_drop (skb);
@@ -480,12 +484,6 @@ int nf_ct_frag6_gather(struct net *net, struct sk_buff *skb, u32 user) ret =0 ; } -/* after queue has assumed skb ownership, only 0 or -EINPROGRESS -* must be returned. -*/ -if (ret) - ret = -EINPROGRESS ; -spin_unlock_bh (&fq->q.lock);inet_frag_put (&fq->q);return ret;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 9/54 netfilter: ipv6: nf_defrag: accept duplicate fragments again
In reply to Greg Kroah-Hartman[ Upstream commit 8a3dca632538c550930ce8bafa8c906b130d35cf ]
When fixing the skb leak introduced by the conversion to rbtree, I forgot about the special case of duplicate fragments. The condition under the 'insert_error' label isn't effective anymore as nf_ct_frg6_gather() doesn't override the returned value anymore. So duplicate fragments now get NF_DROP verdict.
To accept duplicate fragments again, handle them specially as soon as inet_frag_queue_insert() reports them. Return -EINPROGRESS which will translate to NF_STOLEN verdict, like any accepted fragment. However, such packets don't carry any new information and aren't queued, so we just drop them immediately.
--- net/ipv6/netfilter/nf_conntrack_reasm.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
net/ipv6/netfilter/nf_conntrack_reasm.c +7 -3
@@ -264,8 +264,14 @@ static int nf_ct_frag6_queue(struct frag_queue *fq, struct sk_buff *skb, prev = fq->q.fragments_tail; err =inet_frag_queue_insert (&fq->q, skb, offset, end); -if (err) +if (err) { +if (err ==IPFRAG_DUP ) { +/* No error for duplicates, pretend they got queued. */ +kfree_skb (skb); +return -EINPROGRESS ; + } goto insert_error; + }if (dev) fq->iif = dev->ifindex;
@@ -303,8 +309,6 @@ static int nf_ct_frag6_queue(struct frag_queue *fq, struct sk_buff *skb,return -EINPROGRESS ; insert_error: -if (err ==IPFRAG_DUP ) - goto err;inet_frag_kill (&fq->q); err:skb_dst_drop (skb);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 10/54 dt-bindings: can: mcp251x: add mcp25625 support
In reply to Greg Kroah-Hartman[ Upstream commit 0df82dcd55832a99363ab7f9fab954fcacdac3ae ]
Fully compatible with mcp2515, the mcp25625 have integrated transceiver.
This patch add the mcp25625 to the device tree bindings documentation.
--- Documentation/devicetree/bindings/net/can/microchip,mcp251x.txt | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/net/can/microchip,mcp251x.txt +1 -0
@@ -4,6 +4,7 @@ Required properties: - compatible: Should be one of the following: - "microchip,mcp2510" for MCP2510. - "microchip,mcp2515" for MCP2515. + - "microchip,mcp25625" for MCP25625. - reg: SPI chip select. - clocks: The clock feeding the CAN controller. - interrupt-parent: The parent interrupt controller.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 11/54 can: mcp251x: add support for mcp25625
In reply to Greg Kroah-Hartman[ Upstream commit 35b7fa4d07c43ad79b88e6462119e7140eae955c ]
Fully compatible with mcp2515, the mcp25625 have integrated transceiver.
This patch adds support for the mcp25625 to the existing mcp251x driver.
--- drivers/net/can/spi/Kconfig | 5 +++-- drivers/net/can/spi/mcp251x.c | 25 ++++++++++++++++--------- 2 files changed, 19 insertions(+), 11 deletions(-)
drivers/net/can/spi/Kconfig +3 -2
@@ -2,9 +2,10 @@ menu "CAN SPI interfaces" depends on SPI config CAN_MCP251X - tristate "Microchip MCP251x SPI CAN controllers" + tristate "Microchip MCP251x and MCP25625 SPI CAN controllers" depends on HAS_DMA ---help--- - Driver for the Microchip MCP251x SPI CAN controllers. + Driver for the Microchip MCP251x and MCP25625 SPI CAN + controllers. endmenu
drivers/net/can/spi/mcp251x.c +16 -9
@@ -1,5 +1,5 @@/* -* CAN bus driver for Microchip 251x CAN Controller with SPI Interface +* CAN bus driver for Microchip 251x/25625 CAN Controller with SPI Interface * * MCP2510 support and bug fixes by Christian Pellegrin * <[email protected]>
@@ -41,7 +41,7 @@* static struct spi_board_info spi_board_info[] = { * { * .modalias = "mcp2510", -* // or "mcp2515" depending on your controller +* // "mcp2515" or "mcp25625" depending on your controller * .platform_data = &mcp251x_info, * .irq = IRQ_EINT13, * .max_speed_hz = 2*1000*1000,
@@ -238,6 +238,7 @@ static const struct can_bittiming_const mcp251x_bittiming_const = {enum mcp251x_model {CAN_MCP251X_MCP2510 =0x2510 ,CAN_MCP251X_MCP2515 =0x2515 , +CAN_MCP251X_MCP25625 =0x25625 , };struct mcp251x_priv {
@@ -280,7 +281,6 @@ static inline int mcp251x_is_##_model(struct spi_device *spi) \ }MCP251X_IS (2510 ); -MCP251X_IS (2515 );static void mcp251x_clean (struct net_device *net) {
@@ -640,7 +640,7 @@ static int mcp251x_hw_reset(struct spi_device *spi)/* Wait for oscillator startup timer after reset */ mdelay (MCP251X_OST_DELAY_MS ); - + reg =mcp251x_read_reg (spi,CANSTAT );if ((reg &CANCTRL_REQOP_MASK ) !=CANCTRL_REQOP_CONF )return -ENODEV ;
@@ -821,9 +821,8 @@ static irqreturn_t mcp251x_can_ist(int irq, void *dev_id)/* receive buffer 0 */ if (intf &CANINTF_RX0IF ) {mcp251x_hw_rx (spi,0 ); -/* -* Free one buffer ASAP -* (The MCP2515 does this automatically.) +/* Free one buffer ASAP +* (The MCP2515/25625 does this automatically.) */ if (mcp251x_is_2510 (spi))mcp251x_write_bits (spi,CANINTF ,CANINTF_RX0IF ,0x00 );
@@ -832,7 +831,7 @@ static irqreturn_t mcp251x_can_ist(int irq, void *dev_id)/* receive buffer 1 */ if (intf &CANINTF_RX1IF ) {mcp251x_hw_rx (spi,1 ); -/* the MCP2515 does this automatically */ +/* The MCP2515/25625 does this automatically. */ if (mcp251x_is_2510 (spi)) clear_intf |=CANINTF_RX1IF ; }
@@ -1007,6 +1006,10 @@ static const struct of_device_id mcp251x_of_match[] = { .compatible = "microchip,mcp2515", .data = (void *)CAN_MCP251X_MCP2515, }, + { + .compatible = "microchip,mcp25625", + .data = (void *)CAN_MCP251X_MCP25625, + }, { } };MODULE_DEVICE_TABLE (of, mcp251x_of_match);
@@ -1020,6 +1023,10 @@ static const struct spi_device_id mcp251x_id_table[] = { .name = "mcp2515", .driver_data = (kernel_ulong_t)CAN_MCP251X_MCP2515, }, + { + .name = "mcp25625", + .driver_data = (kernel_ulong_t)CAN_MCP251X_MCP25625, + }, { } };MODULE_DEVICE_TABLE (spi, mcp251x_id_table);
@@ -1260,5 +1267,5 @@ module_spi_driver(mcp251x_can_driver);MODULE_AUTHOR ("Chris Elston <[email protected]>, " "Christian Pellegrin <[email protected]>" ); -MODULE_DESCRIPTION ("Microchip 251x CAN driver" ); +MODULE_DESCRIPTION ("Microchip 251x/25625 CAN driver" );MODULE_LICENSE ("GPL v2" );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 12/54 Input: imx_keypad - make sure keyboard can always wake up system
In reply to Greg Kroah-Hartman[ Upstream commit ce9a53eb3dbca89e7ad86673d94ab886e9bea704 ]
There are several scenarios that keyboard can NOT wake up system from suspend, e.g., if a keyboard is depressed between system device suspend phase and device noirq suspend phase, the keyboard ISR will be called and both keyboard depress and release interrupts will be disabled, then keyboard will no longer be able to wake up system. Another scenario would be, if a keyboard is kept depressed, and then system goes into suspend, the expected behavior would be when keyboard is released, system will be waked up, but current implementation can NOT achieve that, because both depress and release interrupts are disabled in ISR, and the event check is still in progress.
To fix these issues, need to make sure keyboard's depress or release interrupt is enabled after noirq device suspend phase, this patch moves the suspend/resume callback to noirq suspend/resume phase, and enable the corresponding interrupt according to current keyboard status.
--- drivers/input/keyboard/imx_keypad.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/input/keyboard/imx_keypad.c +14 -4
@@ -530,11 +530,12 @@ static int imx_keypad_probe(struct platform_device *pdev)return 0 ; } -static int __maybe_unused imx_kbd_suspend (struct device *dev) +static int __maybe_unused imx_kbd_noirq_suspend (struct device *dev) {struct platform_device *pdev =to_platform_device (dev);struct imx_keypad *kbd =platform_get_drvdata (pdev);struct input_dev *input_dev = kbd->input_dev; +unsigned short reg_val =readw (kbd->mmio_base +KPSR );/* imx kbd can wake up system even clock is disabled */ mutex_lock (&input_dev->mutex);
@@ -544,13 +545,20 @@ static int __maybe_unused imx_kbd_suspend(struct device *dev)mutex_unlock (&input_dev->mutex); -if (device_may_wakeup (&pdev->dev)) +if (device_may_wakeup (&pdev->dev)) { +if (reg_val &KBD_STAT_KPKD ) + reg_val |=KBD_STAT_KRIE ; +if (reg_val &KBD_STAT_KPKR ) + reg_val |=KBD_STAT_KDIE ; +writew (reg_val, kbd->mmio_base +KPSR ); +enable_irq_wake (kbd->irq); + }return 0 ; } -static int __maybe_unused imx_kbd_resume (struct device *dev) +static int __maybe_unused imx_kbd_noirq_resume (struct device *dev) {struct platform_device *pdev =to_platform_device (dev);struct imx_keypad *kbd =platform_get_drvdata (pdev);
@@ -574,7 +582,9 @@ static int __maybe_unused imx_kbd_resume(struct device *dev)return ret; } -static SIMPLE_DEV_PM_OPS(imx_kbd_pm_ops, imx_kbd_suspend, imx_kbd_resume); +static const struct dev_pm_ops imx_kbd_pm_ops = { +SET_NOIRQ_SYSTEM_SLEEP_PM_OPS (imx_kbd_noirq_suspend, imx_kbd_noirq_resume) +};static struct platform_driver imx_keypad_driver = { .driver = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 13/54 KVM: arm/arm64: vgic: Fix kvm_device leak in vgic_its_destroy
In reply to Greg Kroah-Hartman[ Upstream commit 4729ec8c1e1145234aeeebad5d96d77f4ccbb00a ]
kvm_device->destroy() seems to be supposed to free its kvm_device struct, but vgic_its_destroy() is not currently doing this, resulting in a memory leak, resulting in kmemleak reports such as the following:
unreferenced object 0xffff800aeddfe280 (size 128):
comm "qemu-system-aar", pid 13799, jiffies 4299827317 (age 1569.844s) [...]
backtrace:
[<00000000a08b80e2>] kmem_cache_alloc+0x178/0x208
[<00000000dcad2bd3>] kvm_vm_ioctl+0x350/0xbc0Fix it.
--- virt/kvm/arm/vgic/vgic-its.c | 1 + 1 file changed, 1 insertion(+)
virt/kvm/arm/vgic/vgic-its.c +1 -0
@@ -1466,6 +1466,7 @@ static void vgic_its_destroy(struct kvm_device *kvm_dev)mutex_unlock (&its->its_lock);kfree (its); +kfree (kvm_dev);/* alloc by kvm_ioctl_create_device, free by .destroy */ } static int vgic_its_has_attr(struct kvm_device *dev,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 14/54 mlxsw: spectrum: Disallow prio-tagged packets when PVID is removed
In reply to Greg Kroah-Hartman[ Upstream commit 4b14cc313f076c37b646cee06a85f0db59cf216c ]
When PVID is removed from a bridge port, the Linux bridge drops both untagged and prio-tagged packets. Align mlxsw with this behavior.
--- drivers/net/ethernet/mellanox/mlxsw/reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlxsw/reg.h +1 -1
@@ -935,7 +935,7 @@ static inline void mlxsw_reg_spaft_pack(char *payload, u8 local_port,MLXSW_REG_ZERO (spaft, payload);mlxsw_reg_spaft_local_port_set (payload, local_port);mlxsw_reg_spaft_allow_untagged_set (payload, allow_untagged); -mlxsw_reg_spaft_allow_prio_tagged_set (payload, true); +mlxsw_reg_spaft_allow_prio_tagged_set (payload, allow_untagged);mlxsw_reg_spaft_allow_tagged_set (payload, true); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 15/54 ARM: davinci: da850-evm: call regulator_has_full_constraints()
In reply to Greg Kroah-Hartman[ Upstream commit 0c0c9b5753cd04601b17de09da1ed2885a3b42fe ]
The BB expander at 0x21 i2c bus 1 fails to probe on da850-evm because the board doesn't set has_full_constraints to true in the regulator API.
Call regulator_has_full_constraints() at the end of board registration just like we do in da850-lcdk and da830-evm.
--- arch/arm/mach-davinci/board-da850-evm.c | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/mach-davinci/board-da850-evm.c +2 -0
@@ -1479,6 +1479,8 @@ static __init void da850_evm_init(void)if (ret)pr_warn ("%s: dsp/rproc registration failed: %d\n" , __func__, ret); + +regulator_has_full_constraints (); }#ifdef CONFIG_SERIAL_8250_CONSOLE
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 16/54 ARM: davinci: da8xx: specify dma_coherent_mask for lcdc
In reply to Greg Kroah-Hartman[ Upstream commit 68f2515bb31a664ba3e2bc1eb78dd9f529b10067 ]
The lcdc device is missing the dma_coherent_mask definition causing the following warning on da850-evm:
da8xx_lcdc da8xx_lcdc.0: found Sharp_LK043T1DG01 panel
------------[ cut here ]------------ WARNING: CPU: 0 PID: 1 at kernel/dma/mapping.c:247 dma_alloc_attrs+0xc8/0x110 Modules linked in: CPU: 0 PID: 1 Comm: swapper Not tainted 5.2.0-rc3-00077-g16d72dd4891f #18 Hardware name: DaVinci DA850/OMAP-L138/AM18x EVM [<c000fce8>] (unwind_backtrace) from [<c000d900>] (show_stack+0x10/0x14) [<c000d900>] (show_stack) from [<c001a4f8>] (__warn+0xec/0x114) [<c001a4f8>] (__warn) from [<c001a634>] (warn_slowpath_null+0x3c/0x48) [<c001a634>] (warn_slowpath_null) from [<c0065860>] (dma_alloc_attrs+0xc8/0x110) [<c0065860>] (dma_alloc_attrs) from [<c02820f8>] (fb_probe+0x228/0x5a8) [<c02820f8>] (fb_probe) from [<c02d3e9c>] (platform_drv_probe+0x48/0x9c) [<c02d3e9c>] (platform_drv_probe) from [<c02d221c>] (really_probe+0x1d8/0x2d4) [<c02d221c>] (really_probe) from [<c02d2474>] (driver_probe_device+0x5c/0x168) [<c02d2474>] (driver_probe_device) from [<c02d2728>] (device_driver_attach+0x58/0x60) [<c02d2728>] (device_driver_attach) from [<c02d27b0>] (__driver_attach+0x80/0xbc) [<c02d27b0>] (__driver_attach) from [<c02d047c>] (bus_for_each_dev+0x64/0xb4) [<c02d047c>] (bus_for_each_dev) from [<c02d1590>] (bus_add_driver+0xe4/0x1d8) [<c02d1590>] (bus_add_driver) from [<c02d301c>] (driver_register+0x78/0x10c) [<c02d301c>] (driver_register) from [<c000a5c0>] (do_one_initcall+0x48/0x1bc) [<c000a5c0>] (do_one_initcall) from [<c05cae6c>] (kernel_init_freeable+0x10c/0x1d8) [<c05cae6c>] (kernel_init_freeable) from [<c048a000>] (kernel_init+0x8/0xf4) [<c048a000>] (kernel_init) from [<c00090e0>] (ret_from_fork+0x14/0x34) Exception stack(0xc6837fb0 to 0xc6837ff8) 7fa0: 00000000 00000000 00000000 00000000 7fc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 7fe0: 00000000 00000000 00000000 00000000 00000013 00000000 ---[ end trace 8a8073511be81dd2 ]---
Add a 32-bit mask to the platform device's definition.
--- arch/arm/mach-davinci/devices-da8xx.c | 3 +++ 1 file changed, 3 insertions(+)
arch/arm/mach-davinci/devices-da8xx.c +3 -0
@@ -706,6 +706,9 @@ static struct platform_device da8xx_lcdc_device = { .id = 0, .num_resources = ARRAY_SIZE(da8xx_lcdc_resources), .resource = da8xx_lcdc_resources, + .dev = { + .coherent_dma_mask = DMA_BIT_MASK(32), + } };int __init da8xx_register_lcdc (struct da8xx_lcdc_platform_data *pdata)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 17/54 mac80211: only warn once on chanctx_conf being NULL
In reply to Greg Kroah-Hartman[ Upstream commit 563572340173865a9a356e6bb02579e6998a876d ]
In multiple SSID cases, it takes time to prepare every AP interface to be ready in initializing phase. If a sta already knows everything it needs to join one of the APs and sends authentication to the AP which is not fully prepared at this point of time, AP's channel context could be NULL. As a result, warning message occurs.
Even worse, if the AP is under attack via tools such as MDK3 and massive authentication requests are received in a very short time, console will be hung due to kernel warning messages.
WARN_ON_ONCE() could be a better way for indicating warning messages without duplicate messages to flood the console.
Johannes: We still need to address the underlying problem, but we
don't really have a good handle on it yet. Suppress the worst side-effects for now.
--- net/mac80211/ieee80211_i.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/ieee80211_i.h +1 -1
@@ -1403,7 +1403,7 @@ ieee80211_get_sband(struct ieee80211_sub_if_data *sdata)rcu_read_lock (); chanctx_conf =rcu_dereference (sdata->vif.chanctx_conf); -if (WARN_ON (!chanctx_conf)) { +if (WARN_ON_ONCE (!chanctx_conf)) {rcu_read_unlock ();return NULL ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 18/54 md: fix for divide error in status_resync
In reply to Greg Kroah-Hartman[ Upstream commit 9642fa73d073527b0cbc337cc17a47d545d82cd2 ]
Stopping external metadata arrays during resync/recovery causes retries, loop of interrupting and starting reconstruction, until it hit at good moment to stop completely. While these retries curr_mark_cnt can be small- especially on HDD drives, so subtraction result can be smaller than 0. However it is casted to uint without checking. As a result of it the status bar in /proc/mdstat while stopping is strange (it jumps between 0% and 99%).
The real problem occurs here after commit 72deb455b5ec ("block: remove CONFIG_LBDAF"). Sector_div() macro has been changed, now the divisor is casted to uint32. For db = -8 the divisior(db/32-1) becomes 0.
Check if db value can be really counted and replace these macro by div64_u64() inline.
--- drivers/md/md.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-)
drivers/md/md.c +22 -14
@@ -7296,9 +7296,9 @@ static void status_unused(struct seq_file *seq)static int status_resync (struct seq_file *seq,struct mddev *mddev) {sector_t max_sectors, resync, res; -unsigned long dt, db; -sector_t rt; -int scale; +unsigned long dt, db =0 ; +sector_t rt, curr_mark_cnt, resync_mark_cnt; +int scale, recovery_active;unsigned int per_milli; if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery) ||
@@ -7368,22 +7368,30 @@ static int status_resync(struct seq_file *seq, struct mddev *mddev)* db: blocks written from mark until now * rt: remaining time * -* rt is a sector_t, so could be 32bit or 64bit. -* So we divide before multiply in case it is 32bit and close -* to the limit. -* We scale the divisor (db) by 32 to avoid losing precision -* near the end of resync when the number of remaining sectors -* is close to 'db'. -* We then divide rt by 32 after multiplying by db to compensate. -* The '+1' avoids division by zero if db is very small. +* rt is a sector_t, which is always 64bit now. We are keeping +* the original algorithm, but it is not really necessary. +* +* Original algorithm: +* So we divide before multiply in case it is 32bit and close +* to the limit. +* We scale the divisor (db) by 32 to avoid losing precision +* near the end of resync when the number of remaining sectors +* is close to 'db'. +* We then divide rt by 32 after multiplying by db to compensate. +* The '+1' avoids division by zero if db is very small. */ dt = ((jiffies - mddev->resync_mark) /HZ );if (!dt) dt++; - db = (mddev->curr_mark_cnt -atomic_read (&mddev->recovery_active)) - - mddev->resync_mark_cnt; + + curr_mark_cnt = mddev->curr_mark_cnt; + recovery_active =atomic_read (&mddev->recovery_active); + resync_mark_cnt = mddev->resync_mark_cnt; + +if (curr_mark_cnt >= (recovery_active + resync_mark_cnt)) + db = curr_mark_cnt - (recovery_active + resync_mark_cnt); rt = max_sectors - resync;/* number of remaining sectors */ -sector_div (rt, db/32 +1 ); + rt =div64_u64 (rt, db/32 +1 ); rt *= dt; rt >>=5 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 19/54 bnx2x: Check if transceiver implements DDM before access
In reply to Greg Kroah-Hartman[ Upstream commit cf18cecca911c0db96b868072665347efe6df46f ]
Some transceivers may comply with SFF-8472 even though they do not implement the Digital Diagnostic Monitoring (DDM) interface described in the spec. The existence of such area is specified by the 6th bit of byte 92, set to 1 if implemented.
Currently, without checking this bit, bnx2x fails trying to read sfp module's EEPROM with the follow message:
ethtool -m enP5p1s0f1
Cannot get Module EEPROM data: Input/output error
Because it fails to read the additional 256 bytes in which it is assumed to exist the DDM data.
This issue was noticed using a Mellanox Passive DAC PN 01FT738. The EEPROM data was confirmed by Mellanox as correct and similar to other Passive DACs from other manufacturers.
--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 3 ++- drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c +2 -1
@@ -1562,7 +1562,8 @@ static int bnx2x_get_module_info(struct net_device *dev, }if (!sff8472_comp || - (diag_type &SFP_EEPROM_DIAG_ADDR_CHANGE_REQ )) { + (diag_type &SFP_EEPROM_DIAG_ADDR_CHANGE_REQ ) || + !(diag_type &SFP_EEPROM_DDM_IMPLEMENTED )) { modinfo->type =ETH_MODULE_SFF_8079 ; modinfo->eeprom_len =ETH_MODULE_SFF_8079_LEN ; }else {
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h +1 -0
@@ -62,6 +62,7 @@#define SFP_EEPROM_DIAG_TYPE_ADDR 0x5c#define SFP_EEPROM_DIAG_TYPE_SIZE 1#define SFP_EEPROM_DIAG_ADDR_CHANGE_REQ (1<<2) +#define SFP_EEPROM_DDM_IMPLEMENTED (1<<6)#define SFP_EEPROM_SFF_8472_COMP_ADDR 0x5e#define SFP_EEPROM_SFF_8472_COMP_SIZE 1
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 20/54 ip6_tunnel: allow not to count pkts on tstats by passing dev as NULL
In reply to Greg Kroah-Hartman[ Upstream commit 6f6a8622057c92408930c31698394fae1557b188 ]
A similar fix to Patch "ip_tunnel: allow not to count pkts on tstats by setting skb's dev to NULL" is also needed by ip6_tunnel.
--- include/net/ip6_tunnel.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
include/net/ip6_tunnel.h +6 -3
@@ -149,9 +149,12 @@ static inline void ip6tunnel_xmit(struct sock *sk, struct sk_buff *skb,memset (skb->cb,0 ,sizeof (struct inet6_skb_parm )); pkt_len = skb->len -skb_inner_network_offset (skb); err =ip6_local_out (dev_net (skb_dst (skb)->dev), sk, skb); -if (unlikely (net_xmit_eval (err))) - pkt_len =-1 ; -iptunnel_xmit_stats (dev, pkt_len); + +if (dev) { +if (unlikely (net_xmit_eval (err))) + pkt_len =-1 ; +iptunnel_xmit_stats (dev, pkt_len); + } }#endif #endif
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 21/54 net :sunrpc :clnt :Fix xps refcount imbalance on the error path
In reply to Greg Kroah-Hartman[ Upstream commit b96226148491505318228ac52624956bd98f9e0c ]
rpc_clnt_add_xprt take a reference to struct rpc_xprt_switch, but forget to release it before return, may lead to a memory leak.
--- net/sunrpc/clnt.c | 1 + 1 file changed, 1 insertion(+)
net/sunrpc/clnt.c +1 -0
@@ -2718,6 +2718,7 @@ int rpc_clnt_add_xprt(struct rpc_clnt *clnt, xprt =xprt_iter_xprt (&clnt->cl_xpi);if (xps ==NULL || xprt ==NULL ) {rcu_read_unlock (); +xprt_switch_put (xps);return -EAGAIN ; } resvport = xprt->resvport;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 22/54 udf: Fix incorrect final NOT_ALLOCATED (hole) extent length
In reply to Greg Kroah-HartmanFrom: Steven J. Magnani <[email protected]>
commit fa33cdbf3eceb0206a4f844fe91aeebcf6ff2b7a upstream.
In some cases, using the 'truncate' command to extend a UDF file results in a mismatch between the length of the file's extents (specifically, due to incorrect length of the final NOT_ALLOCATED extent) and the information (file) length. The discrepancy can prevent other operating systems (i.e., Windows 10) from opening the file.
Two particular errors have been observed when extending a file:
1. The final extent is larger than it should be, having been rounded up to a multiple of the block size.
B. The final extent is not shorter than it should be, due to not having
been updated when the file's information length was increased.
[JK: simplified udf_do_extend_final_block(), fixed up some types]
--- fs/udf/inode.c | 93 ++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 60 insertions(+), 33 deletions(-)
fs/udf/inode.c +60 -33
@@ -478,13 +478,15 @@ static struct buffer_head *udf_getblk(streturn NULL ; } -/* Extend the file by 'blocks' blocks, return the number of extents added */ +/* Extend the file with new blocks totaling 'new_block_bytes', +* return the number of extents added +*/ static int udf_do_extend_file (struct inode *inode,struct extent_position *last_pos,struct kernel_long_ad *last_ext, -sector_t blocks) +loff_t new_block_bytes) { -sector_t add; +uint32_t add;int count =0 , fake = !(last_ext->extLength &UDF_EXTENT_LENGTH_MASK );struct super_block *sb = inode->i_sb;struct kernel_lb_addr prealloc_loc = {};
@@ -494,7 +496,7 @@ static int udf_do_extend_file(struct ino/* The previous extent is fake and we should not extend by anything * - there's nothing to do... */ -if (!blocks && fake) +if (!new_block_bytes && fake)return 0 ; iinfo =UDF_I (inode);
@@ -525,13 +527,12 @@ static int udf_do_extend_file(struct ino/* Can we merge with the previous extent? */ if ((last_ext->extLength &UDF_EXTENT_FLAG_MASK ) ==EXT_NOT_RECORDED_NOT_ALLOCATED ) { - add = ((1 <<30 ) - sb->s_blocksize - - (last_ext->extLength &UDF_EXTENT_LENGTH_MASK )) >> - sb->s_blocksize_bits; -if (add > blocks) - add = blocks; - blocks -= add; - last_ext->extLength += add << sb->s_blocksize_bits; + add = (1 <<30 ) - sb->s_blocksize - + (last_ext->extLength &UDF_EXTENT_LENGTH_MASK ); +if (add > new_block_bytes) + add = new_block_bytes; + new_block_bytes -= add; + last_ext->extLength += add; }if (fake) {
@@ -552,28 +553,27 @@ static int udf_do_extend_file(struct ino }/* Managed to do everything necessary? */ -if (!blocks) +if (!new_block_bytes) goto out;/* All further extents will be NOT_RECORDED_NOT_ALLOCATED */ last_ext->extLocation.logicalBlockNum =0 ; last_ext->extLocation.partitionReferenceNum =0 ; - add = (1 << (30 -sb->s_blocksize_bits)) -1 ; - last_ext->extLength =EXT_NOT_RECORDED_NOT_ALLOCATED | - (add << sb->s_blocksize_bits); + add = (1 <<30 ) - sb->s_blocksize; + last_ext->extLength =EXT_NOT_RECORDED_NOT_ALLOCATED | add;/* Create enough extents to cover the whole hole */ -while (blocks > add) { - blocks -= add; +while (new_block_bytes > add) { + new_block_bytes -= add; err =udf_add_aext (inode, last_pos, &last_ext->extLocation, last_ext->extLength,1 );if (err)return err; count++; } -if (blocks) { +if (new_block_bytes) { last_ext->extLength =EXT_NOT_RECORDED_NOT_ALLOCATED | - (blocks << sb->s_blocksize_bits); + new_block_bytes; err =udf_add_aext (inode, last_pos, &last_ext->extLocation, last_ext->extLength,1 );if (err)
@@ -604,6 +604,24 @@ out:return count; } +/* Extend the final block of the file to final_block_len bytes */ +static void udf_do_extend_final_block (struct inode *inode, +struct extent_position *last_pos, +struct kernel_long_ad *last_ext, +uint32_t final_block_len) +{ +struct super_block *sb = inode->i_sb; +uint32_t added_bytes; + + added_bytes = final_block_len - + (last_ext->extLength & (sb->s_blocksize -1 )); + last_ext->extLength += added_bytes; +UDF_I (inode)->i_lenExtents += added_bytes; + +udf_write_aext (inode, last_pos, &last_ext->extLocation, + last_ext->extLength,1 ); +} +static int udf_extend_file (struct inode *inode,loff_t newsize) {
@@ -613,10 +631,12 @@ static int udf_extend_file(struct inodeint8_t etype;struct super_block *sb = inode->i_sb;sector_t first_block = newsize >> sb->s_blocksize_bits, offset; +unsigned long partial_final_block;int adsize;struct udf_inode_info *iinfo =UDF_I (inode);struct kernel_long_ad extent; -int err; +int err =0 ; +int within_final_block;if (iinfo->i_alloc_type ==ICBTAG_FLAG_AD_SHORT ) adsize =sizeof (struct short_ad );
@@ -626,18 +646,8 @@ static int udf_extend_file(struct inodeBUG (); etype =inode_bmap (inode, first_block, &epos, &eloc, &elen, &offset); + within_final_block = (etype !=-1 ); -/* File has extent covering the new size (could happen when extending -* inside a block)? */ -if (etype !=-1 ) -return 0 ; -if (newsize & (sb->s_blocksize -1 )) - offset++; -/* Extended file just to the boundary of the last file block? */ -if (offset ==0 ) -return 0 ; - -/* Truncate is extending the file by 'offset' blocks */ if ((!epos.bh && epos.offset ==udf_file_entry_alloc_offset (inode)) || (epos.bh && epos.offset ==sizeof (struct allocExtDesc ))) {/* File has no extents at all or has empty last
@@ -651,7 +661,22 @@ static int udf_extend_file(struct inode &extent.extLength, 0); extent.extLength |= etype <<30 ; } - err =udf_do_extend_file (inode, &epos, &extent, offset); + + partial_final_block = newsize & (sb->s_blocksize -1 ); + +/* File has extent covering the new size (could happen when extending +* inside a block)? +*/ +if (within_final_block) { +/* Extending file within the last file block */ +udf_do_extend_final_block (inode, &epos, &extent, + partial_final_block); + }else { +loff_t add = ((loff_t )offset << sb->s_blocksize_bits) | + partial_final_block; + err =udf_do_extend_file (inode, &epos, &extent, add); + } +if (err <0 ) goto out; err =0 ;
@@ -756,6 +781,7 @@ static sector_t inode_getblk(struct inod/* Are we beyond EOF? */ if (etype ==-1 ) {int ret; +loff_t hole_len; isBeyondEOF = true;if (count) {if (c)
@@ -771,7 +797,8 @@ static sector_t inode_getblk(struct inod startnum = (offset >0 ); }/* Create extents for the hole between EOF and offset */ - ret =udf_do_extend_file (inode, &prev_epos, laarr, offset); + hole_len = (loff_t )offset << inode->i_blkbits; + ret =udf_do_extend_file (inode, &prev_epos, laarr, hole_len);if (ret <0 ) {brelse (prev_epos.bh);brelse (cur_epos.bh);
Greg Kroah-Hartman
maintainerPATCH 23/54 x86/ptrace: Fix possible spectre-v1 in ptrace_get_debugreg()
In reply to Greg Kroah-HartmanFrom: Dianzhang Chen <[email protected]>
commit 31a2fbb390fee4231281b939e1979e810f945415 upstream.
The index to access the threads ptrace_bps is controlled by userspace via
syscall: sys_ptrace(), hence leading to a potential exploitation of the Spectre variant 1 vulnerability.
The index can be controlled from:
ptrace -> arch_ptrace -> ptrace_get_debugreg.
Fix this by sanitizing the user supplied index before using it access thread->ptrace_bps.
--- arch/x86/kernel/ptrace.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/x86/kernel/ptrace.c +4 -1
@@ -23,6 +23,7 @@#include <linux/rcupdate.h> #include <linux/export.h> #include <linux/context_tracking.h> +#include <linux/nospec.h> #include <asm/uaccess.h> #include <asm/pgtable.h>
@@ -650,9 +651,11 @@ static unsigned long ptrace_get_debugreg {struct thread_struct *thread = &tsk->thread;unsigned long val =0 ; +int index = n;if (n <HBP_NUM ) { -struct perf_event *bp = thread->ptrace_bps[n]; +struct perf_event *bp = thread->ptrace_bps[index]; + index =array_index_nospec (index,HBP_NUM );if (bp) val = bp->hw.info.address;
Greg Kroah-Hartman
maintainerPATCH 24/54 x86/tls: Fix possible spectre-v1 in do_get_thread_area()
In reply to Greg Kroah-HartmanFrom: Dianzhang Chen <[email protected]>
commit 993773d11d45c90cb1c6481c2638c3d9f092ea5b upstream.
The index to access the threads tls array is controlled by userspace via syscall: sys_ptrace(), hence leading to a potential exploitation of the Spectre variant 1 vulnerability.
The index can be controlled from:
ptrace -> arch_ptrace -> do_get_thread_area.
Fix this by sanitizing the user supplied index before using it to access the p->thread.tls_array.
--- arch/x86/kernel/tls.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
arch/x86/kernel/tls.c +7 -2
@@ -4,6 +4,7 @@#include <linux/user.h> #include <linux/regset.h> #include <linux/syscalls.h> +#include <linux/nospec.h> #include <asm/uaccess.h> #include <asm/desc.h>
@@ -219,6 +220,7 @@ int do_get_thread_area(struct task_struc struct user_desc __user *u_info) {struct user_desc info; +int index;if (idx ==-1 &&get_user (idx, &u_info->entry_number))return -EFAULT ;
@@ -226,8 +228,11 @@ int do_get_thread_area(struct task_strucif (idx <GDT_ENTRY_TLS_MIN || idx >GDT_ENTRY_TLS_MAX )return -EINVAL ; -fill_user_desc (&info, idx, - &p->thread.tls_array[idx -GDT_ENTRY_TLS_MIN ]); + index = idx -GDT_ENTRY_TLS_MIN ; + index =array_index_nospec (index, +GDT_ENTRY_TLS_MAX -GDT_ENTRY_TLS_MIN +1 ); + +fill_user_desc (&info, idx, &p->thread.tls_array[index]);if (copy_to_user (u_info, &info,sizeof (info)))return -EFAULT ;
Greg Kroah-Hartman
maintainerPATCH 25/54 mwifiex: Abort at too short BSS descriptor element
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 685c9b7750bfacd6fc1db50d86579980593b7869 upstream.
Currently mwifiex_update_bss_desc_with_ie() implicitly assumes that the source descriptor entries contain the enough size for each type and performs copying without checking the source size. This may lead to read over boundary.
Fix this by putting the source size check in appropriate places.
--- drivers/net/wireless/marvell/mwifiex/scan.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/net/wireless/marvell/mwifiex/scan.c +15 -0
@@ -1258,6 +1258,8 @@ int mwifiex_update_bss_desc_with_ie(strubreak ;case WLAN_EID_FH_PARAMS : +if (element_len +2 <sizeof (*fh_param_set)) +return -EINVAL ; fh_param_set = (struct ieee_types_fh_param_set *) current_ptr; memcpy(&bss_entry->phy_param_set.fh_param_set,
@@ -1266,6 +1268,8 @@ int mwifiex_update_bss_desc_with_ie(strubreak ;case WLAN_EID_DS_PARAMS : +if (element_len +2 <sizeof (*ds_param_set)) +return -EINVAL ; ds_param_set = (struct ieee_types_ds_param_set *) current_ptr;
@@ -1277,6 +1281,8 @@ int mwifiex_update_bss_desc_with_ie(strubreak ;case WLAN_EID_CF_PARAMS : +if (element_len +2 <sizeof (*cf_param_set)) +return -EINVAL ; cf_param_set = (struct ieee_types_cf_param_set *) current_ptr; memcpy(&bss_entry->ss_param_set.cf_param_set,
@@ -1285,6 +1291,8 @@ int mwifiex_update_bss_desc_with_ie(strubreak ;case WLAN_EID_IBSS_PARAMS : +if (element_len +2 <sizeof (*ibss_param_set)) +return -EINVAL ; ibss_param_set = (struct ieee_types_ibss_param_set *) current_ptr;
@@ -1294,10 +1302,14 @@ int mwifiex_update_bss_desc_with_ie(strubreak ;case WLAN_EID_ERP_INFO : +if (!element_len) +return -EINVAL ; bss_entry->erp_flags = *(current_ptr +2 );break ;case WLAN_EID_PWR_CONSTRAINT : +if (!element_len) +return -EINVAL ; bss_entry->local_constraint = *(current_ptr +2 ); bss_entry->sensed_11h = true;break ;
@@ -1337,6 +1349,9 @@ int mwifiex_update_bss_desc_with_ie(strubreak ;case WLAN_EID_VENDOR_SPECIFIC : +if (element_len +2 <sizeof (vendor_ie->vend_hdr)) +return -EINVAL ; + vendor_ie = (struct ieee_types_vendor_specific *) current_ptr;
Greg Kroah-Hartman
maintainerPATCH 26/54 mwifiex: Fix heap overflow in mwifiex_uap_parse_tail_ies()
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 69ae4f6aac1578575126319d3f55550e7e440449 upstream.
A few places in mwifiex_uap_parse_tail_ies() perform memcpy() unconditionally, which may lead to either buffer overflow or read over boundary.
This patch addresses the issues by checking the read size and the destination size at each place more properly. Along with the fixes, the patch cleans up the code slightly by introducing a temporary variable for the token size, and unifies the error path with the standard goto statement.
--- drivers/net/wireless/marvell/mwifiex/ie.c | 45 ++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 15 deletions(-)
drivers/net/wireless/marvell/mwifiex/ie.c +30 -15
@@ -328,6 +328,8 @@ static int mwifiex_uap_parse_tail_ies(ststruct ieee80211_vendor_ie *vendorhdr;u16 gen_idx =MWIFIEX_AUTO_IDX_MASK , ie_len =0 ;int left_len, parsed_len =0 ; +unsigned int token_len; +int err =0 ;if (!info->tail || !info->tail_len)return 0 ;
@@ -343,6 +345,12 @@ static int mwifiex_uap_parse_tail_ies(st*/ while (left_len >sizeof (struct ieee_types_header )) { hdr = (void *)(info->tail + parsed_len); + token_len = hdr->len +sizeof (struct ieee_types_header ); +if (token_len > left_len) { + err = -EINVAL ; + goto out; + } +switch (hdr->element_id) {case WLAN_EID_SSID :case WLAN_EID_SUPP_RATES :
@@ -356,13 +364,16 @@ static int mwifiex_uap_parse_tail_ies(stcase WLAN_EID_VENDOR_SPECIFIC :break ;default : -memcpy (gen_ie->ie_buffer + ie_len, hdr, - hdr->len +sizeof (struct ieee_types_header )); - ie_len += hdr->len +sizeof (struct ieee_types_header ); +if (ie_len + token_len >IEEE_MAX_IE_SIZE ) { + err = -EINVAL ; + goto out; + } +memcpy (gen_ie->ie_buffer + ie_len, hdr, token_len); + ie_len += token_len;break ; } - left_len -= hdr->len +sizeof (struct ieee_types_header ); - parsed_len += hdr->len +sizeof (struct ieee_types_header ); + left_len -= token_len; + parsed_len += token_len; }/* parse only WPA vendor IE from tail, WMM IE is configured by
@@ -372,15 +383,17 @@ static int mwifiex_uap_parse_tail_ies(stWLAN_OUI_TYPE_MICROSOFT_WPA , info->tail, info->tail_len);if (vendorhdr) { -memcpy (gen_ie->ie_buffer + ie_len, vendorhdr, - vendorhdr->len +sizeof (struct ieee_types_header )); - ie_len += vendorhdr->len +sizeof (struct ieee_types_header ); + token_len = vendorhdr->len +sizeof (struct ieee_types_header ); +if (ie_len + token_len >IEEE_MAX_IE_SIZE ) { + err = -EINVAL ; + goto out; + } +memcpy (gen_ie->ie_buffer + ie_len, vendorhdr, token_len); + ie_len += token_len; } -if (!ie_len) { -kfree (gen_ie); -return 0 ; - } +if (!ie_len) + goto out; gen_ie->ie_index =cpu_to_le16 (gen_idx); gen_ie->mgmt_subtype_mask = cpu_to_le16(MGMT_MASK_BEACON |
@@ -390,13 +403,15 @@ static int mwifiex_uap_parse_tail_ies(stif (mwifiex_update_uap_custom_ie (priv, gen_ie, &gen_idx,NULL ,NULL ,NULL ,NULL )) { -kfree (gen_ie); -return -1 ; + err = -EINVAL ; + goto out; } priv->gen_idx = gen_idx; + + out:kfree (gen_ie); -return 0 ; +return err; }/* This function parses different IEs-head & tail IEs, beacon IEs,
Greg Kroah-Hartman
maintainerPATCH 27/54 fscrypt: dont set policy for a dead directory
In reply to Greg Kroah-HartmanFrom: Hongjie Fang <[email protected]>
commit 5858bdad4d0d0fc18bf29f34c3ac836e0b59441f upstream.
The directory may have been removed when entering fscrypt_ioctl_set_policy(). If so, the empty_dir() check will return error for ext4 file system.
ext4_rmdir() sets i_size = 0, then ext4_empty_dir() reports an error because 'inode->i_size < EXT4_DIR_REC_LEN(1) + EXT4_DIR_REC_LEN(2)'. If the fs is mounted with errors=panic, it will trigger a panic issue.
Add the check IS_DEADDIR() to fix this problem.
--- fs/crypto/policy.c | 2 ++ 1 file changed, 2 insertions(+)
fs/crypto/policy.c +2 -0
@@ -114,6 +114,8 @@ int fscrypt_process_policy(struct file *if (!inode_has_encryption_context (inode)) {if (!S_ISDIR (inode->i_mode)) ret = -ENOTDIR ; +else if (IS_DEADDIR (inode)) + ret = -ENOENT ;else if (!inode->i_sb->s_cop->empty_dir) ret = -EOPNOTSUPP ;else if (!inode->i_sb->s_cop->empty_dir (inode))
Greg Kroah-Hartman
maintainerPATCH 28/54 mwifiex: Dont abort on small, spec-compliant vendor IEs
In reply to Greg Kroah-HartmanFrom: Brian Norris <[email protected]>
commit 63d7ef36103d26f20325a921ecc96a3288560146 upstream.
Per the 802.11 specification, vendor IEs are (at minimum) only required to contain an OUI. A type field is also included in ieee80211.h (struct ieee80211_vendor_ie) but doesn't appear in the specification. The remaining fields (subtype, version) are a convention used in WMM headers.
Thus, we should not reject vendor-specific IEs that have only the minimum length (3 bytes) -- we should skip over them (since we only want to match longer IEs, that match either WMM or WPA formats). We can reject elements that don't have the minimum-required 3 byte OUI.
While we're at it, move the non-standard subtype and version fields into the WMM structs, to avoid this confusion in the future about generic "vendor header" attributes.
--- drivers/net/wireless/marvell/mwifiex/fw.h | 12 +++++++++--- drivers/net/wireless/marvell/mwifiex/scan.c | 18 +++++++++++------- drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 4 ++-- drivers/net/wireless/marvell/mwifiex/wmm.c | 2 +- 4 files changed, 23 insertions(+), 13 deletions(-)
drivers/net/wireless/marvell/mwifiex/fw.h +9 -3
@@ -1719,9 +1719,10 @@ struct mwifiex_ie_types_wmm_queue_statusstruct ieee_types_vendor_header {u8 element_id;u8 len; -u8 oui[4 ];/* 0~2: oui, 3: oui_type */ -u8 oui_subtype; -u8 version; +struct { +u8 oui[3 ]; +u8 oui_type; + } __packed oui; } __packed;struct ieee_types_wmm_parameter {
@@ -1735,6 +1736,9 @@ struct ieee_types_wmm_parameter {* Version [1] */ struct ieee_types_vendor_header vend_hdr; +u8 oui_subtype; +u8 version; +u8 qos_info_bitmap;u8 reserved;struct ieee_types_wmm_ac_parameters ac_params[IEEE80211_NUM_ACS ];
@@ -1752,6 +1756,8 @@ struct ieee_types_wmm_info {* Version [1] */ struct ieee_types_vendor_header vend_hdr; +u8 oui_subtype; +u8 version;u8 qos_info_bitmap; } __packed;
drivers/net/wireless/marvell/mwifiex/scan.c +11 -7
@@ -1349,21 +1349,25 @@ int mwifiex_update_bss_desc_with_ie(strubreak ;case WLAN_EID_VENDOR_SPECIFIC : -if (element_len +2 <sizeof (vendor_ie->vend_hdr)) -return -EINVAL ; - vendor_ie = (struct ieee_types_vendor_specific *) current_ptr; -if (!memcmp - (vendor_ie->vend_hdr.oui, wpa_oui, -sizeof (wpa_oui))) { +/* 802.11 requires at least 3-byte OUI. */ +if (element_len <sizeof (vendor_ie->vend_hdr.oui.oui)) +return -EINVAL ; + +/* Not long enough for a match? Skip it. */ +if (element_len <sizeof (wpa_oui)) +break ; + +if (!memcmp (&vendor_ie->vend_hdr.oui, wpa_oui, +sizeof (wpa_oui))) { bss_entry->bcn_wpa_ie = (struct ieee_types_vendor_specific *) current_ptr; bss_entry->wpa_offset = (u16) (current_ptr - bss_entry->beacon_buf); - }else if (!memcmp (vendor_ie->vend_hdr.oui, wmm_oui, + }else if (!memcmp (&vendor_ie->vend_hdr.oui, wmm_oui,sizeof (wmm_oui))) { if (total_ie_len == sizeof(struct ieee_types_wmm_parameter) ||
drivers/net/wireless/marvell/mwifiex/sta_ioctl.c +2 -2
@@ -1374,7 +1374,7 @@ mwifiex_set_gen_ie_helper(struct mwifiex/* Test to see if it is a WPA IE, if not, then it is a * gen IE */ -if (!memcmp (pvendor_ie->oui, wpa_oui, +if (!memcmp (&pvendor_ie->oui, wpa_oui,sizeof (wpa_oui))) { find_wpa_ie =1 ;break ;
@@ -1383,7 +1383,7 @@ mwifiex_set_gen_ie_helper(struct mwifiex/* Test to see if it is a WPS IE, if so, enable * wps session flag */ -if (!memcmp (pvendor_ie->oui, wps_oui, +if (!memcmp (&pvendor_ie->oui, wps_oui,sizeof (wps_oui))) { priv->wps.session_enable = true; mwifiex_dbg(priv->adapter, MSG,
drivers/net/wireless/marvell/mwifiex/wmm.c +1 -1
@@ -240,7 +240,7 @@ mwifiex_wmm_setup_queue_priorities(strucmwifiex_dbg (priv->adapter,INFO ,"info: WMM Parameter IE: version=%d,\t" "qos_info Parameter Set Count=%d, Reserved=%#x\n" , - wmm_ie->vend_hdr.version, wmm_ie->qos_info_bitmap & + wmm_ie->version, wmm_ie->qos_info_bitmap &IEEE80211_WMM_IE_AP_QOSINFO_PARAM_SET_CNT_MASK , wmm_ie->reserved);
Greg Kroah-Hartman
maintainerPATCH 29/54 USB: serial: ftdi_sio: add ID for isodebug v1
In reply to Greg Kroah-HartmanFrom: Andreas Fritiofson <[email protected]>
commit f8377eff548170e8ea8022c067a1fbdf9e1c46a8 upstream.
This adds the vid:pid of the isodebug v1 isolated JTAG/SWD+UART. Only the second channel is available for use as a serial port.
--- drivers/usb/serial/ftdi_sio.c | 1 + drivers/usb/serial/ftdi_sio_ids.h | 6 ++++++ 2 files changed, 7 insertions(+)
drivers/usb/serial/ftdi_sio.c +1 -0
@@ -1024,6 +1024,7 @@ static const struct usb_device_id id_tab { USB_DEVICE(AIRBUS_DS_VID, AIRBUS_DS_P8GR) },/* EZPrototypes devices */ { USB_DEVICE(EZPROTOTYPES_VID, HJELMSLUND_USB485_ISO_PID) }, + { USB_DEVICE_INTERFACE_NUMBER(UNJO_VID, UNJO_ISODEBUG_V1_PID, 1) }, { } /* Terminating entry */ };
drivers/usb/serial/ftdi_sio_ids.h +6 -0
@@ -1542,3 +1542,9 @@#define CHETCO_SEASMART_DISPLAY_PID 0xA5AD/* SeaSmart NMEA2000 Display */ #define CHETCO_SEASMART_LITE_PID 0xA5AE/* SeaSmart Lite USB Adapter */ #define CHETCO_SEASMART_ANALOG_PID 0xA5AF/* SeaSmart Analog Adapter */ + +/* +* Unjo AB +*/ +#define UNJO_VID 0x22B7 +#define UNJO_ISODEBUG_V1_PID 0x150D
Greg Kroah-Hartman
maintainerPATCH 30/54 USB: serial: option: add support for GosunCn ME3630 RNDIS mode
In reply to Greg Kroah-HartmanFrom: Jörgen Storvist <[email protected]>
commit aed2a26283528fb69c38e414f649411aa48fb391 upstream.
Added USB IDs for GosunCn ME3630 cellular module in RNDIS mode.
T: Bus=03 Lev=01 Prnt=01 Port=01 Cnt=03 Dev#= 18 Spd=480 MxCh= 0 D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=19d2 ProdID=0601 Rev=03.18 S: Manufacturer=Android S: Product=Android S: SerialNumber=b950269c C: #Ifs= 5 Cfg#= 1 Atr=a0 MxPwr=500mA I: If#=0x0 Alt= 0 #EPs= 1 Cls=e0(wlcon) Sub=01 Prot=03 Driver=rndis_host I: If#=0x1 Alt= 0 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=rndis_host I: If#=0x2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option I: If#=0x3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option I: If#=0x4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
--- drivers/usb/serial/option.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/serial/option.c +1 -0
@@ -1338,6 +1338,7 @@ static const struct usb_device_id option .driver_info = RSVD(4) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0414, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0417, 0xff, 0xff, 0xff) }, + { USB_DEVICE_INTERFACE_CLASS(ZTE_VENDOR_ID, 0x0601, 0xff) }, /* GosunCn ZTE WeLink ME3630 (RNDIS mode) */ { USB_DEVICE_INTERFACE_CLASS(ZTE_VENDOR_ID, 0x0602, 0xff) }, /* GosunCn ZTE WeLink ME3630 (MBIM mode) */ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1008, 0xff, 0xff, 0xff), .driver_info = RSVD(4) },
Greg Kroah-Hartman
maintainerPATCH 31/54 Revert "serial: 8250: Dont service RX FIFO if interrupts are disabled"
In reply to Greg Kroah-HartmanFrom: Oliver Barta <[email protected]>
commit 3f2640ed7be838c3f05c0d2b0f7c7508e7431e48 upstream.
This reverts commit 2e9fe539108320820016f78ca7704a7342788380.
Reading LSR unconditionally but processing the error flags only if UART_IIR_RDI bit was set before in IIR may lead to a loss of transmission error information on UARTs where the transmission error flags are cleared by a read of LSR. Information are lost in case an error is detected right before the read of LSR while processing e.g. an UART_IIR_THRI interrupt.
--- drivers/tty/serial/8250/8250_port.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/tty/serial/8250/8250_port.c +1 -2
@@ -1814,8 +1814,7 @@ int serial8250_handle_irq(struct uart_po status =serial_port_in (port,UART_LSR ); -if (status & (UART_LSR_DR |UART_LSR_BI ) && - iir &UART_IIR_RDI ) { +if (status & (UART_LSR_DR |UART_LSR_BI )) {if (!up->dma ||handle_rx_dma (up, iir)) status =serial8250_rx_chars (up, status); }
Greg Kroah-Hartman
maintainerPATCH 32/54 p54usb: Fix race between disconnect and firmware loading
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit 6e41e2257f1094acc37618bf6c856115374c6922 upstream.
The syzbot fuzzer found a bug in the p54 USB wireless driver. The issue involves a race between disconnect and the firmware-loader callback routine, and it has several aspects.
One big problem is that when the firmware can't be loaded, the callback routine tries to unbind the driver from the USB _device_ (by calling device_release_driver) instead of from the USB _interface_ to which it is actually bound (by calling usb_driver_release_interface).
The race involves access to the private data structure. The driver's disconnect handler waits for a completion that is signalled by the firmware-loader callback routine. As soon as the completion is signalled, you have to assume that the private data structure may have been deallocated by the disconnect handler -- even if the firmware was loaded without errors. However, the callback routine does access the private data several times after that point.
Another problem is that, in order to ensure that the USB device structure hasn't been freed when the callback routine runs, the driver takes a reference to it. This isn't good enough any more, because now that the callback routine calls usb_driver_release_interface, it has to ensure that the interface structure hasn't been freed.
Finally, the driver takes an unnecessary reference to the USB device structure in the probe function and drops the reference in the disconnect handler. This extra reference doesn't accomplish anything, because the USB core already guarantees that a device structure won't be deallocated while a driver is still bound to any of its interfaces.
To fix these problems, this patch makes the following changes:
Call usb_driver_release_interface() rather than device_release_driver().
Don't signal the completion until after the important information has been copied out of the private data structure, and don't refer to the private data at all thereafter.
Lock udev (the interface's parent) before unbinding the driver instead of locking udev->parent.
During the firmware loading process, take a reference to the USB interface instead of the USB device.
Don't take an unnecessary reference to the device during probe (and then don't drop it during disconnect).
--- drivers/net/wireless/intersil/p54/p54usb.c | 43 ++++++++++++----------------- 1 file changed, 18 insertions(+), 25 deletions(-)
drivers/net/wireless/intersil/p54/p54usb.c +18 -25
@@ -33,6 +33,8 @@ MODULE_ALIAS("prism54usb");MODULE_FIRMWARE ("isl3886usb" );MODULE_FIRMWARE ("isl3887usb" ); +static struct usb_driver p54u_driver; +/* * Note: *
@@ -921,9 +923,9 @@ static void p54u_load_firmware_cb(const {struct p54u_priv *priv = context;struct usb_device *udev = priv->udev; +struct usb_interface *intf = priv->intf;int err; -complete (&priv->fw_wait_load);if (firmware) { priv->fw = firmware; err =p54u_start_ops (priv);
@@ -932,26 +934,22 @@ static void p54u_load_firmware_cb(constdev_err (&udev->dev,"Firmware not found.\n" ); } -if (err) { -struct device *parent = priv->udev->dev.parent; - -dev_err (&udev->dev,"failed to initialize device (%d)\n" , err); - -if (parent) -device_lock (parent); +complete (&priv->fw_wait_load); +/* +* At this point p54u_disconnect may have already freed +* the "priv" context. Do not use it anymore! +*/ + priv =NULL ; -device_release_driver (&udev->dev); -/* -* At this point p54u_disconnect has already freed -* the "priv" context. Do not use it anymore! -*/ - priv =NULL ; +if (err) { +dev_err (&intf->dev,"failed to initialize device (%d)\n" , err); -if (parent) -device_unlock (parent); +usb_lock_device (udev); +usb_driver_release_interface (&p54u_driver, intf); +usb_unlock_device (udev); } -usb_put_dev (udev); +usb_put_intf (intf); } static int p54u_load_firmware(struct ieee80211_hw *dev,
@@ -972,14 +970,14 @@ static int p54u_load_firmware(struct ieedev_info (&priv->udev->dev,"Loading firmware file %s\n" , p54u_fwlist[i].fw); -usb_get_dev (udev); +usb_get_intf (intf); err =request_firmware_nowait (THIS_MODULE ,1 , p54u_fwlist[i].fw, device,GFP_KERNEL , priv, p54u_load_firmware_cb);if (err) {dev_err (&priv->udev->dev,"(p54usb) cannot load firmware %s " "(%d)!\n" , p54u_fwlist[i].fw, err); -usb_put_dev (udev); +usb_put_intf (intf); }return err;
@@ -1011,8 +1009,6 @@ static int p54u_probe(struct usb_interfaskb_queue_head_init (&priv->rx_queue);init_usb_anchor (&priv->submitted); -usb_get_dev (udev); -/* really lazy and simple way of figuring out if we're a 3887 */ /* TODO: should just stick the identification in the device table */ i = intf->altsetting->desc.bNumEndpoints;
@@ -1053,10 +1049,8 @@ static int p54u_probe(struct usb_interfa priv->upload_fw = p54u_upload_firmware_net2280; } err =p54u_load_firmware (dev, intf); -if (err) { -usb_put_dev (udev); +if (err)p54_free_common (dev); - }return err; }
@@ -1072,7 +1066,6 @@ static void p54u_disconnect(struct usb_iwait_for_completion (&priv->fw_wait_load);p54_unregister_common (dev); -usb_put_dev (interface_to_usbdev (intf));release_firmware (priv->fw);p54_free_common (dev); }
Greg Kroah-Hartman
maintainerPATCH 33/54 usb: gadget: ether: Fix race between gether_disconnect and rx_submit
In reply to Greg Kroah-HartmanFrom: Kiruthika Varadarajan <[email protected]>
commit d29fcf7078bc8be2b6366cbd4418265b53c94fac upstream.
On spin lock release in rx_submit, gether_disconnect get a chance to run, it makes port_usb NULL, rx_submit access NULL port USB, hence null pointer crash.
Fixed by releasing the lock in rx_submit after port_usb is used.
--- drivers/usb/gadget/function/u_ether.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/usb/gadget/function/u_ether.c +4 -2
@@ -198,11 +198,12 @@ rx_submit(struct eth_dev *dev, struct us out = dev->port_usb->out_ep; else out =NULL ; -spin_unlock_irqrestore (&dev->lock, flags);if (!out) + { +spin_unlock_irqrestore (&dev->lock, flags);return -ENOTCONN ; - + }/* Padding up to RX_EXTRA handles minor disagreements with host. * Normally we use the USB "terminate on short read" convention;
@@ -223,6 +224,7 @@ rx_submit(struct eth_dev *dev, struct usif (dev->port_usb->is_fixed) size =max_t (size_t, size, dev->port_usb->fixed_out_len); +spin_unlock_irqrestore (&dev->lock, flags); skb =alloc_skb (size +NET_IP_ALIGN , gfp_flags);if (skb ==NULL ) {
Greg Kroah-Hartman
maintainerPATCH 34/54 usb: renesas_usbhs: add a workaround for a race condition of workqueue
In reply to Greg Kroah-HartmanFrom: Yoshihiro Shimoda <[email protected]>
commit b2357839c56ab7d06bcd4e866ebc2d0e2b7997f3 upstream.
The old commit 6e4b74e4690d ("usb: renesas: fix scheduling in atomic context bug") fixed an atomic issue by using workqueue for the shdmac dmaengine driver. However, this has a potential race condition issue between the work pending and usbhsg_ep_free_request() in gadget mode. When usbhsg_ep_free_request() is called while pending the queue, since the work_struct will be freed and then the work handler is called, kernel panic happens on process_one_work().
To fix the issue, if we could call cancel_work_sync() at somewhere before the free request, it could be easy. However,
the usbhsg_ep_free_request() is called on atomic (e.g. f_ncm driver calls free request via gether_disconnect()).
For now, almost all users are having "USB-DMAC" and the DMAengine driver can be used on atomic. So, this patch adds a workaround for a race condition to call the DMAengine APIs without the workqueue.
This means we still have TODO on shdmac environment (SH7724), but since it doesn't have SMP, the race condition might not happen.
--- drivers/usb/renesas_usbhs/fifo.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-)
drivers/usb/renesas_usbhs/fifo.c +22 -12
@@ -821,9 +821,8 @@ static int __usbhsf_dma_map_ctrl(struct }static void usbhsf_dma_complete (void *arg); -static void xfer_work (struct work_struct *work) +static void usbhsf_dma_xfer_preparing (struct usbhs_pkt *pkt) { - struct usbhs_pkt *pkt = container_of(work, struct usbhs_pkt, work);struct usbhs_pipe *pipe = pkt->pipe;struct usbhs_fifo *fifo;struct usbhs_priv *priv =usbhs_pipe_to_priv (pipe);
@@ -831,12 +830,10 @@ static void xfer_work(struct work_structstruct dma_chan *chan;struct device *dev =usbhs_priv_to_dev (priv);enum dma_transfer_direction dir; -unsigned long flags; -usbhs_lock (priv, flags); fifo =usbhs_pipe_to_fifo (pipe);if (!fifo) - goto xfer_work_end; +return ; chan =usbhsf_dma_chan_get (fifo, pkt); dir =usbhs_pipe_is_dir_in (pipe) ?DMA_DEV_TO_MEM :DMA_MEM_TO_DEV ;
@@ -845,7 +842,7 @@ static void xfer_work(struct work_struct pkt->trans, dir, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);if (!desc) - goto xfer_work_end; +return ; desc->callback = usbhsf_dma_complete; desc->callback_param = pipe;
@@ -853,7 +850,7 @@ static void xfer_work(struct work_struct pkt->cookie =dmaengine_submit (desc);if (pkt->cookie <0 ) {dev_err (dev,"Failed to submit dma descriptor\n" ); - goto xfer_work_end; +return ; } dev_dbg(dev, " %s %d (%d/ %d)\n",
@@ -864,8 +861,17 @@ static void xfer_work(struct work_structdma_async_issue_pending (chan);usbhsf_dma_start (pipe, fifo);usbhs_pipe_enable (pipe); +} + +static void xfer_work (struct work_struct *work) +{ + struct usbhs_pkt *pkt = container_of(work, struct usbhs_pkt, work); +struct usbhs_pipe *pipe = pkt->pipe; +struct usbhs_priv *priv =usbhs_pipe_to_priv (pipe); +unsigned long flags; -xfer_work_end: +usbhs_lock (priv, flags); +usbhsf_dma_xfer_preparing (pkt);usbhs_unlock (priv, flags); }
@@ -918,8 +924,13 @@ static int usbhsf_dma_prepare_push(struc pkt->trans = len;usbhsf_tx_irq_ctrl (pipe,0 ); -INIT_WORK (&pkt->work, xfer_work); -schedule_work (&pkt->work); +/* FIXME: Workaound for usb dmac that driver can be used in atomic */ +if (usbhs_get_dparam (priv, has_usb_dmac)) { +usbhsf_dma_xfer_preparing (pkt); + }else { +INIT_WORK (&pkt->work, xfer_work); +schedule_work (&pkt->work); + }return 0 ;
@@ -1025,8 +1036,7 @@ static int usbhsf_dma_prepare_pop_with_u pkt->trans = pkt->length; -INIT_WORK (&pkt->work, xfer_work); -schedule_work (&pkt->work); +usbhsf_dma_xfer_preparing (pkt);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 35/54 staging: comedi: dt282x: fix a null pointer deref on interrupt
In reply to Greg Kroah-HartmanFrom: Ian Abbott <[email protected]>
commit b8336be66dec06bef518030a0df9847122053ec5 upstream.
The interrupt handler dt282x_interrupt() causes a null pointer dereference for those supported boards that have no analog output support. For these boards, dev->write_subdev will be NULL and therefore the s_ao subdevice pointer variable will be NULL. In that case, the following call near the end of the interrupt handler results in a null pointer dereference:
comedi_handle_events(dev, s_ao);
Fix it by only calling the above function if s_ao is valid.
(There are other uses of s_ao by the interrupt handler that may or may not be reached depending on values of hardware registers. Trust that they are reliable for now.)
Note:
commit 4f6f009b204f ("staging: comedi: dt282x: use comedi_handle_events()") propagates an earlier error from
commit f21c74fa4cfe ("staging: comedi: dt282x: use cfc_handle_events()").
--- drivers/staging/comedi/drivers/dt282x.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/comedi/drivers/dt282x.c +2 -1
@@ -566,7 +566,8 @@ static irqreturn_t dt282x_interrupt(int }#endif comedi_handle_events (dev, s); -comedi_handle_events (dev, s_ao); +if (s_ao) +comedi_handle_events (dev, s_ao);return IRQ_RETVAL (handled); }
Greg Kroah-Hartman
maintainerPATCH 36/54 staging: comedi: amplc_pci230: fix null pointer deref on interrupt
In reply to Greg Kroah-HartmanFrom: Ian Abbott <[email protected]>
commit 7379e6baeddf580d01feca650ec1ad508b6ea8ee upstream.
The interrupt handler pci230_interrupt() causes a null pointer dereference for a PCI260 card. There is no analog output subdevice for a PCI260. The dev->write_subdev subdevice pointer and therefore the s_ao subdevice pointer variable will be NULL for a PCI260. The following call near the end of the interrupt handler results in the null pointer dereference for a PCI260:
comedi_handle_events(dev, s_ao);
Fix it by only calling the above function if s_ao is valid.
Note that the other uses of s_ao in the calls pci230_handle_ao_nofifo(dev, s_ao); and pci230_handle_ao_fifo(dev, s_ao); will never be reached for a PCI260, so they are safe.
--- drivers/staging/comedi/drivers/amplc_pci230.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/comedi/drivers/amplc_pci230.c +2 -1
@@ -2337,7 +2337,8 @@ static irqreturn_t pci230_interrupt(int devpriv->intr_running = false;spin_unlock_irqrestore (&devpriv->isr_spinlock, irqflags); -comedi_handle_events (dev, s_ao); +if (s_ao) +comedi_handle_events (dev, s_ao);comedi_handle_events (dev, s_ai);return IRQ_HANDLED ;
Greg Kroah-Hartman
maintainerPATCH 37/54 carl9170: fix misuse of device driver API
In reply to Greg Kroah-HartmanFrom: Christian Lamparter <[email protected]>
commit feb09b2933275a70917a869989ea2823e7356be8 upstream.
This patch follows Alan Stern's recent patch:
"p54: Fix race between disconnect and firmware loading"
that overhauled carl9170 buggy firmware loading and driver unbinding procedures.
Since the carl9170 code was adapted from p54 it uses the same functions and is likely to have the same problem, but it's just that the syzbot hasn't reproduce them (yet).
a summary from the changes (copied from the p54 patch):
* Call usb_driver_release_interface() rather than device_release_driver().
* Lock udev (the interface's parent) before unbinding the driver instead of locking udev->parent.
* During the firmware loading process, take a reference to the USB interface instead of the USB device.
* Don't take an unnecessary reference to the device during probe (and then don't drop it during disconnect).
and
* Make sure to prevent use-after-free bugs by explicitly setting the driver context to NULL after signaling the completion.
--- drivers/net/wireless/ath/carl9170/usb.c | 39 +++++++++++++------------------- 1 file changed, 17 insertions(+), 22 deletions(-)
drivers/net/wireless/ath/carl9170/usb.c +17 -22
@@ -128,6 +128,8 @@ static struct usb_device_id carl9170_usb };MODULE_DEVICE_TABLE (usb, carl9170_usb_ids); +static struct usb_driver carl9170_driver; +static void carl9170_usb_submit_data_urb (struct ar9170 *ar) {struct urb *urb;
@@ -966,32 +968,28 @@ err_out:static void carl9170_usb_firmware_failed (struct ar9170 *ar) { -struct device *parent = ar->udev->dev.parent; -struct usb_device *udev; - -/* -* Store a copy of the usb_device pointer locally. -* This is because device_release_driver initiates -* carl9170_usb_disconnect, which in turn frees our -* driver context (ar). +/* Store a copies of the usb_interface and usb_device pointer locally. +* This is because release_driver initiates carl9170_usb_disconnect, +* which in turn frees our driver context (ar). */ - udev = ar->udev; +struct usb_interface *intf = ar->intf; +struct usb_device *udev = ar->udev;complete (&ar->fw_load_wait); +/* at this point 'ar' could be already freed. Don't use it anymore */ + ar =NULL ;/* unbind anything failed */ -if (parent) -device_lock (parent); - -device_release_driver (&udev->dev); -if (parent) -device_unlock (parent); +usb_lock_device (udev); +usb_driver_release_interface (&carl9170_driver, intf); +usb_unlock_device (udev); -usb_put_dev (udev); +usb_put_intf (intf); }static void carl9170_usb_firmware_finish (struct ar9170 *ar) { +struct usb_interface *intf = ar->intf;int err; err =carl9170_parse_firmware (ar);
@@ -1009,7 +1007,7 @@ static void carl9170_usb_firmware_finish goto err_unrx;complete (&ar->fw_load_wait); -usb_put_dev (ar->udev); +usb_put_intf (intf);return ; err_unrx:
@@ -1052,7 +1050,6 @@ static int carl9170_usb_probe(struct usbreturn PTR_ERR (ar); udev =interface_to_usbdev (intf); -usb_get_dev (udev); ar->udev = udev; ar->intf = intf; ar->features = id->driver_info;
@@ -1094,15 +1091,14 @@ static int carl9170_usb_probe(struct usbatomic_set (&ar->rx_anch_urbs,0 );atomic_set (&ar->rx_pool_urbs,0 ); -usb_get_dev (ar->udev); +usb_get_intf (intf);carl9170_set_state (ar,CARL9170_STOPPED ); err =request_firmware_nowait (THIS_MODULE ,1 ,CARL9170FW_NAME , &ar->udev->dev,GFP_KERNEL , ar, carl9170_usb_firmware_step2);if (err) { -usb_put_dev (udev); -usb_put_dev (udev); +usb_put_intf (intf);carl9170_free (ar); }return err;
@@ -1131,7 +1127,6 @@ static void carl9170_usb_disconnect(strucarl9170_release_firmware (ar);carl9170_free (ar); -usb_put_dev (udev); }#ifdef CONFIG_PM
Greg Kroah-Hartman
maintainerPATCH 38/54 VMCI: Fix integer overflow in VMCI handle arrays
In reply to Greg Kroah-HartmanFrom: Vishnu DASA <[email protected]>
commit 1c2eb5b2853c9f513690ba6b71072d8eb65da16a upstream.
The VMCI handle array has an integer overflow in vmci_handle_arr_append_entry when it tries to expand the array. This can be triggered from a guest, since the doorbell link hypercall doesn't impose a limit on the number of doorbell handles that a VM can create in the hypervisor, and these handles are stored in a handle array.
In this change, we introduce a mandatory max capacity for handle arrays/lists to avoid excessive memory usage.
--- drivers/misc/vmw_vmci/vmci_context.c | 80 ++++++++++++++++-------------- drivers/misc/vmw_vmci/vmci_handle_array.c | 38 +++++++++----- drivers/misc/vmw_vmci/vmci_handle_array.h | 29 +++++++--- include/linux/vmw_vmci_defs.h | 11 +++- 4 files changed, 99 insertions(+), 59 deletions(-)
drivers/misc/vmw_vmci/vmci_context.c +45 -35
@@ -28,6 +28,9 @@#include "vmci_driver.h" #include "vmci_event.h" +/* Use a wide upper bound for the maximum contexts. */ +#define VMCI_MAX_CONTEXTS 2000 +/* * List of current VMCI contexts. Contexts can be added by * vmci_ctx_create() and removed via vmci_ctx_destroy().
@@ -124,19 +127,22 @@ struct vmci_ctx *vmci_ctx_create(u32 cid/* Initialize host-specific VMCI context. */ init_waitqueue_head (&context->host_context.wait_queue); - context->queue_pair_array =vmci_handle_arr_create (0 ); + context->queue_pair_array = +vmci_handle_arr_create (0 ,VMCI_MAX_GUEST_QP_COUNT );if (!context->queue_pair_array) { error = -ENOMEM ; goto err_free_ctx; } - context->doorbell_array =vmci_handle_arr_create (0 ); + context->doorbell_array = +vmci_handle_arr_create (0 ,VMCI_MAX_GUEST_DOORBELL_COUNT );if (!context->doorbell_array) { error = -ENOMEM ; goto err_free_qp_array; } - context->pending_doorbell_array =vmci_handle_arr_create (0 ); + context->pending_doorbell_array = +vmci_handle_arr_create (0 ,VMCI_MAX_GUEST_DOORBELL_COUNT );if (!context->pending_doorbell_array) { error = -ENOMEM ; goto err_free_db_array;
@@ -211,7 +217,7 @@ static int ctx_fire_notification(u32 con* We create an array to hold the subscribers we find when * scanning through all contexts. */ - subscriber_array =vmci_handle_arr_create (0 ); + subscriber_array =vmci_handle_arr_create (0 ,VMCI_MAX_CONTEXTS );if (subscriber_array ==NULL )return VMCI_ERROR_NO_MEM ;
@@ -630,20 +636,26 @@ int vmci_ctx_add_notification(u32 contexspin_lock (&context->lock); -list_for_each_entry (n, &context->notifier_list, node) { -if (vmci_handle_is_equal (n->handle, notifier->handle)) { - exists = true; -break ; +if (context->n_notifiers <VMCI_MAX_CONTEXTS ) { +list_for_each_entry (n, &context->notifier_list, node) { +if (vmci_handle_is_equal (n->handle, notifier->handle)) { + exists = true; +break ; + } } - } -if (exists) { -kfree (notifier); - result =VMCI_ERROR_ALREADY_EXISTS ; +if (exists) { +kfree (notifier); + result =VMCI_ERROR_ALREADY_EXISTS ; + }else { +list_add_tail_rcu (¬ifier->node, + &context->notifier_list); + context->n_notifiers++; + result =VMCI_SUCCESS ; + } }else { -list_add_tail_rcu (¬ifier->node, &context->notifier_list); - context->n_notifiers++; - result =VMCI_SUCCESS ; +kfree (notifier); + result =VMCI_ERROR_NO_MEM ; }spin_unlock (&context->lock);
@@ -728,8 +740,7 @@ static int vmci_ctx_get_chkpt_doorbells( u32 *buf_size, void **pbuf) {struct dbell_cpt_state *dbells; -size_t n_doorbells; -int i; +u32 i, n_doorbells; n_doorbells =vmci_handle_arr_get_size (context->doorbell_array);if (n_doorbells >0 ) {
@@ -867,7 +878,8 @@ int vmci_ctx_rcv_notifications_get(u32 cspin_lock (&context->lock); *db_handle_array = context->pending_doorbell_array; - context->pending_doorbell_array =vmci_handle_arr_create (0 ); + context->pending_doorbell_array = +vmci_handle_arr_create (0 ,VMCI_MAX_GUEST_DOORBELL_COUNT );if (!context->pending_doorbell_array) { context->pending_doorbell_array = *db_handle_array; *db_handle_array =NULL ;
@@ -949,12 +961,11 @@ int vmci_ctx_dbell_create(u32 context_idreturn VMCI_ERROR_NOT_FOUND ;spin_lock (&context->lock); -if (!vmci_handle_arr_has_entry (context->doorbell_array, handle)) { -vmci_handle_arr_append_entry (&context->doorbell_array, handle); - result =VMCI_SUCCESS ; - }else { +if (!vmci_handle_arr_has_entry (context->doorbell_array, handle)) + result =vmci_handle_arr_append_entry (&context->doorbell_array, + handle); +else result =VMCI_ERROR_DUPLICATE_ENTRY ; - }spin_unlock (&context->lock);vmci_ctx_put (context);
@@ -1090,15 +1101,16 @@ int vmci_ctx_notify_dbell(u32 src_cid,if (!vmci_handle_arr_has_entry ( dst_context->pending_doorbell_array, handle)) { -vmci_handle_arr_append_entry ( + result =vmci_handle_arr_append_entry ( &dst_context->pending_doorbell_array, handle); - -ctx_signal_notify (dst_context); -wake_up (&dst_context->host_context.wait_queue); - +if (result ==VMCI_SUCCESS ) { +ctx_signal_notify (dst_context); +wake_up (&dst_context->host_context.wait_queue); + } + }else { + result =VMCI_SUCCESS ; } - result =VMCI_SUCCESS ; }spin_unlock (&dst_context->lock); }
@@ -1125,13 +1137,11 @@ int vmci_ctx_qp_create(struct vmci_ctx *if (context ==NULL ||vmci_handle_is_invalid (handle))return VMCI_ERROR_INVALID_ARGS ; -if (!vmci_handle_arr_has_entry (context->queue_pair_array, handle)) { -vmci_handle_arr_append_entry (&context->queue_pair_array, - handle); - result =VMCI_SUCCESS ; - }else { +if (!vmci_handle_arr_has_entry (context->queue_pair_array, handle)) + result =vmci_handle_arr_append_entry ( + &context->queue_pair_array, handle); +else result =VMCI_ERROR_DUPLICATE_ENTRY ; - }return result; }
drivers/misc/vmw_vmci/vmci_handle_array.c +25 -13
@@ -16,24 +16,29 @@#include <linux/slab.h> #include "vmci_handle_array.h" -static size_t handle_arr_calc_size (size_t capacity) +static size_t handle_arr_calc_size (u32 capacity) { -return sizeof (struct vmci_handle_arr ) + +return VMCI_HANDLE_ARRAY_HEADER_SIZE + capacity *sizeof (struct vmci_handle ); } -struct vmci_handle_arr *vmci_handle_arr_create (size_t capacity) +struct vmci_handle_arr *vmci_handle_arr_create (u32 capacity,u32 max_capacity) {struct vmci_handle_arr *array; +if (max_capacity ==0 || capacity > max_capacity) +return NULL ; +if (capacity ==0 ) - capacity =VMCI_HANDLE_ARRAY_DEFAULT_SIZE ; + capacity =min ((u32 )VMCI_HANDLE_ARRAY_DEFAULT_CAPACITY , + max_capacity); array =kmalloc (handle_arr_calc_size (capacity),GFP_ATOMIC );if (!array)return NULL ; array->capacity = capacity; + array->max_capacity = max_capacity; array->size =0 ;return array;
@@ -44,27 +49,34 @@ void vmci_handle_arr_destroy(struct vmcikfree (array); } -void vmci_handle_arr_append_entry (struct vmci_handle_arr **array_ptr, -struct vmci_handle handle) +int vmci_handle_arr_append_entry (struct vmci_handle_arr **array_ptr, +struct vmci_handle handle) {struct vmci_handle_arr *array = *array_ptr;if (unlikely (array->size >= array->capacity)) {/* reallocate. */ struct vmci_handle_arr *new_array; -size_t new_capacity = array->capacity *VMCI_ARR_CAP_MULT ; -size_t new_size =handle_arr_calc_size (new_capacity); +u32 capacity_bump =min (array->max_capacity - array->capacity, + array->capacity); +size_t new_size =handle_arr_calc_size (array->capacity + + capacity_bump); + +if (array->size >= array->max_capacity) +return VMCI_ERROR_NO_MEM ; new_array =krealloc (array, new_size,GFP_ATOMIC );if (!new_array) -return ; +return VMCI_ERROR_NO_MEM ; - new_array->capacity = new_capacity; + new_array->capacity += capacity_bump; *array_ptr = array = new_array; } array->entries[array->size] = handle; array->size++; + +return VMCI_SUCCESS ; }/*
@@ -74,7 +86,7 @@ struct vmci_handle vmci_handle_arr_remov struct vmci_handle entry_handle) {struct vmci_handle handle =VMCI_INVALID_HANDLE ; -size_t i; +u32 i;for (i =0 ; i < array->size; i++) {if (vmci_handle_is_equal (array->entries[i], entry_handle)) {
@@ -109,7 +121,7 @@ struct vmci_handle vmci_handle_arr_remov* Handle at given index, VMCI_INVALID_HANDLE if invalid index. */ struct vmci_handle -vmci_handle_arr_get_entry (const struct vmci_handle_arr *array,size_t index) +vmci_handle_arr_get_entry (const struct vmci_handle_arr *array,u32 index) {if (unlikely (index >= array->size))return VMCI_INVALID_HANDLE ;
@@ -120,7 +132,7 @@ vmci_handle_arr_get_entry(const struct vbool vmci_handle_arr_has_entry (const struct vmci_handle_arr *array,struct vmci_handle entry_handle) { -size_t i; +u32 i;for (i =0 ; i < array->size; i++)if (vmci_handle_is_equal (array->entries[i], entry_handle))
drivers/misc/vmw_vmci/vmci_handle_array.h +19 -10
@@ -17,32 +17,41 @@#define _VMCI_HANDLE_ARRAY_H_#include <linux/vmw_vmci_defs.h> +#include <linux/limits.h> #include <linux/types.h> -#define VMCI_HANDLE_ARRAY_DEFAULT_SIZE 4 -#define VMCI_ARR_CAP_MULT 2/* Array capacity multiplier */ -struct vmci_handle_arr { -size_t capacity; -size_t size; +u32 capacity; +u32 max_capacity; +u32 size; +u32 pad;struct vmci_handle entries[]; }; -struct vmci_handle_arr *vmci_handle_arr_create (size_t capacity); +#define VMCI_HANDLE_ARRAY_HEADER_SIZE \ + offsetof(struct vmci_handle_arr, entries) +/* Select a default capacity that results in a 64 byte sized array */ +#define VMCI_HANDLE_ARRAY_DEFAULT_CAPACITY 6 +/* Make sure that the max array size can be expressed by a u32 */ +#define VMCI_HANDLE_ARRAY_MAX_CAPACITY \ + ((U32_MAX - VMCI_HANDLE_ARRAY_HEADER_SIZE - 1) / \ + sizeof(struct vmci_handle)) + +struct vmci_handle_arr *vmci_handle_arr_create (u32 capacity,u32 max_capacity);void vmci_handle_arr_destroy (struct vmci_handle_arr *array); -void vmci_handle_arr_append_entry (struct vmci_handle_arr **array_ptr, -struct vmci_handle handle); +int vmci_handle_arr_append_entry (struct vmci_handle_arr **array_ptr, +struct vmci_handle handle);struct vmci_handle vmci_handle_arr_remove_entry (struct vmci_handle_arr *array,struct vmci_handle entry_handle);struct vmci_handle vmci_handle_arr_remove_tail (struct vmci_handle_arr *array);struct vmci_handle -vmci_handle_arr_get_entry (const struct vmci_handle_arr *array,size_t index); +vmci_handle_arr_get_entry (const struct vmci_handle_arr *array,u32 index);bool vmci_handle_arr_has_entry (const struct vmci_handle_arr *array,struct vmci_handle entry_handle);struct vmci_handle *vmci_handle_arr_get_handles (struct vmci_handle_arr *array); -static inline size_t vmci_handle_arr_get_size ( +static inline u32 vmci_handle_arr_get_size (const struct vmci_handle_arr *array) {return array->size;
include/linux/vmw_vmci_defs.h +10 -1
@@ -75,9 +75,18 @@ enum {/* * A single VMCI device has an upper limit of 128MB on the amount of -* memory that can be used for queue pairs. +* memory that can be used for queue pairs. Since each queue pair +* consists of at least two pages, the memory limit also dictates the +* number of queue pairs a guest can create. */ #define VMCI_MAX_GUEST_QP_MEMORY (128 * 1024 * 1024) +#define VMCI_MAX_GUEST_QP_COUNT (VMCI_MAX_GUEST_QP_MEMORY / PAGE_SIZE / 2) + +/* +* There can be at most PAGE_SIZE doorbells since there is one doorbell +* per byte in the doorbell bitmap page. +*/ +#define VMCI_MAX_GUEST_DOORBELL_COUNT PAGE_SIZE/* * Queues with pre-mapped data pages must be small, so that we don't pin
Greg Kroah-Hartman
maintainerPATCH 39/54 MIPS: Remove superfluous check for __linux__
In reply to Greg Kroah-HartmanFrom: Sean Young <[email protected]>
commit 1287533d3d95d5ad8b02773733044500b1be06bc upstream.
When building BPF code using "clang -target bpf -c", clang does not define __linux__.
To build BPF IR decoders the include linux/lirc.h is needed which includes linux/types.h. Currently this workaround is needed:
https://git.linuxtv.org/v4l-utils.git/commit/?id=dd3ff81f58c4e1e6f33765dc61ad33c48ae6bb07
This check might otherwise be useful to stop users from using a non-linux compiler, but if you're doing that you are going to have a lot more trouble anyway.
Patchwork: https://patchwork.linux-mips.org/patch/21149/
--- arch/mips/include/uapi/asm/sgidefs.h | 8 -------- 1 file changed, 8 deletions(-)
arch/mips/include/uapi/asm/sgidefs.h +0 -8
@@ -11,14 +11,6 @@#define __ASM_SGIDEFS_H/* -* Using a Linux compiler for building Linux seems logic but not to -* everybody. -*/ -#ifndef __linux__ -#error Use a Linux compiler or give up. -#endif - -/* * Definitions for the ISA levels * * With the introduction of MIPS32 / MIPS64 instruction sets definitions
Greg Kroah-Hartman
maintainerPATCH 40/54 Revert "e1000e: fix cyclic resets at link up with active tx"
In reply to Greg Kroah-HartmanFrom: Konstantin Khlebnikov <[email protected]>
commit caff422ea81e144842bc44bab408d85ac449377b upstream.
This reverts commit 0f9e980bf5ee1a97e2e401c846b2af989eb21c61.
That change cased false-positive warning about hardware hang:
e1000e: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: Rx/Tx
IPv6: ADDRCONF(NETDEV_CHANGE): eth0: link becomes ready e1000e 0000:00:1f.6 eth0: Detected Hardware Unit Hang:
TDH <0> TDT <1> next_to_use <1> next_to_clean <0> buffer_info[next_to_clean]: time_stamp <fffba7a7> next_to_watch <0> jiffies <fffbb140> next_to_watch.status <0> MAC Status <40080080> PHY Status <7949> PHY 1000BASE-T Status <0> PHY Extended Status <3000> PCI Status <10>
e1000e: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: Rx/Tx
Besides warning everything works fine.
Original issue will be fixed property in following patch.
--- drivers/net/ethernet/intel/e1000e/netdev.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/net/ethernet/intel/e1000e/netdev.c +9 -6
@@ -5291,13 +5291,8 @@ static void e1000_watchdog_task(struct w/* 8000ES2LAN requires a Rx packet buffer work-around * on link down event; reset the controller to flush * the Rx packet buffer. -* -* If the link is lost the controller stops DMA, but -* if there is queued Tx work it cannot be done. So -* reset the controller to flush the Tx packet buffers. */ -if ((adapter->flags &FLAG_RX_NEEDS_RESTART ) || -e1000_desc_unused (tx_ring) +1 < tx_ring->count) +if (adapter->flags &FLAG_RX_NEEDS_RESTART ) adapter->flags |=FLAG_RESTART_NOW ;else pm_schedule_suspend(netdev->dev.parent,
@@ -5320,6 +5315,14 @@ link_up: adapter->gotc_old = adapter->stats.gotc;spin_unlock (&adapter->stats64_lock); +/* If the link is lost the controller stops DMA, but +* if there is queued Tx work it cannot be done. So +* reset the controller to flush the Tx packet buffers. +*/ +if (!netif_carrier_ok (netdev) && + (e1000_desc_unused (tx_ring) +1 < tx_ring->count)) + adapter->flags |=FLAG_RESTART_NOW ; +/* If reset is necessary, do it outside of interrupt context. */ if (adapter->flags &FLAG_RESTART_NOW ) {schedule_work (&adapter->reset_task);
Greg Kroah-Hartman
maintainerPATCH 41/54 e1000e: start network tx queue only when link is up
In reply to Greg Kroah-HartmanFrom: Konstantin Khlebnikov <[email protected]>
commit d17ba0f616a08f597d9348c372d89b8c0405ccf3 upstream.
Driver does not want to keep packets in Tx queue when link is lost. But present code only reset NIC to flush them, but does not prevent queuing new packets. Moreover reset sequence itself could generate new packets via netconsole and NIC falls into endless reset loop.
This patch wakes Tx queue only when NIC is ready to send packets.
This is proper fix for problem addressed by commit 0f9e980bf5ee ("e1000e: fix cyclic resets at link up with active tx").
--- drivers/net/ethernet/intel/e1000e/netdev.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/e1000e/netdev.c +4 -2
@@ -4212,7 +4212,7 @@ void e1000e_up(struct e1000_adapter *adae1000_configure_msix (adapter);e1000_irq_enable (adapter); -netif_start_queue (adapter->netdev); +/* Tx queue started by watchdog timer when link is up */ e1000e_trigger_lsc (adapter); }
@@ -4588,6 +4588,7 @@ int e1000e_open(struct net_device *netdepm_runtime_get_sync (&pdev->dev);netif_carrier_off (netdev); +netif_stop_queue (netdev);/* allocate transmit descriptors */ err =e1000e_setup_tx_resources (adapter->tx_ring);
@@ -4648,7 +4649,6 @@ int e1000e_open(struct net_device *netdee1000_irq_enable (adapter); adapter->tx_hang_recheck = false; -netif_start_queue (netdev); hw->mac.get_link_status = true;pm_runtime_put (&pdev->dev);
@@ -5271,6 +5271,7 @@ static void e1000_watchdog_task(struct wif (phy->ops.cfg_on_link_up) phy->ops.cfg_on_link_up (hw); +netif_wake_queue (netdev);netif_carrier_on (netdev);if (!test_bit (__E1000_DOWN, &adapter->state))
@@ -5284,6 +5285,7 @@ static void e1000_watchdog_task(struct w/* Link status message must follow this format */ pr_info ("%s NIC Link is Down\n" , adapter->netdev->name);netif_carrier_off (netdev); +netif_stop_queue (netdev);if (!test_bit (__E1000_DOWN, &adapter->state))mod_timer (&adapter->phy_info_timer,round_jiffies (jiffies +2 *HZ ));
Greg Kroah-Hartman
maintainerPATCH 42/54 nilfs2: do not use unexported cpu_to_le32()/le32_to_cpu() in uapi header
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
commit c32cc30c0544f13982ee0185d55f4910319b1a79 upstream.
cpu_to_le32/le32_to_cpu is defined in include/linux/byteorder/generic.h, which is not exported to user-space.
UAPI headers must use the ones prefixed with double-underscore.
Detected by compile-testing exported headers:
include/linux/nilfs2_ondisk.h: In function `nilfs_checkpoint_set_snapshot':
include/linux/nilfs2_ondisk.h:536:17: error: implicit declaration of function `cpu_to_le32' [-Werror=implicit-function-declaration]
cp->cp_flags = cpu_to_le32(le32_to_cpu(cp->cp_flags) | \
^
include/linux/nilfs2_ondisk.h:552:1: note: in expansion of macro `NILFS_CHECKPOINT_FNS'
NILFS_CHECKPOINT_FNS(SNAPSHOT, snapshot)
^~~~~~~~~~~~~~~~~~~~
include/linux/nilfs2_ondisk.h:536:29: error: implicit declaration of function `le32_to_cpu' [-Werror=implicit-function-declaration]
cp->cp_flags = cpu_to_le32(le32_to_cpu(cp->cp_flags) | \
^
include/linux/nilfs2_ondisk.h:552:1: note: in expansion of macro `NILFS_CHECKPOINT_FNS'
NILFS_CHECKPOINT_FNS(SNAPSHOT, snapshot)
^~~~~~~~~~~~~~~~~~~~
include/linux/nilfs2_ondisk.h: In function `nilfs_segment_usage_set_clean':
include/linux/nilfs2_ondisk.h:622:19: error: implicit declaration of function `cpu_to_le64' [-Werror=implicit-function-declaration]
su->su_lastmod = cpu_to_le64(0);
^~~~~~~~~~~--- include/uapi/linux/nilfs2_ondisk.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
include/uapi/linux/nilfs2_ondisk.h +12 -12
@@ -28,7 +28,7 @@#include <linux/types.h> #include <linux/magic.h> - +#include <asm/byteorder.h> #define NILFS_INODE_BMAP_SIZE 7
@@ -532,19 +532,19 @@ enum { static inline void \ nilfs_checkpoint_set_##name(struct nilfs_checkpoint *cp) \ { \ - cp->cp_flags = cpu_to_le32(le32_to_cpu(cp->cp_flags) | \ - (1UL << NILFS_CHECKPOINT_##flag)); \ + cp->cp_flags = __cpu_to_le32(__le32_to_cpu(cp->cp_flags) | \ + (1UL << NILFS_CHECKPOINT_##flag)); \ } \ static inline void \ nilfs_checkpoint_clear_##name(struct nilfs_checkpoint *cp) \ { \ - cp->cp_flags = cpu_to_le32(le32_to_cpu(cp->cp_flags) & \ + cp->cp_flags = __cpu_to_le32(__le32_to_cpu(cp->cp_flags) & \ ~(1UL << NILFS_CHECKPOINT_##flag)); \ } \ static inline int \ nilfs_checkpoint_##name(const struct nilfs_checkpoint *cp) \ { \ - return !!(le32_to_cpu(cp->cp_flags) & \ + return !!(__le32_to_cpu(cp->cp_flags) & \ (1UL << NILFS_CHECKPOINT_##flag)); \ }
@@ -594,20 +594,20 @@ enum { static inline void \ nilfs_segment_usage_set_##name(struct nilfs_segment_usage *su) \ { \ - su->su_flags = cpu_to_le32(le32_to_cpu(su->su_flags) | \ + su->su_flags = __cpu_to_le32(__le32_to_cpu(su->su_flags) | \ (1UL << NILFS_SEGMENT_USAGE_##flag));\ } \ static inline void \ nilfs_segment_usage_clear_##name(struct nilfs_segment_usage *su) \ { \ su->su_flags = \ - cpu_to_le32(le32_to_cpu(su->su_flags) & \ + __cpu_to_le32(__le32_to_cpu(su->su_flags) & \ ~(1UL << NILFS_SEGMENT_USAGE_##flag)); \ } \ static inline int \ nilfs_segment_usage_##name(const struct nilfs_segment_usage *su) \ { \ - return !!(le32_to_cpu(su->su_flags) & \ + return !!(__le32_to_cpu(su->su_flags) & \ (1UL << NILFS_SEGMENT_USAGE_##flag)); \ }
@@ -618,15 +618,15 @@ NILFS_SEGMENT_USAGE_FNS(ERROR, error)static inline void nilfs_segment_usage_set_clean (struct nilfs_segment_usage *su) { - su->su_lastmod =cpu_to_le64 (0 ); - su->su_nblocks =cpu_to_le32 (0 ); - su->su_flags =cpu_to_le32 (0 ); + su->su_lastmod =__cpu_to_le64 (0 ); + su->su_nblocks =__cpu_to_le32 (0 ); + su->su_flags =__cpu_to_le32 (0 ); }static inline int nilfs_segment_usage_clean (const struct nilfs_segment_usage *su) { -return !le32_to_cpu (su->su_flags); +return !__le32_to_cpu (su->su_flags); }/**
Greg Kroah-Hartman
maintainerPATCH 43/54 arm64: crypto: remove accidentally backported files
In reply to Greg Kroah-HartmanFrom: Mark Rutland <[email protected]>
In the v4.9.y backport commit:
5ac0682830b31c4fba72a208a3c1c4bbfcc9f7f8
("arm64: Add ARM_SMCCC_ARCH_WORKAROUND_1 BP hardening support")
... I accidentally added unrelated arm64/crypto files which were not part of the upstream commit:
b092201e0020614127f495c092e0a12d26a2116e
... and are not used at all in the v4.9.y tree.
This patch reverts the accidental addition. These files should not have been backported, and having them in the v4.9.y tree is at best confusing.
--- arch/arm64/crypto/sha256-core.S | 2061 ---------------------------------------- arch/arm64/crypto/sha512-core.S | 1085 --------------------- 2 files changed, 3146 deletions(-)
arch/arm64/crypto/sha256-core.S deleted +0 -2061
@@ -1,2061 +0,0 @@ -// Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved. -// -// Licensed under the OpenSSL license (the "License"). You may not use -// this file except in compliance with the License. You can obtain a copy -// in the file LICENSE in the source distribution or at -// https://www.openssl.org/source/license.html - -// ==================================================================== -// Written by Andy Polyakov <[email protected]> for the OpenSSL -// project. The module is, however, dual licensed under OpenSSL and -// CRYPTOGAMS licenses depending on where you obtain it. For further -// details see http://www.openssl.org/~appro/cryptogams/. -// -// Permission to use under GPLv2 terms is granted. -// ==================================================================== -// -// SHA256/512 for ARMv8. -// -// Performance in cycles per processed byte and improvement coefficient -// over code generated with "default" compiler: -// -// SHA256-hw SHA256(*) SHA512 -// Apple A7 1.97 10.5 (+33%) 6.73 (-1%(**)) -// Cortex-A53 2.38 15.5 (+115%) 10.0 (+150%(***)) -// Cortex-A57 2.31 11.6 (+86%) 7.51 (+260%(***)) -// Denver 2.01 10.5 (+26%) 6.70 (+8%) -// X-Gene 20.0 (+100%) 12.8 (+300%(***)) -// Mongoose 2.36 13.0 (+50%) 8.36 (+33%) -// -// (*) Software SHA256 results are of lesser relevance, presented -// mostly for informational purposes. -// (**) The result is a trade-off: it's possible to improve it by -// 10% (or by 1 cycle per round), but at the cost of 20% loss -// on Cortex-A53 (or by 4 cycles per round). -// (***) Super-impressive coefficients over gcc-generated code are -// indication of some compiler "pathology", most notably code -// generated with -mgeneral-regs-only is significanty faster -// and the gap is only 40-90%. -// -// October 2016. -// -// Originally it was reckoned that it makes no sense to implement NEON -// version of SHA256 for 64-bit processors. This is because performance -// improvement on most wide-spread Cortex-A5x processors was observed -// to be marginal, same on Cortex-A53 and ~10% on A57. But then it was -// observed that 32-bit NEON SHA256 performs significantly better than -// 64-bit scalar version on *some* of the more recent processors. As -// result 64-bit NEON version of SHA256 was added to provide best -// all-round performance. For example it executes ~30% faster on X-Gene -// and Mongoose. [For reference, NEON version of SHA512 is bound to -// deliver much less improvement, likely *negative* on Cortex-A5x. -// Which is why NEON support is limited to SHA256.] - -#ifndef __KERNEL__ -# include "arm_arch.h" -#endif - -.text - -.extern OPENSSL_armcap_P -.globl sha256_block_data_order -.type sha256_block_data_order,%function -.align 6 -sha256_block_data_order: -#ifndef __KERNEL__ -# ifdef __ILP32__ - ldrsw x16,.LOPENSSL_armcap_P -# else - ldr x16,.LOPENSSL_armcap_P -# endif - adr x17,.LOPENSSL_armcap_P - add x16,x16,x17 - ldr w16,[x16] - tst w16,#ARMV8_SHA256 - b.ne .Lv8_entry - tst w16,#ARMV7_NEON - b.ne .Lneon_entry -#endif - stp x29,x30,[sp,#-128]! - add x29,sp,#0 - - stp x19,x20,[sp,#16] - stp x21,x22,[sp,#32] - stp x23,x24,[sp,#48] - stp x25,x26,[sp,#64] - stp x27,x28,[sp,#80] - sub sp,sp,#4*4 - - ldp w20,w21,[x0] // load context - ldp w22,w23,[x0,#2*4] - ldp w24,w25,[x0,#4*4] - add x2,x1,x2,lsl#6 // end of input - ldp w26,w27,[x0,#6*4] - adr x30,.LK256 - stp x0,x2,[x29,#96] - -.Loop: - ldp w3,w4,[x1],#2*4 - ldr w19,[x30],#4 // *K++ - eor w28,w21,w22 // magic seed - str x1,[x29,#112] -#ifndef __AARCH64EB__ - rev w3,w3 // 0 -#endif - ror w16,w24,#6 - add w27,w27,w19 // h+=K[i] - eor w6,w24,w24,ror#14 - and w17,w25,w24 - bic w19,w26,w24 - add w27,w27,w3 // h+=X[i] - orr w17,w17,w19 // Ch(e,f,g) - eor w19,w20,w21 // a^b, b^c in next round - eor w16,w16,w6,ror#11 // Sigma1(e) - ror w6,w20,#2 - add w27,w27,w17 // h+=Ch(e,f,g) - eor w17,w20,w20,ror#9 - add w27,w27,w16 // h+=Sigma1(e) - and w28,w28,w19 // (b^c)&=(a^b) - add w23,w23,w27 // d+=h - eor w28,w28,w21 // Maj(a,b,c) - eor w17,w6,w17,ror#13 // Sigma0(a) - add w27,w27,w28 // h+=Maj(a,b,c) - ldr w28,[x30],#4 // *K++, w19 in next round - //add w27,w27,w17 // h+=Sigma0(a) -#ifndef __AARCH64EB__ - rev w4,w4 // 1 -#endif - ldp w5,w6,[x1],#2*4 - add w27,w27,w17 // h+=Sigma0(a) - ror w16,w23,#6 - add w26,w26,w28 // h+=K[i] - eor w7,w23,w23,ror#14 - and w17,w24,w23 - bic w28,w25,w23 - add w26,w26,w4 // h+=X[i] - orr w17,w17,w28 // Ch(e,f,g) - eor w28,w27,w20 // a^b, b^c in next round - eor w16,w16,w7,ror#11 // Sigma1(e) - ror w7,w27,#2 - add w26,w26,w17 // h+=Ch(e,f,g) - eor w17,w27,w27,ror#9 - add w26,w26,w16 // h+=Sigma1(e) - and w19,w19,w28 // (b^c)&=(a^b) - add w22,w22,w26 // d+=h - eor w19,w19,w20 // Maj(a,b,c) - eor w17,w7,w17,ror#13 // Sigma0(a) - add w26,w26,w19 // h+=Maj(a,b,c) - ldr w19,[x30],#4 // *K++, w28 in next round - //add w26,w26,w17 // h+=Sigma0(a) -#ifndef __AARCH64EB__ - rev w5,w5 // 2 -#endif - add w26,w26,w17 // h+=Sigma0(a) - ror w16,w22,#6 - add w25,w25,w19 // h+=K[i] - eor w8,w22,w22,ror#14 - and w17,w23,w22 - bic w19,w24,w22 - add w25,w25,w5 // h+=X[i] - orr w17,w17,w19 // Ch(e,f,g) - eor w19,w26,w27 // a^b, b^c in next round - eor w16,w16,w8,ror#11 // Sigma1(e) - ror w8,w26,#2 - add w25,w25,w17 // h+=Ch(e,f,g) - eor w17,w26,w26,ror#9 - add w25,w25,w16 // h+=Sigma1(e) - and w28,w28,w19 // (b^c)&=(a^b) - add w21,w21,w25 // d+=h - eor w28,w28,w27 // Maj(a,b,c) - eor w17,w8,w17,ror#13 // Sigma0(a) - add w25,w25,w28 // h+=Maj(a,b,c) - ldr w28,[x30],#4 // *K++, w19 in next round - //add w25,w25,w17 // h+=Sigma0(a) -#ifndef __AARCH64EB__ - rev w6,w6 // 3 -#endif - ldp w7,w8,[x1],#2*4 - add w25,w25,w17 // h+=Sigma0(a) - ror w16,w21,#6 - add w24,w24,w28 // h+=K[i] - eor w9,w21,w21,ror#14 - and w17,w22,w21 - bic w28,w23,w21 - add w24,w24,w6 // h+=X[i] - orr w17,w17,w28 // Ch(e,f,g) - eor w28,w25,w26 // a^b, b^c in next round - eor w16,w16,w9,ror#11 // Sigma1(e) - ror w9,w25,#2 - add w24,w24,w17 // h+=Ch(e,f,g) - eor w17,w25,w25,ror#9 - add w24,w24,w16 // h+=Sigma1(e) - and w19,w19,w28 // (b^c)&=(a^b) - add w20,w20,w24 // d+=h - eor w19,w19,w26 // Maj(a,b,c) - eor w17,w9,w17,ror#13 // Sigma0(a) - add w24,w24,w19 // h+=Maj(a,b,c) - ldr w19,[x30],#4 // *K++, w28 in next round - //add w24,w24,w17 // h+=Sigma0(a) -#ifndef __AARCH64EB__ - rev w7,w7 // 4 -#endif - add w24,w24,w17 // h+=Sigma0(a) - ror w16,w20,#6 - add w23,w23,w19 // h+=K[i] - eor w10,w20,w20,ror#14 - and w17,w21,w20 - bic w19,w22,w20 - add w23,w23,w7 // h+=X[i] - orr w17,w17,w19 // Ch(e,f,g) - eor w19,w24,w25 // a^b, b^c in next round - eor w16,w16,w10,ror#11 // Sigma1(e) - ror w10,w24,#2 - add w23,w23,w17 // h+=Ch(e,f,g) - eor w17,w24,w24,ror#9 - add w23,w23,w16 // h+=Sigma1(e) - and w28,w28,w19 // (b^c)&=(a^b) - add w27,w27,w23 // d+=h - eor w28,w28,w25 // Maj(a,b,c) - eor w17,w10,w17,ror#13 // Sigma0(a) - add w23,w23,w28 // h+=Maj(a,b,c) - ldr w28,[x30],#4 // *K++, w19 in next round - //add w23,w23,w17 // h+=Sigma0(a) -#ifndef __AARCH64EB__ - rev w8,w8 // 5 -#endif - ldp w9,w10,[x1],#2*4 - add w23,w23,w17 // h+=Sigma0(a) - ror w16,w27,#6 - add w22,w22,w28 // h+=K[i] - eor w11,w27,w27,ror#14 - and w17,w20,w27 - bic w28,w21,w27 - add w22,w22,w8 // h+=X[i] - orr w17,w17,w28 // Ch(e,f,g) - eor w28,w23,w24 // a^b, b^c in next round - eor w16,w16,w11,ror#11 // Sigma1(e) - ror w11,w23,#2 - add w22,w22,w17 // h+=Ch(e,f,g) - eor w17,w23,w23,ror#9 - add w22,w22,w16 // h+=Sigma1(e) - and w19,w19,w28 // (b^c)&=(a^b) - add w26,w26,w22 // d+=h - eor w19,w19,w24 // Maj(a,b,c) - eor w17,w11,w17,ror#13 // Sigma0(a) - add w22,w22,w19 // h+=Maj(a,b,c) - ldr w19,[x30],#4 // *K++, w28 in next round - //add w22,w22,w17 // h+=Sigma0(a) -#ifndef __AARCH64EB__ - rev w9,w9 // 6 -#endif - add w22,w22,w17 // h+=Sigma0(a) - ror w16,w26,#6 - add w21,w21,w19 // h+=K[i] - eor w12,w26,w26,ror#14 - and w17,w27,w26 - bic w19,w20,w26 - add w21,w21,w9 // h+=X[i] - orr w17,w17,w19 // Ch(e,f,g) - eor w19,w22,w23 // a^b, b^c in next round - eor w16,w16,w12,ror#11 // Sigma1(e) - ror w12,w22,#2 - add w21,w21,w17 // h+=Ch(e,f,g) - eor w17,w22,w22,ror#9 - add w21,w21,w16 // h+=Sigma1(e) - and w28,w28,w19 // (b^c)&=(a^b) - add w25,w25,w21 // d+=h - eor w28,w28,w23 // Maj(a,b,c) - eor w17,w12,w17,ror#13 // Sigma0(a) - add w21,w21,w28 // h+=Maj(a,b,c) - ldr w28,[x30],#4 // *K++, w19 in next round - //add w21,w21,w17 // h+=Sigma0(a) -#ifndef __AARCH64EB__ - rev w10,w10 // 7 -#endif - ldp w11,w12,[x1],#2*4 - add w21,w21,w17 // h+=Sigma0(a) - ror w16,w25,#6 - add w20,w20,w28 // h+=K[i] - eor w13,w25,w25,ror#14 - and w17,w26,w25 - bic w28,w27,w25 - add w20,w20,w10 // h+=X[i] - orr w17,w17,w28 // Ch(e,f,g) - eor w28,w21,w22 // a^b, b^c in next round - eor w16,w16,w13,ror#11 // Sigma1(e) - ror w13,w21,#2 - add w20,w20,w17 // h+=Ch(e,f,g) - eor w17,w21,w21,ror#9 - add w20,w20,w16 // h+=Sigma1(e) - and w19,w19,w28 // (b^c)&=(a^b) - add w24,w24,w20 // d+=h - eor w19,w19,w22 // Maj(a,b,c) - eor w17,w13,w17,ror#13 // Sigma0(a) - add w20,w20,w19 // h+=Maj(a,b,c) - ldr w19,[x30],#4 // *K++, w28 in next round - //add w20,w20,w17 // h+=Sigma0(a) -#ifndef __AARCH64EB__ - rev w11,w11 // 8 -#endif - add w20,w20,w17 // h+=Sigma0(a) - ror w16,w24,#6 - add w27,w27,w19 // h+=K[i] - eor w14,w24,w24,ror#14 - and w17,w25,w24 - bic w19,w26,w24 - add w27,w27,w11 // h+=X[i] - orr w17,w17,w19 // Ch(e,f,g) - eor w19,w20,w21 // a^b, b^c in next round - eor w16,w16,w14,ror#11 // Sigma1(e) - ror w14,w20,#2 - add w27,w27,w17 // h+=Ch(e,f,g) - eor w17,w20,w20,ror#9 - add w27,w27,w16 // h+=Sigma1(e) - and w28,w28,w19 // (b^c)&=(a^b) - add w23,w23,w27 // d+=h - eor w28,w28,w21 // Maj(a,b,c) - eor w17,w14,w17,ror#13 // Sigma0(a) - add w27,w27,w28 // h+=Maj(a,b,c) - ldr w28,[x30],#4 // *K++, w19 in next round - //add w27,w27,w17 // h+=Sigma0(a) -#ifndef __AARCH64EB__ - rev w12,w12 // 9 -#endif - ldp w13,w14,[x1],#2*4 - add w27,w27,w17 // h+=Sigma0(a) - ror w16,w23,#6 - add w26,w26,w28 // h+=K[i] - eor w15,w23,w23,ror#14 - and w17,w24,w23 - bic w28,w25,w23 - add w26,w26,w12 // h+=X[i] - orr w17,w17,w28 // Ch(e,f,g) - eor w28,w27,w20 // a^b, b^c in next round - eor w16,w16,w15,ror#11 // Sigma1(e) - ror w15,w27,#2 - add w26,w26,w17 // h+=Ch(e,f,g) - eor w17,w27,w27,ror#9 - add w26,w26,w16 // h+=Sigma1(e) - and w19,w19,w28 // (b^c)&=(a^b) - add w22,w22,w26 // d+=h - eor w19,w19,w20 // Maj(a,b,c) - eor w17,w15,w17,ror#13 // Sigma0(a) - add w26,w26,w19 // h+=Maj(a,b,c) - ldr w19,[x30],#4 // *K++, w28 in next round - //add w26,w26,w17 // h+=Sigma0(a) -#ifndef __AARCH64EB__ - rev w13,w13 // 10 -#endif - add w26,w26,w17 // h+=Sigma0(a) - ror w16,w22,#6 - add w25,w25,w19 // h+=K[i] - eor w0,w22,w22,ror#14 - and w17,w23,w22 - bic w19,w24,w22 - add w25,w25,w13 // h+=X[i] - orr w17,w17,w19 // Ch(e,f,g) - eor w19,w26,w27 // a^b, b^c in next round - eor w16,w16,w0,ror#11 // Sigma1(e) - ror w0,w26,#2 - add w25,w25,w17 // h+=Ch(e,f,g) - eor w17,w26,w26,ror#9 - add w25,w25,w16 // h+=Sigma1(e) - and w28,w28,w19 // (b^c)&=(a^b) - add w21,w21,w25 // d+=h - eor w28,w28,w27 // Maj(a,b,c) - eor w17,w0,w17,ror#13 // Sigma0(a) - add w25,w25,w28 // h+=Maj(a,b,c) - ldr w28,[x30],#4 // *K++, w19 in next round - //add w25,w25,w17 // h+=Sigma0(a) -#ifndef __AARCH64EB__ - rev w14,w14 // 11 -#endif - ldp w15,w0,[x1],#2*4 - add w25,w25,w17 // h+=Sigma0(a) - str w6,[sp,#12] - ror w16,w21,#6 - add w24,w24,w28 // h+=K[i] - eor w6,w21,w21,ror#14 - and w17,w22,w21 - bic w28,w23,w21 - add w24,w24,w14 // h+=X[i] - orr w17,w17,w28 // Ch(e,f,g) - eor w28,w25,w26 // a^b, b^c in next round - eor w16,w16,w6,ror#11 // Sigma1(e) - ror w6,w25,#2 - add w24,w24,w17 // h+=Ch(e,f,g) - eor w17,w25,w25,ror#9 - add w24,w24,w16 // h+=Sigma1(e) - and w19,w19,w28 // (b^c)&=(a^b) - add w20,w20,w24 // d+=h - eor w19,w19,w26 // Maj(a,b,c) - eor w17,w6,w17,ror#13 // Sigma0(a) - add w24,w24,w19 // h+=Maj(a,b,c) - ldr w19,[x30],#4 // *K++, w28 in next round - //add w24,w24,w17 // h+=Sigma0(a) -#ifndef __AARCH64EB__ - rev w15,w15 // 12 -#endif - add w24,w24,w17 // h+=Sigma0(a) - str w7,[sp,#0] - ror w16,w20,#6 - add w23,w23,w19 // h+=K[i] - eor w7,w20,w20,ror#14 - and w17,w21,w20 - bic w19,w22,w20 - add w23,w23,w15 // h+=X[i] - orr w17,w17,w19 // Ch(e,f,g) - eor w19,w24,w25 // a^b, b^c in next round - eor w16,w16,w7,ror#11 // Sigma1(e) - ror w7,w24,#2 - add w23,w23,w17 // h+=Ch(e,f,g) - eor w17,w24,w24,ror#9 - add w23,w23,w16 // h+=Sigma1(e) - and w28,w28,w19 // (b^c)&=(a^b) - add w27,w27,w23 // d+=h - eor w28,w28,w25 // Maj(a,b,c) - eor w17,w7,w17,ror#13 // Sigma0(a) - add w23,w23,w28 // h+=Maj(a,b,c) - ldr w28,[x30],#4 // *K++, w19 in next round - //add w23,w23,w17 // h+=Sigma0(a) -#ifndef __AARCH64EB__ - rev w0,w0 // 13 -#endif - ldp w1,w2,[x1] - add w23,w23,w17 // h+=Sigma0(a) - str w8,[sp,#4] - ror w16,w27,#6 - add w22,w22,w28 // h+=K[i] - eor w8,w27,w27,ror#14 - and w17,w20,w27 - bic w28,w21,w27 - add w22,w22,w0 // h+=X[i] - orr w17,w17,w28 // Ch(e,f,g) - eor w28,w23,w24 // a^b, b^c in next round - eor w16,w16,w8,ror#11 // Sigma1(e) - ror w8,w23,#2 - add w22,w22,w17 // h+=Ch(e,f,g) - eor w17,w23,w23,ror#9 - add w22,w22,w16 // h+=Sigma1(e) - and w19,w19,w28 // (b^c)&=(a^b) - add w26,w26,w22 // d+=h - eor w19,w19,w24 // Maj(a,b,c) - eor w17,w8,w17,ror#13 // Sigma0(a) - add w22,w22,w19 // h+=Maj(a,b,c) - ldr w19,[x30],#4 // *K++, w28 in next round - //add w22,w22,w17 // h+=Sigma0(a) -#ifndef __AARCH64EB__ - rev w1,w1 // 14 -#endif - ldr w6,[sp,#12] - add w22,w22,w17 // h+=Sigma0(a) - str w9,[sp,#8] - ror w16,w26,#6 - add w21,w21,w19 // h+=K[i] - eor w9,w26,w26,ror#14 - and w17,w27,w26 - bic w19,w20,w26 - add w21,w21,w1 // h+=X[i] - orr w17,w17,w19 // Ch(e,f,g) - eor w19,w22,w23 // a^b, b^c in next round - eor w16,w16,w9,ror#11 // Sigma1(e) - ror w9,w22,#2 - add w21,w21,w17 // h+=Ch(e,f,g) - eor w17,w22,w22,ror#9 - add w21,w21,w16 // h+=Sigma1(e) - and w28,w28,w19 // (b^c)&=(a^b) - add w25,w25,w21 // d+=h - eor w28,w28,w23 // Maj(a,b,c) - eor w17,w9,w17,ror#13 // Sigma0(a) - add w21,w21,w28 // h+=Maj(a,b,c) - ldr w28,[x30],#4 // *K++, w19 in next round - //add w21,w21,w17 // h+=Sigma0(a) -#ifndef __AARCH64EB__ - rev w2,w2 // 15 -#endif - ldr w7,[sp,#0] - add w21,w21,w17 // h+=Sigma0(a) - str w10,[sp,#12] - ror w16,w25,#6 - add w20,w20,w28 // h+=K[i] - ror w9,w4,#7 - and w17,w26,w25 - ror w8,w1,#17 - bic w28,w27,w25 - ror w10,w21,#2 - add w20,w20,w2 // h+=X[i] - eor w16,w16,w25,ror#11 - eor w9,w9,w4,ror#18 - orr w17,w17,w28 // Ch(e,f,g) - eor w28,w21,w22 // a^b, b^c in next round - eor w16,w16,w25,ror#25 // Sigma1(e) - eor w10,w10,w21,ror#13 - add w20,w20,w17 // h+=Ch(e,f,g) - and w19,w19,w28 // (b^c)&=(a^b) - eor w8,w8,w1,ror#19 - eor w9,w9,w4,lsr#3 // sigma0(X[i+1]) - add w20,w20,w16 // h+=Sigma1(e) - eor w19,w19,w22 // Maj(a,b,c) - eor w17,w10,w21,ror#22 // Sigma0(a) - eor w8,w8,w1,lsr#10 // sigma1(X[i+14]) - add w3,w3,w12 - add w24,w24,w20 // d+=h - add w20,w20,w19 // h+=Maj(a,b,c) - ldr w19,[x30],#4 // *K++, w28 in next round - add w3,w3,w9 - add w20,w20,w17 // h+=Sigma0(a) - add w3,w3,w8 -.Loop_16_xx: - ldr w8,[sp,#4] - str w11,[sp,#0] - ror w16,w24,#6 - add w27,w27,w19 // h+=K[i] - ror w10,w5,#7 - and w17,w25,w24 - ror w9,w2,#17 - bic w19,w26,w24 - ror w11,w20,#2 - add w27,w27,w3 // h+=X[i] - eor w16,w16,w24,ror#11 - eor w10,w10,w5,ror#18 - orr w17,w17,w19 // Ch(e,f,g) - eor w19,w20,w21 // a^b, b^c in next round - eor w16,w16,w24,ror#25 // Sigma1(e) - eor w11,w11,w20,ror#13 - add w27,w27,w17 // h+=Ch(e,f,g) - and w28,w28,w19 // (b^c)&=(a^b) - eor w9,w9,w2,ror#19 - eor w10,w10,w5,lsr#3 // sigma0(X[i+1]) - add w27,w27,w16 // h+=Sigma1(e) - eor w28,w28,w21 // Maj(a,b,c) - eor w17,w11,w20,ror#22 // Sigma0(a) - eor w9,w9,w2,lsr#10 // sigma1(X[i+14]) - add w4,w4,w13 - add w23,w23,w27 // d+=h - add w27,w27,w28 // h+=Maj(a,b,c) - ldr w28,[x30],#4 // *K++, w19 in next round - add w4,w4,w10 - add w27,w27,w17 // h+=Sigma0(a) - add w4,w4,w9 - ldr w9,[sp,#8] - str w12,[sp,#4] - ror w16,w23,#6 - add w26,w26,w28 // h+=K[i] - ror w11,w6,#7 - and w17,w24,w23 - ror w10,w3,#17 - bic w28,w25,w23 - ror w12,w27,#2 - add w26,w26,w4 // h+=X[i] - eor w16,w16,w23,ror#11 - eor w11,w11,w6,ror#18 - orr w17,w17,w28 // Ch(e,f,g) - eor w28,w27,w20 // a^b, b^c in next round - eor w16,w16,w23,ror#25 // Sigma1(e) - eor w12,w12,w27,ror#13 - add w26,w26,w17 // h+=Ch(e,f,g) - and w19,w19,w28 // (b^c)&=(a^b) - eor w10,w10,w3,ror#19 - eor w11,w11,w6,lsr#3 // sigma0(X[i+1]) - add w26,w26,w16 // h+=Sigma1(e) - eor w19,w19,w20 // Maj(a,b,c) - eor w17,w12,w27,ror#22 // Sigma0(a) - eor w10,w10,w3,lsr#10 // sigma1(X[i+14]) - add w5,w5,w14 - add w22,w22,w26 // d+=h - add w26,w26,w19 // h+=Maj(a,b,c) - ldr w19,[x30],#4 // *K++, w28 in next round - add w5,w5,w11 - add w26,w26,w17 // h+=Sigma0(a) - add w5,w5,w10 - ldr w10,[sp,#12] - str w13,[sp,#8] - ror w16,w22,#6 - add w25,w25,w19 // h+=K[i] - ror w12,w7,#7 - and w17,w23,w22 - ror w11,w4,#17 - bic w19,w24,w22 - ror w13,w26,#2 - add w25,w25,w5 // h+=X[i] - eor w16,w16,w22,ror#11 - eor w12,w12,w7,ror#18 - orr w17,w17,w19 // Ch(e,f,g) - eor w19,w26,w27 // a^b, b^c in next round - eor w16,w16,w22,ror#25 // Sigma1(e) - eor w13,w13,w26,ror#13 - add w25,w25,w17 // h+=Ch(e,f,g) - and w28,w28,w19 // (b^c)&=(a^b) - eor w11,w11,w4,ror#19 - eor w12,w12,w7,lsr#3 // sigma0(X[i+1]) - add w25,w25,w16 // h+=Sigma1(e) - eor w28,w28,w27 // Maj(a,b,c) - eor w17,w13,w26,ror#22 // Sigma0(a) - eor w11,w11,w4,lsr#10 // sigma1(X[i+14]) - add w6,w6,w15 - add w21,w21,w25 // d+=h - add w25,w25,w28 // h+=Maj(a,b,c) - ldr w28,[x30],#4 // *K++, w19 in next round - add w6,w6,w12 - add w25,w25,w17 // h+=Sigma0(a) - add w6,w6,w11 - ldr w11,[sp,#0] - str w14,[sp,#12] - ror w16,w21,#6 - add w24,w24,w28 // h+=K[i] - ror w13,w8,#7 - and w17,w22,w21 - ror w12,w5,#17 - bic w28,w23,w21 - ror w14,w25,#2 - add w24,w24,w6 // h+=X[i] - eor w16,w16,w21,ror#11 - eor w13,w13,w8,ror#18 - orr w17,w17,w28 // Ch(e,f,g) - eor w28,w25,w26 // a^b, b^c in next round - eor w16,w16,w21,ror#25 // Sigma1(e) - eor w14,w14,w25,ror#13 - add w24,w24,w17 // h+=Ch(e,f,g) - and w19,w19,w28 // (b^c)&=(a^b) - eor w12,w12,w5,ror#19 - eor w13,w13,w8,lsr#3 // sigma0(X[i+1]) - add w24,w24,w16 // h+=Sigma1(e) - eor w19,w19,w26 // Maj(a,b,c) - eor w17,w14,w25,ror#22 // Sigma0(a) - eor w12,w12,w5,lsr#10 // sigma1(X[i+14]) - add w7,w7,w0 - add w20,w20,w24 // d+=h - add w24,w24,w19 // h+=Maj(a,b,c) - ldr w19,[x30],#4 // *K++, w28 in next round - add w7,w7,w13 - add w24,w24,w17 // h+=Sigma0(a) - add w7,w7,w12 - ldr w12,[sp,#4] - str w15,[sp,#0] - ror w16,w20,#6 - add w23,w23,w19 // h+=K[i] - ror w14,w9,#7 - and w17,w21,w20 - ror w13,w6,#17 - bic w19,w22,w20 - ror w15,w24,#2 - add w23,w23,w7 // h+=X[i] - eor w16,w16,w20,ror#11 - eor w14,w14,w9,ror#18 - orr w17,w17,w19 // Ch(e,f,g) - eor w19,w24,w25 // a^b, b^c in next round - eor w16,w16,w20,ror#25 // Sigma1(e) - eor w15,w15,w24,ror#13 - add w23,w23,w17 // h+=Ch(e,f,g) - and w28,w28,w19 // (b^c)&=(a^b) - eor w13,w13,w6,ror#19 - eor w14,w14,w9,lsr#3 // sigma0(X[i+1]) - add w23,w23,w16 // h+=Sigma1(e) - eor w28,w28,w25 // Maj(a,b,c) - eor w17,w15,w24,ror#22 // Sigma0(a) - eor w13,w13,w6,lsr#10 // sigma1(X[i+14]) - add w8,w8,w1 - add w27,w27,w23 // d+=h - add w23,w23,w28 // h+=Maj(a,b,c) - ldr w28,[x30],#4 // *K++, w19 in next round - add w8,w8,w14 - add w23,w23,w17 // h+=Sigma0(a) - add w8,w8,w13 - ldr w13,[sp,#8] - str w0,[sp,#4] - ror w16,w27,#6 - add w22,w22,w28 // h+=K[i] - ror w15,w10,#7 - and w17,w20,w27 - ror w14,w7,#17 - bic w28,w21,w27 - ror w0,w23,#2 - add w22,w22,w8 // h+=X[i] - eor w16,w16,w27,ror#11 - eor w15,w15,w10,ror#18 - orr w17,w17,w28 // Ch(e,f,g) - eor w28,w23,w24 // a^b, b^c in next round - eor w16,w16,w27,ror#25 // Sigma1(e) - eor w0,w0,w23,ror#13 - add w22,w22,w17 // h+=Ch(e,f,g) - and w19,w19,w28 // (b^c)&=(a^b) - eor w14,w14,w7,ror#19 - eor w15,w15,w10,lsr#3 // sigma0(X[i+1]) - add w22,w22,w16 // h+=Sigma1(e) - eor w19,w19,w24 // Maj(a,b,c) - eor w17,w0,w23,ror#22 // Sigma0(a) - eor w14,w14,w7,lsr#10 // sigma1(X[i+14]) - add w9,w9,w2 - add w26,w26,w22 // d+=h - add w22,w22,w19 // h+=Maj(a,b,c) - ldr w19,[x30],#4 // *K++, w28 in next round - add w9,w9,w15 - add w22,w22,w17 // h+=Sigma0(a) - add w9,w9,w14 - ldr w14,[sp,#12] - str w1,[sp,#8] - ror w16,w26,#6 - add w21,w21,w19 // h+=K[i] - ror w0,w11,#7 - and w17,w27,w26 - ror w15,w8,#17 - bic w19,w20,w26 - ror w1,w22,#2 - add w21,w21,w9 // h+=X[i] - eor w16,w16,w26,ror#11 - eor w0,w0,w11,ror#18 - orr w17,w17,w19 // Ch(e,f,g) - eor w19,w22,w23 // a^b, b^c in next round - eor w16,w16,w26,ror#25 // Sigma1(e) - eor w1,w1,w22,ror#13 - add w21,w21,w17 // h+=Ch(e,f,g) - and w28,w28,w19 // (b^c)&=(a^b) - eor w15,w15,w8,ror#19 - eor w0,w0,w11,lsr#3 // sigma0(X[i+1]) - add w21,w21,w16 // h+=Sigma1(e) - eor w28,w28,w23 // Maj(a,b,c) - eor w17,w1,w22,ror#22 // Sigma0(a) - eor w15,w15,w8,lsr#10 // sigma1(X[i+14]) - add w10,w10,w3 - add w25,w25,w21 // d+=h - add w21,w21,w28 // h+=Maj(a,b,c) - ldr w28,[x30],#4 // *K++, w19 in next round - add w10,w10,w0 - add w21,w21,w17 // h+=Sigma0(a) - add w10,w10,w15 - ldr w15,[sp,#0] - str w2,[sp,#12] - ror w16,w25,#6 - add w20,w20,w28 // h+=K[i] - ror w1,w12,#7 - and w17,w26,w25 - ror w0,w9,#17 - bic w28,w27,w25 - ror w2,w21,#2 - add w20,w20,w10 // h+=X[i] - eor w16,w16,w25,ror#11 - eor w1,w1,w12,ror#18 - orr w17,w17,w28 // Ch(e,f,g) - eor w28,w21,w22 // a^b, b^c in next round - eor w16,w16,w25,ror#25 // Sigma1(e) - eor w2,w2,w21,ror#13 - add w20,w20,w17 // h+=Ch(e,f,g) - and w19,w19,w28 // (b^c)&=(a^b) - eor w0,w0,w9,ror#19 - eor w1,w1,w12,lsr#3 // sigma0(X[i+1]) - add w20,w20,w16 // h+=Sigma1(e) - eor w19,w19,w22 // Maj(a,b,c) - eor w17,w2,w21,ror#22 // Sigma0(a) - eor w0,w0,w9,lsr#10 // sigma1(X[i+14]) - add w11,w11,w4 - add w24,w24,w20 // d+=h - add w20,w20,w19 // h+=Maj(a,b,c) - ldr w19,[x30],#4 // *K++, w28 in next round - add w11,w11,w1 - add w20,w20,w17 // h+=Sigma0(a) - add w11,w11,w0 - ldr w0,[sp,#4] - str w3,[sp,#0] - ror w16,w24,#6 - add w27,w27,w19 // h+=K[i] - ror w2,w13,#7 - and w17,w25,w24 - ror w1,w10,#17 - bic w19,w26,w24 - ror w3,w20,#2 - add w27,w27,w11 // h+=X[i] - eor w16,w16,w24,ror#11 - eor w2,w2,w13,ror#18 - orr w17,w17,w19 // Ch(e,f,g) - eor w19,w20,w21 // a^b, b^c in next round - eor w16,w16,w24,ror#25 // Sigma1(e) - eor w3,w3,w20,ror#13 - add w27,w27,w17 // h+=Ch(e,f,g) - and w28,w28,w19 // (b^c)&=(a^b) - eor w1,w1,w10,ror#19 - eor w2,w2,w13,lsr#3 // sigma0(X[i+1]) - add w27,w27,w16 // h+=Sigma1(e) - eor w28,w28,w21 // Maj(a,b,c) - eor w17,w3,w20,ror#22 // Sigma0(a) - eor w1,w1,w10,lsr#10 // sigma1(X[i+14]) - add w12,w12,w5 - add w23,w23,w27 // d+=h - add w27,w27,w28 // h+=Maj(a,b,c) - ldr w28,[x30],#4 // *K++, w19 in next round - add w12,w12,w2 - add w27,w27,w17 // h+=Sigma0(a) - add w12,w12,w1 - ldr w1,[sp,#8] - str w4,[sp,#4] - ror w16,w23,#6 - add w26,w26,w28 // h+=K[i] - ror w3,w14,#7 - and w17,w24,w23 - ror w2,w11,#17 - bic w28,w25,w23 - ror w4,w27,#2 - add w26,w26,w12 // h+=X[i] - eor w16,w16,w23,ror#11 - eor w3,w3,w14,ror#18 - orr w17,w17,w28 // Ch(e,f,g) - eor w28,w27,w20 // a^b, b^c in next round - eor w16,w16,w23,ror#25 // Sigma1(e) - eor w4,w4,w27,ror#13 - add w26,w26,w17 // h+=Ch(e,f,g) - and w19,w19,w28 // (b^c)&=(a^b) - eor w2,w2,w11,ror#19 - eor w3,w3,w14,lsr#3 // sigma0(X[i+1]) - add w26,w26,w16 // h+=Sigma1(e) - eor w19,w19,w20 // Maj(a,b,c) - eor w17,w4,w27,ror#22 // Sigma0(a) - eor w2,w2,w11,lsr#10 // sigma1(X[i+14]) - add w13,w13,w6 - add w22,w22,w26 // d+=h - add w26,w26,w19 // h+=Maj(a,b,c) - ldr w19,[x30],#4 // *K++, w28 in next round - add w13,w13,w3 - add w26,w26,w17 // h+=Sigma0(a) - add w13,w13,w2 - ldr w2,[sp,#12] - str w5,[sp,#8] - ror w16,w22,#6 - add w25,w25,w19 // h+=K[i] - ror w4,w15,#7 - and w17,w23,w22 - ror w3,w12,#17 - bic w19,w24,w22 - ror w5,w26,#2 - add w25,w25,w13 // h+=X[i] - eor w16,w16,w22,ror#11 - eor w4,w4,w15,ror#18 - orr w17,w17,w19 // Ch(e,f,g) - eor w19,w26,w27 // a^b, b^c in next round - eor w16,w16,w22,ror#25 // Sigma1(e) - eor w5,w5,w26,ror#13 - add w25,w25,w17 // h+=Ch(e,f,g) - and w28,w28,w19 // (b^c)&=(a^b) - eor w3,w3,w12,ror#19 - eor w4,w4,w15,lsr#3 // sigma0(X[i+1]) - add w25,w25,w16 // h+=Sigma1(e) - eor w28,w28,w27 // Maj(a,b,c) - eor w17,w5,w26,ror#22 // Sigma0(a) - eor w3,w3,w12,lsr#10 // sigma1(X[i+14]) - add w14,w14,w7 - add w21,w21,w25 // d+=h - add w25,w25,w28 // h+=Maj(a,b,c) - ldr w28,[x30],#4 // *K++, w19 in next round - add w14,w14,w4 - add w25,w25,w17 // h+=Sigma0(a) - add w14,w14,w3 - ldr w3,[sp,#0] - str w6,[sp,#12] - ror w16,w21,#6 - add w24,w24,w28 // h+=K[i] - ror w5,w0,#7 - and w17,w22,w21 - ror w4,w13,#17 - bic w28,w23,w21 - ror w6,w25,#2 - add w24,w24,w14 // h+=X[i] - eor w16,w16,w21,ror#11 - eor w5,w5,w0,ror#18 - orr w17,w17,w28 // Ch(e,f,g) - eor w28,w25,w26 // a^b, b^c in next round - eor w16,w16,w21,ror#25 // Sigma1(e) - eor w6,w6,w25,ror#13 - add w24,w24,w17 // h+=Ch(e,f,g) - and w19,w19,w28 // (b^c)&=(a^b) - eor w4,w4,w13,ror#19 - eor w5,w5,w0,lsr#3 // sigma0(X[i+1]) - add w24,w24,w16 // h+=Sigma1(e) - eor w19,w19,w26 // Maj(a,b,c) - eor w17,w6,w25,ror#22 // Sigma0(a) - eor w4,w4,w13,lsr#10 // sigma1(X[i+14]) - add w15,w15,w8 - add w20,w20,w24 // d+=h - add w24,w24,w19 // h+=Maj(a,b,c) - ldr w19,[x30],#4 // *K++, w28 in next round - add w15,w15,w5 - add w24,w24,w17 // h+=Sigma0(a) - add w15,w15,w4 - ldr w4,[sp,#4] - str w7,[sp,#0] - ror w16,w20,#6 - add w23,w23,w19 // h+=K[i] - ror w6,w1,#7 - and w17,w21,w20 - ror w5,w14,#17 - bic w19,w22,w20 - ror w7,w24,#2 - add w23,w23,w15 // h+=X[i] - eor w16,w16,w20,ror#11 - eor w6,w6,w1,ror#18 - orr w17,w17,w19 // Ch(e,f,g) - eor w19,w24,w25 // a^b, b^c in next round - eor w16,w16,w20,ror#25 // Sigma1(e) - eor w7,w7,w24,ror#13 - add w23,w23,w17 // h+=Ch(e,f,g) - and w28,w28,w19 // (b^c)&=(a^b) - eor w5,w5,w14,ror#19 - eor w6,w6,w1,lsr#3 // sigma0(X[i+1]) - add w23,w23,w16 // h+=Sigma1(e) - eor w28,w28,w25 // Maj(a,b,c) - eor w17,w7,w24,ror#22 // Sigma0(a) - eor w5,w5,w14,lsr#10 // sigma1(X[i+14]) - add w0,w0,w9 - add w27,w27,w23 // d+=h - add w23,w23,w28 // h+=Maj(a,b,c) - ldr w28,[x30],#4 // *K++, w19 in next round - add w0,w0,w6 - add w23,w23,w17 // h+=Sigma0(a) - add w0,w0,w5 - ldr w5,[sp,#8] - str w8,[sp,#4] - ror w16,w27,#6 - add w22,w22,w28 // h+=K[i] - ror w7,w2,#7 - and w17,w20,w27 - ror w6,w15,#17 - bic w28,w21,w27 - ror w8,w23,#2 - add w22,w22,w0 // h+=X[i] - eor w16,w16,w27,ror#11 - eor w7,w7,w2,ror#18 - orr w17,w17,w28 // Ch(e,f,g) - eor w28,w23,w24 // a^b, b^c in next round - eor w16,w16,w27,ror#25 // Sigma1(e) - eor w8,w8,w23,ror#13 - add w22,w22,w17 // h+=Ch(e,f,g) - and w19,w19,w28 // (b^c)&=(a^b) - eor w6,w6,w15,ror#19 - eor w7,w7,w2,lsr#3 // sigma0(X[i+1]) - add w22,w22,w16 // h+=Sigma1(e) - eor w19,w19,w24 // Maj(a,b,c) - eor w17,w8,w23,ror#22 // Sigma0(a) - eor w6,w6,w15,lsr#10 // sigma1(X[i+14]) - add w1,w1,w10 - add w26,w26,w22 // d+=h - add w22,w22,w19 // h+=Maj(a,b,c) - ldr w19,[x30],#4 // *K++, w28 in next round - add w1,w1,w7 - add w22,w22,w17 // h+=Sigma0(a) - add w1,w1,w6 - ldr w6,[sp,#12] - str w9,[sp,#8] - ror w16,w26,#6 - add w21,w21,w19 // h+=K[i] - ror w8,w3,#7 - and w17,w27,w26 - ror w7,w0,#17 - bic w19,w20,w26 - ror w9,w22,#2 - add w21,w21,w1 // h+=X[i] - eor w16,w16,w26,ror#11 - eor w8,w8,w3,ror#18 - orr w17,w17,w19 // Ch(e,f,g) - eor w19,w22,w23 // a^b, b^c in next round - eor w16,w16,w26,ror#25 // Sigma1(e) - eor w9,w9,w22,ror#13 - add w21,w21,w17 // h+=Ch(e,f,g) - and w28,w28,w19 // (b^c)&=(a^b) - eor w7,w7,w0,ror#19 - eor w8,w8,w3,lsr#3 // sigma0(X[i+1]) - add w21,w21,w16 // h+=Sigma1(e) - eor w28,w28,w23 // Maj(a,b,c) - eor w17,w9,w22,ror#22 // Sigma0(a) - eor w7,w7,w0,lsr#10 // sigma1(X[i+14]) - add w2,w2,w11 - add w25,w25,w21 // d+=h - add w21,w21,w28 // h+=Maj(a,b,c) - ldr w28,[x30],#4 // *K++, w19 in next round - add w2,w2,w8 - add w21,w21,w17 // h+=Sigma0(a) - add w2,w2,w7 - ldr w7,[sp,#0] - str w10,[sp,#12] - ror w16,w25,#6 - add w20,w20,w28 // h+=K[i] - ror w9,w4,#7 - and w17,w26,w25 - ror w8,w1,#17 - bic w28,w27,w25 - ror w10,w21,#2 - add w20,w20,w2 // h+=X[i] - eor w16,w16,w25,ror#11 - eor w9,w9,w4,ror#18 - orr w17,w17,w28 // Ch(e,f,g) - eor w28,w21,w22 // a^b, b^c in next round - eor w16,w16,w25,ror#25 // Sigma1(e) - eor w10,w10,w21,ror#13 - add w20,w20,w17 // h+=Ch(e,f,g) - and w19,w19,w28 // (b^c)&=(a^b) - eor w8,w8,w1,ror#19 - eor w9,w9,w4,lsr#3 // sigma0(X[i+1]) - add w20,w20,w16 // h+=Sigma1(e) - eor w19,w19,w22 // Maj(a,b,c) - eor w17,w10,w21,ror#22 // Sigma0(a) - eor w8,w8,w1,lsr#10 // sigma1(X[i+14]) - add w3,w3,w12 - add w24,w24,w20 // d+=h - add w20,w20,w19 // h+=Maj(a,b,c) - ldr w19,[x30],#4 // *K++, w28 in next round - add w3,w3,w9 - add w20,w20,w17 // h+=Sigma0(a) - add w3,w3,w8 - cbnz w19,.Loop_16_xx - - ldp x0,x2,[x29,#96] - ldr x1,[x29,#112] - sub x30,x30,#260 // rewind - - ldp w3,w4,[x0] - ldp w5,w6,[x0,#2*4] - add x1,x1,#14*4 // advance input pointer - ldp w7,w8,[x0,#4*4] - add w20,w20,w3 - ldp w9,w10,[x0,#6*4] - add w21,w21,w4 - add w22,w22,w5 - add w23,w23,w6 - stp w20,w21,[x0] - add w24,w24,w7 - add w25,w25,w8 - stp w22,w23,[x0,#2*4] - add w26,w26,w9 - add w27,w27,w10 - cmp x1,x2 - stp w24,w25,[x0,#4*4] - stp w26,w27,[x0,#6*4] - b.ne .Loop - - ldp x19,x20,[x29,#16] - add sp,sp,#4*4 - ldp x21,x22,[x29,#32] - ldp x23,x24,[x29,#48] - ldp x25,x26,[x29,#64] - ldp x27,x28,[x29,#80] - ldp x29,x30,[sp],#128 - ret -.size sha256_block_data_order,.-sha256_block_data_order - -.align 6 -.type .LK256,%object -.LK256: - .long 0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5 - .long 0x3956c25b,0x59f111f1,0x923f82a4,0xab1c5ed5 - .long 0xd807aa98,0x12835b01,0x243185be,0x550c7dc3 - .long 0x72be5d74,0x80deb1fe,0x9bdc06a7,0xc19bf174 - .long 0xe49b69c1,0xefbe4786,0x0fc19dc6,0x240ca1cc - .long 0x2de92c6f,0x4a7484aa,0x5cb0a9dc,0x76f988da - .long 0x983e5152,0xa831c66d,0xb00327c8,0xbf597fc7 - .long 0xc6e00bf3,0xd5a79147,0x06ca6351,0x14292967 - .long 0x27b70a85,0x2e1b2138,0x4d2c6dfc,0x53380d13 - .long 0x650a7354,0x766a0abb,0x81c2c92e,0x92722c85 - .long 0xa2bfe8a1,0xa81a664b,0xc24b8b70,0xc76c51a3 - .long 0xd192e819,0xd6990624,0xf40e3585,0x106aa070 - .long 0x19a4c116,0x1e376c08,0x2748774c,0x34b0bcb5 - .long 0x391c0cb3,0x4ed8aa4a,0x5b9cca4f,0x682e6ff3 - .long 0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208 - .long 0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2 - .long 0 //terminator -.size .LK256,.-.LK256 -#ifndef __KERNEL__ -.align 3 -.LOPENSSL_armcap_P: -# ifdef __ILP32__ - .long OPENSSL_armcap_P-. -# else - .quad OPENSSL_armcap_P-. -# endif -#endif -.asciz "SHA256 block transform for ARMv8, CRYPTOGAMS by <[email protected]>" -.align 2 -#ifndef __KERNEL__ -.type sha256_block_armv8,%function -.align 6 -sha256_block_armv8: -.Lv8_entry: - stp x29,x30,[sp,#-16]! - add x29,sp,#0 - - ld1 {v0.4s,v1.4s},[x0] - adr x3,.LK256 - -.Loop_hw: - ld1 {v4.16b-v7.16b},[x1],#64 - sub x2,x2,#1 - ld1 {v16.4s},[x3],#16 - rev32 v4.16b,v4.16b - rev32 v5.16b,v5.16b - rev32 v6.16b,v6.16b - rev32 v7.16b,v7.16b - orr v18.16b,v0.16b,v0.16b // offload - orr v19.16b,v1.16b,v1.16b - ld1 {v17.4s},[x3],#16 - add v16.4s,v16.4s,v4.4s - .inst 0x5e2828a4 //sha256su0 v4.16b,v5.16b - orr v2.16b,v0.16b,v0.16b - .inst 0x5e104020 //sha256h v0.16b,v1.16b,v16.4s - .inst 0x5e105041 //sha256h2 v1.16b,v2.16b,v16.4s - .inst 0x5e0760c4 //sha256su1 v4.16b,v6.16b,v7.16b - ld1 {v16.4s},[x3],#16 - add v17.4s,v17.4s,v5.4s - .inst 0x5e2828c5 //sha256su0 v5.16b,v6.16b - orr v2.16b,v0.16b,v0.16b - .inst 0x5e114020 //sha256h v0.16b,v1.16b,v17.4s - .inst 0x5e115041 //sha256h2 v1.16b,v2.16b,v17.4s - .inst 0x5e0460e5 //sha256su1 v5.16b,v7.16b,v4.16b - ld1 {v17.4s},[x3],#16 - add v16.4s,v16.4s,v6.4s - .inst 0x5e2828e6 //sha256su0 v6.16b,v7.16b - orr v2.16b,v0.16b,v0.16b - .inst 0x5e104020 //sha256h v0.16b,v1.16b,v16.4s - .inst 0x5e105041 //sha256h2 v1.16b,v2.16b,v16.4s - .inst 0x5e056086 //sha256su1 v6.16b,v4.16b,v5.16b - ld1 {v16.4s},[x3],#16 - add v17.4s,v17.4s,v7.4s - .inst 0x5e282887 //sha256su0 v7.16b,v4.16b - orr v2.16b,v0.16b,v0.16b - .inst 0x5e114020 //sha256h v0.16b,v1.16b,v17.4s - .inst 0x5e115041 //sha256h2 v1.16b,v2.16b,v17.4s - .inst 0x5e0660a7 //sha256su1 v7.16b,v5.16b,v6.16b - ld1 {v17.4s},[x3],#16 - add v16.4s,v16.4s,v4.4s - .inst 0x5e2828a4 //sha256su0 v4.16b,v5.16b - orr v2.16b,v0.16b,v0.16b - .inst 0x5e104020 //sha256h v0.16b,v1.16b,v16.4s - .inst 0x5e105041 //sha256h2 v1.16b,v2.16b,v16.4s - .inst 0x5e0760c4 //sha256su1 v4.16b,v6.16b,v7.16b - ld1 {v16.4s},[x3],#16 - add v17.4s,v17.4s,v5.4s - .inst 0x5e2828c5 //sha256su0 v5.16b,v6.16b - orr v2.16b,v0.16b,v0.16b - .inst 0x5e114020 //sha256h v0.16b,v1.16b,v17.4s - .inst 0x5e115041 //sha256h2 v1.16b,v2.16b,v17.4s - .inst 0x5e0460e5 //sha256su1 v5.16b,v7.16b,v4.16b - ld1 {v17.4s},[x3],#16 - add v16.4s,v16.4s,v6.4s - .inst 0x5e2828e6 //sha256su0 v6.16b,v7.16b - orr v2.16b,v0.16b,v0.16b - .inst 0x5e104020 //sha256h v0.16b,v1.16b,v16.4s - .inst 0x5e105041 //sha256h2 v1.16b,v2.16b,v16.4s - .inst 0x5e056086 //sha256su1 v6.16b,v4.16b,v5.16b - ld1 {v16.4s},[x3],#16 - add v17.4s,v17.4s,v7.4s - .inst 0x5e282887 //sha256su0 v7.16b,v4.16b - orr v2.16b,v0.16b,v0.16b - .inst 0x5e114020 //sha256h v0.16b,v1.16b,v17.4s - .inst 0x5e115041 //sha256h2 v1.16b,v2.16b,v17.4s - .inst 0x5e0660a7 //sha256su1 v7.16b,v5.16b,v6.16b - ld1 {v17.4s},[x3],#16 - add v16.4s,v16.4s,v4.4s - .inst 0x5e2828a4 //sha256su0 v4.16b,v5.16b - orr v2.16b,v0.16b,v0.16b - .inst 0x5e104020 //sha256h v0.16b,v1.16b,v16.4s - .inst 0x5e105041 //sha256h2 v1.16b,v2.16b,v16.4s - .inst 0x5e0760c4 //sha256su1 v4.16b,v6.16b,v7.16b - ld1 {v16.4s},[x3],#16 - add v17.4s,v17.4s,v5.4s - .inst 0x5e2828c5 //sha256su0 v5.16b,v6.16b - orr v2.16b,v0.16b,v0.16b - .inst 0x5e114020 //sha256h v0.16b,v1.16b,v17.4s - .inst 0x5e115041 //sha256h2 v1.16b,v2.16b,v17.4s - .inst 0x5e0460e5 //sha256su1 v5.16b,v7.16b,v4.16b - ld1 {v17.4s},[x3],#16 - add v16.4s,v16.4s,v6.4s - .inst 0x5e2828e6 //sha256su0 v6.16b,v7.16b - orr v2.16b,v0.16b,v0.16b - .inst 0x5e104020 //sha256h v0.16b,v1.16b,v16.4s - .inst 0x5e105041 //sha256h2 v1.16b,v2.16b,v16.4s - .inst 0x5e056086 //sha256su1 v6.16b,v4.16b,v5.16b - ld1 {v16.4s},[x3],#16 - add v17.4s,v17.4s,v7.4s - .inst 0x5e282887 //sha256su0 v7.16b,v4.16b - orr v2.16b,v0.16b,v0.16b - .inst 0x5e114020 //sha256h v0.16b,v1.16b,v17.4s - .inst 0x5e115041 //sha256h2 v1.16b,v2.16b,v17.4s - .inst 0x5e0660a7 //sha256su1 v7.16b,v5.16b,v6.16b - ld1 {v17.4s},[x3],#16 - add v16.4s,v16.4s,v4.4s - orr v2.16b,v0.16b,v0.16b - .inst 0x5e104020 //sha256h v0.16b,v1.16b,v16.4s - .inst 0x5e105041 //sha256h2 v1.16b,v2.16b,v16.4s - - ld1 {v16.4s},[x3],#16 - add v17.4s,v17.4s,v5.4s - orr v2.16b,v0.16b,v0.16b - .inst 0x5e114020 //sha256h v0.16b,v1.16b,v17.4s - .inst 0x5e115041 //sha256h2 v1.16b,v2.16b,v17.4s - - ld1 {v17.4s},[x3] - add v16.4s,v16.4s,v6.4s - sub x3,x3,#64*4-16 // rewind - orr v2.16b,v0.16b,v0.16b - .inst 0x5e104020 //sha256h v0.16b,v1.16b,v16.4s - .inst 0x5e105041 //sha256h2 v1.16b,v2.16b,v16.4s - - add v17.4s,v17.4s,v7.4s - orr v2.16b,v0.16b,v0.16b - .inst 0x5e114020 //sha256h v0.16b,v1.16b,v17.4s - .inst 0x5e115041 //sha256h2 v1.16b,v2.16b,v17.4s - - add v0.4s,v0.4s,v18.4s - add v1.4s,v1.4s,v19.4s - - cbnz x2,.Loop_hw - - st1 {v0.4s,v1.4s},[x0] - - ldr x29,[sp],#16 - ret -.size sha256_block_armv8,.-sha256_block_armv8 -#endif -#ifdef __KERNEL__ -.globl sha256_block_neon -#endif -.type sha256_block_neon,%function -.align 4 -sha256_block_neon: -.Lneon_entry: - stp x29, x30, [sp, #-16]! - mov x29, sp - sub sp,sp,#16*4 - - adr x16,.LK256 - add x2,x1,x2,lsl#6 // len to point at the end of inp - - ld1 {v0.16b},[x1], #16 - ld1 {v1.16b},[x1], #16 - ld1 {v2.16b},[x1], #16 - ld1 {v3.16b},[x1], #16 - ld1 {v4.4s},[x16], #16 - ld1 {v5.4s},[x16], #16 - ld1 {v6.4s},[x16], #16 - ld1 {v7.4s},[x16], #16 - rev32 v0.16b,v0.16b // yes, even on - rev32 v1.16b,v1.16b // big-endian - rev32 v2.16b,v2.16b - rev32 v3.16b,v3.16b - mov x17,sp - add v4.4s,v4.4s,v0.4s - add v5.4s,v5.4s,v1.4s - add v6.4s,v6.4s,v2.4s - st1 {v4.4s-v5.4s},[x17], #32 - add v7.4s,v7.4s,v3.4s - st1 {v6.4s-v7.4s},[x17] - sub x17,x17,#32 - - ldp w3,w4,[x0] - ldp w5,w6,[x0,#8] - ldp w7,w8,[x0,#16] - ldp w9,w10,[x0,#24] - ldr w12,[sp,#0] - mov w13,wzr - eor w14,w4,w5 - mov w15,wzr - b .L_00_48 - -.align 4 -.L_00_48: - ext v4.16b,v0.16b,v1.16b,#4 - add w10,w10,w12 - add w3,w3,w15 - and w12,w8,w7 - bic w15,w9,w7 - ext v7.16b,v2.16b,v3.16b,#4 - eor w11,w7,w7,ror#5 - add w3,w3,w13 - mov d19,v3.d[1] - orr w12,w12,w15 - eor w11,w11,w7,ror#19 - ushr v6.4s,v4.4s,#7 - eor w15,w3,w3,ror#11 - ushr v5.4s,v4.4s,#3 - add w10,w10,w12 - add v0.4s,v0.4s,v7.4s - ror w11,w11,#6 - sli v6.4s,v4.4s,#25 - eor w13,w3,w4 - eor w15,w15,w3,ror#20 - ushr v7.4s,v4.4s,#18 - add w10,w10,w11 - ldr w12,[sp,#4] - and w14,w14,w13 - eor v5.16b,v5.16b,v6.16b - ror w15,w15,#2 - add w6,w6,w10 - sli v7.4s,v4.4s,#14 - eor w14,w14,w4 - ushr v16.4s,v19.4s,#17 - add w9,w9,w12 - add w10,w10,w15 - and w12,w7,w6 - eor v5.16b,v5.16b,v7.16b - bic w15,w8,w6 - eor w11,w6,w6,ror#5 - sli v16.4s,v19.4s,#15 - add w10,w10,w14 - orr w12,w12,w15 - ushr v17.4s,v19.4s,#10 - eor w11,w11,w6,ror#19 - eor w15,w10,w10,ror#11 - ushr v7.4s,v19.4s,#19 - add w9,w9,w12 - ror w11,w11,#6 - add v0.4s,v0.4s,v5.4s - eor w14,w10,w3 - eor w15,w15,w10,ror#20 - sli v7.4s,v19.4s,#13 - add w9,w9,w11 - ldr w12,[sp,#8] - and w13,w13,w14 - eor v17.16b,v17.16b,v16.16b - ror w15,w15,#2 - add w5,w5,w9 - eor w13,w13,w3 - eor v17.16b,v17.16b,v7.16b - add w8,w8,w12 - add w9,w9,w15 - and w12,w6,w5 - add v0.4s,v0.4s,v17.4s - bic w15,w7,w5 - eor w11,w5,w5,ror#5 - add w9,w9,w13 - ushr v18.4s,v0.4s,#17 - orr w12,w12,w15 - ushr v19.4s,v0.4s,#10 - eor w11,w11,w5,ror#19 - eor w15,w9,w9,ror#11 - sli v18.4s,v0.4s,#15 - add w8,w8,w12 - ushr v17.4s,v0.4s,#19 - ror w11,w11,#6 - eor w13,w9,w10 - eor v19.16b,v19.16b,v18.16b - eor w15,w15,w9,ror#20 - add w8,w8,w11 - sli v17.4s,v0.4s,#13 - ldr w12,[sp,#12] - and w14,w14,w13 - ror w15,w15,#2 - ld1 {v4.4s},[x16], #16 - add w4,w4,w8 - eor v19.16b,v19.16b,v17.16b - eor w14,w14,w10 - eor v17.16b,v17.16b,v17.16b - add w7,w7,w12 - add w8,w8,w15 - and w12,w5,w4 - mov v17.d[1],v19.d[0] - bic w15,w6,w4 - eor w11,w4,w4,ror#5 - add w8,w8,w14 - add v0.4s,v0.4s,v17.4s - orr w12,w12,w15 - eor w11,w11,w4,ror#19 - eor w15,w8,w8,ror#11 - add v4.4s,v4.4s,v0.4s - add w7,w7,w12 - ror w11,w11,#6 - eor w14,w8,w9 - eor w15,w15,w8,ror#20 - add w7,w7,w11 - ldr w12,[sp,#16] - and w13,w13,w14 - ror w15,w15,#2 - add w3,w3,w7 - eor w13,w13,w9 - st1 {v4.4s},[x17], #16 - ext v4.16b,v1.16b,v2.16b,#4 - add w6,w6,w12 - add w7,w7,w15 - and w12,w4,w3 - bic w15,w5,w3 - ext v7.16b,v3.16b,v0.16b,#4 - eor w11,w3,w3,ror#5 - add w7,w7,w13 - mov d19,v0.d[1] - orr w12,w12,w15 - eor w11,w11,w3,ror#19 - ushr v6.4s,v4.4s,#7 - eor w15,w7,w7,ror#11 - ushr v5.4s,v4.4s,#3 - add w6,w6,w12 - add v1.4s,v1.4s,v7.4s - ror w11,w11,#6 - sli v6.4s,v4.4s,#25 - eor w13,w7,w8 - eor w15,w15,w7,ror#20 - ushr v7.4s,v4.4s,#18 - add w6,w6,w11 - ldr w12,[sp,#20] - and w14,w14,w13 - eor v5.16b,v5.16b,v6.16b - ror w15,w15,#2 - add w10,w10,w6 - sli v7.4s,v4.4s,#14 - eor w14,w14,w8 - ushr v16.4s,v19.4s,#17 - add w5,w5,w12 - add w6,w6,w15 - and w12,w3,w10 - eor v5.16b,v5.16b,v7.16b - bic w15,w4,w10 - eor w11,w10,w10,ror#5 - sli v16.4s,v19.4s,#15 - add w6,w6,w14 - orr w12,w12,w15 - ushr v17.4s,v19.4s,#10 - eor w11,w11,w10,ror#19 - eor w15,w6,w6,ror#11 - ushr v7.4s,v19.4s,#19 - add w5,w5,w12 - ror w11,w11,#6 - add v1.4s,v1.4s,v5.4s - eor w14,w6,w7 - eor w15,w15,w6,ror#20 - sli v7.4s,v19.4s,#13 - add w5,w5,w11 - ldr w12,[sp,#24] - and w13,w13,w14 - eor v17.16b,v17.16b,v16.16b - ror w15,w15,#2 - add w9,w9,w5 - eor w13,w13,w7 - eor v17.16b,v17.16b,v7.16b - add w4,w4,w12 - add w5,w5,w15 - and w12,w10,w9 - add v1.4s,v1.4s,v17.4s - bic w15,w3,w9 - eor w11,w9,w9,ror#5 - add w5,w5,w13 - ushr v18.4s,v1.4s,#17 - orr w12,w12,w15 - ushr v19.4s,v1.4s,#10 - eor w11,w11,w9,ror#19 - eor w15,w5,w5,ror#11 - sli v18.4s,v1.4s,#15 - add w4,w4,w12 - ushr v17.4s,v1.4s,#19 - ror w11,w11,#6 - eor w13,w5,w6 - eor v19.16b,v19.16b,v18.16b - eor w15,w15,w5,ror#20 - add w4,w4,w11 - sli v17.4s,v1.4s,#13 - ldr w12,[sp,#28] - and w14,w14,w13 - ror w15,w15,#2 - ld1 {v4.4s},[x16], #16 - add w8,w8,w4 - eor v19.16b,v19.16b,v17.16b - eor w14,w14,w6 - eor v17.16b,v17.16b,v17.16b - add w3,w3,w12 - add w4,w4,w15 - and w12,w9,w8 - mov v17.d[1],v19.d[0] - bic w15,w10,w8 - eor w11,w8,w8,ror#5 - add w4,w4,w14 - add v1.4s,v1.4s,v17.4s - orr w12,w12,w15 - eor w11,w11,w8,ror#19 - eor w15,w4,w4,ror#11 - add v4.4s,v4.4s,v1.4s - add w3,w3,w12 - ror w11,w11,#6 - eor w14,w4,w5 - eor w15,w15,w4,ror#20 - add w3,w3,w11 - ldr w12,[sp,#32] - and w13,w13,w14 - ror w15,w15,#2 - add w7,w7,w3 - eor w13,w13,w5 - st1 {v4.4s},[x17], #16 - ext v4.16b,v2.16b,v3.16b,#4 - add w10,w10,w12 - add w3,w3,w15 - and w12,w8,w7 - bic w15,w9,w7 - ext v7.16b,v0.16b,v1.16b,#4 - eor w11,w7,w7,ror#5 - add w3,w3,w13 - mov d19,v1.d[1] - orr w12,w12,w15 - eor w11,w11,w7,ror#19 - ushr v6.4s,v4.4s,#7 - eor w15,w3,w3,ror#11 - ushr v5.4s,v4.4s,#3 - add w10,w10,w12 - add v2.4s,v2.4s,v7.4s - ror w11,w11,#6 - sli v6.4s,v4.4s,#25 - eor w13,w3,w4 - eor w15,w15,w3,ror#20 - ushr v7.4s,v4.4s,#18 - add w10,w10,w11 - ldr w12,[sp,#36] - and w14,w14,w13 - eor v5.16b,v5.16b,v6.16b - ror w15,w15,#2 - add w6,w6,w10 - sli v7.4s,v4.4s,#14 - eor w14,w14,w4 - ushr v16.4s,v19.4s,#17 - add w9,w9,w12 - add w10,w10,w15 - and w12,w7,w6 - eor v5.16b,v5.16b,v7.16b - bic w15,w8,w6 - eor w11,w6,w6,ror#5 - sli v16.4s,v19.4s,#15 - add w10,w10,w14 - orr w12,w12,w15 - ushr v17.4s,v19.4s,#10 - eor w11,w11,w6,ror#19 - eor w15,w10,w10,ror#11 - ushr v7.4s,v19.4s,#19 - add w9,w9,w12 - ror w11,w11,#6 - add v2.4s,v2.4s,v5.4s - eor w14,w10,w3 - eor w15,w15,w10,ror#20 - sli v7.4s,v19.4s,#13 - add w9,w9,w11 - ldr w12,[sp,#40] - and w13,w13,w14 - eor v17.16b,v17.16b,v16.16b - ror w15,w15,#2 - add w5,w5,w9 - eor w13,w13,w3 - eor v17.16b,v17.16b,v7.16b - add w8,w8,w12 - add w9,w9,w15 - and w12,w6,w5 - add v2.4s,v2.4s,v17.4s - bic w15,w7,w5 - eor w11,w5,w5,ror#5 - add w9,w9,w13 - ushr v18.4s,v2.4s,#17 - orr w12,w12,w15 - ushr v19.4s,v2.4s,#10 - eor w11,w11,w5,ror#19 - eor w15,w9,w9,ror#11 - sli v18.4s,v2.4s,#15 - add w8,w8,w12 - ushr v17.4s,v2.4s,#19 - ror w11,w11,#6 - eor w13,w9,w10 - eor v19.16b,v19.16b,v18.16b - eor w15,w15,w9,ror#20 - add w8,w8,w11 - sli v17.4s,v2.4s,#13 - ldr w12,[sp,#44] - and w14,w14,w13 - ror w15,w15,#2 - ld1 {v4.4s},[x16], #16 - add w4,w4,w8 - eor v19.16b,v19.16b,v17.16b - eor w14,w14,w10 - eor v17.16b,v17.16b,v17.16b - add w7,w7,w12 - add w8,w8,w15 - and w12,w5,w4 - mov v17.d[1],v19.d[0] - bic w15,w6,w4 - eor w11,w4,w4,ror#5 - add w8,w8,w14 - add v2.4s,v2.4s,v17.4s - orr w12,w12,w15 - eor w11,w11,w4,ror#19 - eor w15,w8,w8,ror#11 - add v4.4s,v4.4s,v2.4s - add w7,w7,w12 - ror w11,w11,#6 - eor w14,w8,w9 - eor w15,w15,w8,ror#20 - add w7,w7,w11 - ldr w12,[sp,#48] - and w13,w13,w14 - ror w15,w15,#2 - add w3,w3,w7 - eor w13,w13,w9 - st1 {v4.4s},[x17], #16 - ext v4.16b,v3.16b,v0.16b,#4 - add w6,w6,w12 - add w7,w7,w15 - and w12,w4,w3 - bic w15,w5,w3 - ext v7.16b,v1.16b,v2.16b,#4 - eor w11,w3,w3,ror#5 - add w7,w7,w13 - mov d19,v2.d[1] - orr w12,w12,w15 - eor w11,w11,w3,ror#19 - ushr v6.4s,v4.4s,#7 - eor w15,w7,w7,ror#11 - ushr v5.4s,v4.4s,#3 - add w6,w6,w12 - add v3.4s,v3.4s,v7.4s - ror w11,w11,#6 - sli v6.4s,v4.4s,#25 - eor w13,w7,w8 - eor w15,w15,w7,ror#20 - ushr v7.4s,v4.4s,#18 - add w6,w6,w11 - ldr w12,[sp,#52] - and w14,w14,w13 - eor v5.16b,v5.16b,v6.16b - ror w15,w15,#2 - add w10,w10,w6 - sli v7.4s,v4.4s,#14 - eor w14,w14,w8 - ushr v16.4s,v19.4s,#17 - add w5,w5,w12 - add w6,w6,w15 - and w12,w3,w10 - eor v5.16b,v5.16b,v7.16b - bic w15,w4,w10 - eor w11,w10,w10,ror#5 - sli v16.4s,v19.4s,#15 - add w6,w6,w14 - orr w12,w12,w15 - ushr v17.4s,v19.4s,#10 - eor w11,w11,w10,ror#19 - eor w15,w6,w6,ror#11 - ushr v7.4s,v19.4s,#19 - add w5,w5,w12 - ror w11,w11,#6 - add v3.4s,v3.4s,v5.4s - eor w14,w6,w7 - eor w15,w15,w6,ror#20 - sli v7.4s,v19.4s,#13 - add w5,w5,w11 - ldr w12,[sp,#56] - and w13,w13,w14 - eor v17.16b,v17.16b,v16.16b - ror w15,w15,#2 - add w9,w9,w5 - eor w13,w13,w7 - eor v17.16b,v17.16b,v7.16b - add w4,w4,w12 - add w5,w5,w15 - and w12,w10,w9 - add v3.4s,v3.4s,v17.4s - bic w15,w3,w9 - eor w11,w9,w9,ror#5 - add w5,w5,w13 - ushr v18.4s,v3.4s,#17 - orr w12,w12,w15 - ushr v19.4s,v3.4s,#10 - eor w11,w11,w9,ror#19 - eor w15,w5,w5,ror#11 - sli v18.4s,v3.4s,#15 - add w4,w4,w12 - ushr v17.4s,v3.4s,#19 - ror w11,w11,#6 - eor w13,w5,w6 - eor v19.16b,v19.16b,v18.16b - eor w15,w15,w5,ror#20 - add w4,w4,w11 - sli v17.4s,v3.4s,#13 - ldr w12,[sp,#60] - and w14,w14,w13 - ror w15,w15,#2 - ld1 {v4.4s},[x16], #16 - add w8,w8,w4 - eor v19.16b,v19.16b,v17.16b - eor w14,w14,w6 - eor v17.16b,v17.16b,v17.16b - add w3,w3,w12 - add w4,w4,w15 - and w12,w9,w8 - mov v17.d[1],v19.d[0] - bic w15,w10,w8 - eor w11,w8,w8,ror#5 - add w4,w4,w14 - add v3.4s,v3.4s,v17.4s - orr w12,w12,w15 - eor w11,w11,w8,ror#19 - eor w15,w4,w4,ror#11 - add v4.4s,v4.4s,v3.4s - add w3,w3,w12 - ror w11,w11,#6 - eor w14,w4,w5 - eor w15,w15,w4,ror#20 - add w3,w3,w11 - ldr w12,[x16] - and w13,w13,w14 - ror w15,w15,#2 - add w7,w7,w3 - eor w13,w13,w5 - st1 {v4.4s},[x17], #16 - cmp w12,#0 // check for K256 terminator - ldr w12,[sp,#0] - sub x17,x17,#64 - bne .L_00_48 - - sub x16,x16,#256 // rewind x16 - cmp x1,x2 - mov x17, #64 - csel x17, x17, xzr, eq - sub x1,x1,x17 // avoid SEGV - mov x17,sp - add w10,w10,w12 - add w3,w3,w15 - and w12,w8,w7 - ld1 {v0.16b},[x1],#16 - bic w15,w9,w7 - eor w11,w7,w7,ror#5 - ld1 {v4.4s},[x16],#16 - add w3,w3,w13 - orr w12,w12,w15 - eor w11,w11,w7,ror#19 - eor w15,w3,w3,ror#11 - rev32 v0.16b,v0.16b - add w10,w10,w12 - ror w11,w11,#6 - eor w13,w3,w4 - eor w15,w15,w3,ror#20 - add v4.4s,v4.4s,v0.4s - add w10,w10,w11 - ldr w12,[sp,#4] - and w14,w14,w13 - ror w15,w15,#2 - add w6,w6,w10 - eor w14,w14,w4 - add w9,w9,w12 - add w10,w10,w15 - and w12,w7,w6 - bic w15,w8,w6 - eor w11,w6,w6,ror#5 - add w10,w10,w14 - orr w12,w12,w15 - eor w11,w11,w6,ror#19 - eor w15,w10,w10,ror#11 - add w9,w9,w12 - ror w11,w11,#6 - eor w14,w10,w3 - eor w15,w15,w10,ror#20 - add w9,w9,w11 - ldr w12,[sp,#8] - and w13,w13,w14 - ror w15,w15,#2 - add w5,w5,w9 - eor w13,w13,w3 - add w8,w8,w12 - add w9,w9,w15 - and w12,w6,w5 - bic w15,w7,w5 - eor w11,w5,w5,ror#5 - add w9,w9,w13 - orr w12,w12,w15 - eor w11,w11,w5,ror#19 - eor w15,w9,w9,ror#11 - add w8,w8,w12 - ror w11,w11,#6 - eor w13,w9,w10 - eor w15,w15,w9,ror#20 - add w8,w8,w11 - ldr w12,[sp,#12] - and w14,w14,w13 - ror w15,w15,#2 - add w4,w4,w8 - eor w14,w14,w10 - add w7,w7,w12 - add w8,w8,w15 - and w12,w5,w4 - bic w15,w6,w4 - eor w11,w4,w4,ror#5 - add w8,w8,w14 - orr w12,w12,w15 - eor w11,w11,w4,ror#19 - eor w15,w8,w8,ror#11 - add w7,w7,w12 - ror w11,w11,#6 - eor w14,w8,w9 - eor w15,w15,w8,ror#20 - add w7,w7,w11 - ldr w12,[sp,#16] - and w13,w13,w14 - ror w15,w15,#2 - add w3,w3,w7 - eor w13,w13,w9 - st1 {v4.4s},[x17], #16 - add w6,w6,w12 - add w7,w7,w15 - and w12,w4,w3 - ld1 {v1.16b},[x1],#16 - bic w15,w5,w3 - eor w11,w3,w3,ror#5 - ld1 {v4.4s},[x16],#16 - add w7,w7,w13 - orr w12,w12,w15 - eor w11,w11,w3,ror#19 - eor w15,w7,w7,ror#11 - rev32 v1.16b,v1.16b - add w6,w6,w12 - ror w11,w11,#6 - eor w13,w7,w8 - eor w15,w15,w7,ror#20 - add v4.4s,v4.4s,v1.4s - add w6,w6,w11 - ldr w12,[sp,#20] - and w14,w14,w13 - ror w15,w15,#2 - add w10,w10,w6 - eor w14,w14,w8 - add w5,w5,w12 - add w6,w6,w15 - and w12,w3,w10 - bic w15,w4,w10 - eor w11,w10,w10,ror#5 - add w6,w6,w14 - orr w12,w12,w15 - eor w11,w11,w10,ror#19 - eor w15,w6,w6,ror#11 - add w5,w5,w12 - ror w11,w11,#6 - eor w14,w6,w7 - eor w15,w15,w6,ror#20 - add w5,w5,w11 - ldr w12,[sp,#24] - and w13,w13,w14 - ror w15,w15,#2 - add w9,w9,w5 - eor w13,w13,w7 - add w4,w4,w12 - add w5,w5,w15 - and w12,w10,w9 - bic w15,w3,w9 - eor w11,w9,w9,ror#5 - add w5,w5,w13 - orr w12,w12,w15 - eor w11,w11,w9,ror#19 - eor w15,w5,w5,ror#11 - add w4,w4,w12 - ror w11,w11,#6 - eor w13,w5,w6 - eor w15,w15,w5,ror#20 - add w4,w4,w11 - ldr w12,[sp,#28] - and w14,w14,w13 - ror w15,w15,#2 - add w8,w8,w4 - eor w14,w14,w6 - add w3,w3,w12 - add w4,w4,w15 - and w12,w9,w8 - bic w15,w10,w8 - eor w11,w8,w8,ror#5 - add w4,w4,w14 - orr w12,w12,w15 - eor w11,w11,w8,ror#19 - eor w15,w4,w4,ror#11 - add w3,w3,w12 - ror w11,w11,#6 - eor w14,w4,w5 - eor w15,w15,w4,ror#20 - add w3,w3,w11 - ldr w12,[sp,#32] - and w13,w13,w14 - ror w15,w15,#2 - add w7,w7,w3 - eor w13,w13,w5 - st1 {v4.4s},[x17], #16 - add w10,w10,w12 - add w3,w3,w15 - and w12,w8,w7 - ld1 {v2.16b},[x1],#16 - bic w15,w9,w7 - eor w11,w7,w7,ror#5 - ld1 {v4.4s},[x16],#16 - add w3,w3,w13 - orr w12,w12,w15 - eor w11,w11,w7,ror#19 - eor w15,w3,w3,ror#11 - rev32 v2.16b,v2.16b - add w10,w10,w12 - ror w11,w11,#6 - eor w13,w3,w4 - eor w15,w15,w3,ror#20 - add v4.4s,v4.4s,v2.4s - add w10,w10,w11 - ldr w12,[sp,#36] - and w14,w14,w13 - ror w15,w15,#2 - add w6,w6,w10 - eor w14,w14,w4 - add w9,w9,w12 - add w10,w10,w15 - and w12,w7,w6 - bic w15,w8,w6 - eor w11,w6,w6,ror#5 - add w10,w10,w14 - orr w12,w12,w15 - eor w11,w11,w6,ror#19 - eor w15,w10,w10,ror#11 - add w9,w9,w12 - ror w11,w11,#6 - eor w14,w10,w3 - eor w15,w15,w10,ror#20 - add w9,w9,w11 - ldr w12,[sp,#40] - and w13,w13,w14 - ror w15,w15,#2 - add w5,w5,w9 - eor w13,w13,w3 - add w8,w8,w12 - add w9,w9,w15 - and w12,w6,w5 - bic w15,w7,w5 - eor w11,w5,w5,ror#5 - add w9,w9,w13 - orr w12,w12,w15 - eor w11,w11,w5,ror#19 - eor w15,w9,w9,ror#11 - add w8,w8,w12 - ror w11,w11,#6 - eor w13,w9,w10 - eor w15,w15,w9,ror#20 - add w8,w8,w11 - ldr w12,[sp,#44] - and w14,w14,w13 - ror w15,w15,#2 - add w4,w4,w8 - eor w14,w14,w10 - add w7,w7,w12 - add w8,w8,w15 - and w12,w5,w4 - bic w15,w6,w4 - eor w11,w4,w4,ror#5 - add w8,w8,w14 - orr w12,w12,w15 - eor w11,w11,w4,ror#19 - eor w15,w8,w8,ror#11 - add w7,w7,w12 - ror w11,w11,#6 - eor w14,w8,w9 - eor w15,w15,w8,ror#20 - add w7,w7,w11 - ldr w12,[sp,#48] - and w13,w13,w14 - ror w15,w15,#2 - add w3,w3,w7 - eor w13,w13,w9 - st1 {v4.4s},[x17], #16 - add w6,w6,w12 - add w7,w7,w15 - and w12,w4,w3 - ld1 {v3.16b},[x1],#16 - bic w15,w5,w3 - eor w11,w3,w3,ror#5 - ld1 {v4.4s},[x16],#16 - add w7,w7,w13 - orr w12,w12,w15 - eor w11,w11,w3,ror#19 - eor w15,w7,w7,ror#11 - rev32 v3.16b,v3.16b - add w6,w6,w12 - ror w11,w11,#6 - eor w13,w7,w8 - eor w15,w15,w7,ror#20 - add v4.4s,v4.4s,v3.4s - add w6,w6,w11 - ldr w12,[sp,#52] - and w14,w14,w13 - ror w15,w15,#2 - add w10,w10,w6 - eor w14,w14,w8 - add w5,w5,w12 - add w6,w6,w15 - and w12,w3,w10 - bic w15,w4,w10 - eor w11,w10,w10,ror#5 - add w6,w6,w14 - orr w12,w12,w15 - eor w11,w11,w10,ror#19 - eor w15,w6,w6,ror#11 - add w5,w5,w12 - ror w11,w11,#6 - eor w14,w6,w7 - eor w15,w15,w6,ror#20 - add w5,w5,w11 - ldr w12,[sp,#56] - and w13,w13,w14 - ror w15,w15,#2 - add w9,w9,w5 - eor w13,w13,w7 - add w4,w4,w12 - add w5,w5,w15 - and w12,w10,w9 - bic w15,w3,w9 - eor w11,w9,w9,ror#5 - add w5,w5,w13 - orr w12,w12,w15 - eor w11,w11,w9,ror#19 - eor w15,w5,w5,ror#11 - add w4,w4,w12 - ror w11,w11,#6 - eor w13,w5,w6 - eor w15,w15,w5,ror#20 - add w4,w4,w11 - ldr w12,[sp,#60] - and w14,w14,w13 - ror w15,w15,#2 - add w8,w8,w4 - eor w14,w14,w6 - add w3,w3,w12 - add w4,w4,w15 - and w12,w9,w8 - bic w15,w10,w8 - eor w11,w8,w8,ror#5 - add w4,w4,w14 - orr w12,w12,w15 - eor w11,w11,w8,ror#19 - eor w15,w4,w4,ror#11 - add w3,w3,w12 - ror w11,w11,#6 - eor w14,w4,w5 - eor w15,w15,w4,ror#20 - add w3,w3,w11 - and w13,w13,w14 - ror w15,w15,#2 - add w7,w7,w3 - eor w13,w13,w5 - st1 {v4.4s},[x17], #16 - add w3,w3,w15 // h+=Sigma0(a) from the past - ldp w11,w12,[x0,#0] - add w3,w3,w13 // h+=Maj(a,b,c) from the past - ldp w13,w14,[x0,#8] - add w3,w3,w11 // accumulate - add w4,w4,w12 - ldp w11,w12,[x0,#16] - add w5,w5,w13 - add w6,w6,w14 - ldp w13,w14,[x0,#24] - add w7,w7,w11 - add w8,w8,w12 - ldr w12,[sp,#0] - stp w3,w4,[x0,#0] - add w9,w9,w13 - mov w13,wzr - stp w5,w6,[x0,#8] - add w10,w10,w14 - stp w7,w8,[x0,#16] - eor w14,w4,w5 - stp w9,w10,[x0,#24] - mov w15,wzr - mov x17,sp - b.ne .L_00_48 - - ldr x29,[x29] - add sp,sp,#16*4+16 - ret -.size sha256_block_neon,.-sha256_block_neon -#ifndef __KERNEL__ -.comm OPENSSL_armcap_P,4,4 -#endif
arch/arm64/crypto/sha512-core.S deleted +0 -1085
939 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
Greg Kroah-Hartman
maintainerPATCH 44/54 perf/core: Fix perf_sample_regs_user() mm check
In reply to Greg Kroah-Hartman[ Upstream commit 085ebfe937d7a7a5df1729f35a12d6d655fea68c ]
perf_sample_regs_user() uses 'current->mm' to test for the presence of userspace, but this is insufficient, consider use_mm().
A better test is: '!(current->flags & PF_KTHREAD)', exec() clears PF_KTHREAD after it sets the new ->mm but before it drops to userspace for the first time.
Possibly obsoletes: bf05fc25f268 ("powerpc/perf: Fix oops when kthread execs user process")
--- kernel/events/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/events/core.c +1 -1
@@ -5492,7 +5492,7 @@ static void perf_sample_regs_user(struct perf_regs *regs_user,if (user_mode (regs)) { regs_user->abi =perf_reg_abi (current); regs_user->regs = regs; - }else if (current->mm) { + }else if (!(current->flags &PF_KTHREAD )) {perf_get_regs_user (regs_user, regs, regs_user_copy); }else { regs_user->abi =PERF_SAMPLE_REGS_ABI_NONE ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 45/54 ARM: omap2: remove incorrect __init annotation
In reply to Greg Kroah-Hartman[ Upstream commit 27e23d8975270df6999f8b5b3156fc0c04927451 ]
omap3xxx_prm_enable_io_wakeup() is marked __init, but its caller is not, so we get a warning with clang-8:
WARNING: vmlinux.o(.text+0x343c8): Section mismatch in reference from the function omap3xxx_prm_late_init() to the function .init.text:omap3xxx_prm_enable_io_wakeup() The function omap3xxx_prm_late_init() references
the function __init omap3xxx_prm_enable_io_wakeup().
This is often because omap3xxx_prm_late_init lacks a __init
annotation or the annotation of omap3xxx_prm_enable_io_wakeup is wrong.
When building with gcc, omap3xxx_prm_enable_io_wakeup() is always inlined, so we never noticed in the past.
--- arch/arm/mach-omap2/prm3xxx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/prm3xxx.c +1 -1
@@ -433,7 +433,7 @@ static void omap3_prm_reconfigure_io_chain(void)* registers, and omap3xxx_prm_reconfigure_io_chain() must be called. * No return value. */ -static void __init omap3xxx_prm_enable_io_wakeup (void ) +static void omap3xxx_prm_enable_io_wakeup (void ) {if (prm_features &PRM_HAS_IO_WAKEUP ) omap2_prm_set_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 46/54 be2net: fix link failure after ethtool offline test
In reply to Greg Kroah-Hartman[ Upstream commit 2e5db6eb3c23e5dc8171eb8f6af7a97ef9fcf3a9 ]
Certain cards in conjunction with certain switches need a little more time for link setup that results in ethtool link test failure after offline test. Patch adds a loop that waits for a link setup finish.
Changes in v2:
- added fixes header
--- .../net/ethernet/emulex/benet/be_ethtool.c | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-)
drivers/net/ethernet/emulex/benet/be_ethtool.c +22 -6
@@ -898,7 +898,7 @@ static void be_self_test(struct net_device *netdev, struct ethtool_test *test, u64 *data) {struct be_adapter *adapter =netdev_priv (netdev); -int status; +int status, cnt;u8 link_status =0 ;if (adapter->function_caps &BE_FUNCTION_CAPS_SUPER_NIC ) {
@@ -909,6 +909,9 @@ static void be_self_test(struct net_device *netdev, struct ethtool_test *test,memset (data,0 ,sizeof (u64) *ETHTOOL_TESTS_NUM ); +/* check link status before offline tests */ + link_status =netif_carrier_ok (netdev); +if (test->flags Ð_TEST_FL_OFFLINE ) {if (be_loopback_test (adapter,BE_MAC_LOOPBACK , &data[0 ]) !=0 ) test->flags |=ETH_TEST_FL_FAILED ;
@@ -929,13 +932,26 @@ static void be_self_test(struct net_device *netdev, struct ethtool_test *test, test->flags |=ETH_TEST_FL_FAILED ; } - status =be_cmd_link_status_query (adapter,NULL , &link_status,0 ); -if (status) { - test->flags |=ETH_TEST_FL_FAILED ; - data[4 ] =-1 ; - }else if (!link_status) { +/* link status was down prior to test */ +if (!link_status) { test->flags |=ETH_TEST_FL_FAILED ; data[4 ] =1 ; +return ; + } + +for (cnt =10 ; cnt; cnt--) { + status =be_cmd_link_status_query (adapter,NULL , &link_status, +0 ); +if (status) { + test->flags |=ETH_TEST_FL_FAILED ; + data[4 ] =-1 ; +break ; + } + +if (link_status) +break ; + +msleep_interruptible (500 ); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 47/54 ppp: mppe: Add softdep to arc4
In reply to Greg Kroah-Hartman[ Upstream commit aad1dcc4f011ea409850e040363dff1e59aa4175 ]
The arc4 crypto is mandatory at ppp_mppe probe time, so let's put a softdep line, so that the corresponding module gets prepared gracefully. Without this, a simple inclusion to initrd via dracut failed due to the missing dependency, for example.
--- drivers/net/ppp/ppp_mppe.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ppp/ppp_mppe.c +1 -0
@@ -63,6 +63,7 @@ MODULE_AUTHOR("Frank Cusack <[email protected]>");MODULE_DESCRIPTION ("Point-to-Point Protocol Microsoft Point-to-Point Encryption support" );MODULE_LICENSE ("Dual BSD/GPL" );MODULE_ALIAS ("ppp-compress-" __stringify(CI_MPPE )); +MODULE_SOFTDEP ("pre: arc4" );MODULE_VERSION ("1.0.2" ); static unsigned int
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 48/54 sis900: fix TX completion
In reply to Greg Kroah-Hartman[ Upstream commit 8ac8a01092b2added0749ef937037bf1912e13e3 ]
Since commit 605ad7f184b60cfaacbc038aa6c55ee68dee3c89 "tcp: refine TSO autosizing", outbound throughput is dramatically reduced for some connections, as sis900 is doing TX completion within idle states only.
Make TX completion happen after every transmitted packet.
Test:
netperf
before patch:
Quoted 1 line
netperf -H remote -l -2000000 -- -s 1000000
MIGRATED TCP STREAM TEST from 0.0.0.0 () port 0 AF_INET to 95.223.112.76 () port 0 AF_INET : demo
Recv Send Send Socket Socket Message Elapsed Size Size Size Time Throughput bytes bytes bytes secs. 10^6bits/sec
87380 327680 327680 253.44 0.06
after patch:
Quoted 1 line
netperf -H remote -l -10000000 -- -s 1000000
MIGRATED TCP STREAM TEST from 0.0.0.0 () port 0 AF_INET to 95.223.112.76 () port 0 AF_INET : demo
Recv Send Send Socket Socket Message Elapsed Size Size Size Time Throughput bytes bytes bytes secs. 10^6bits/sec
87380 327680 327680 5.38 14.89
Thx to Dave Miller and Eric Dumazet for helpful hints
--- drivers/net/ethernet/sis/sis900.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/net/ethernet/sis/sis900.c +8 -8
@@ -1058,7 +1058,7 @@ sis900_open(struct net_device *net_dev)sis900_set_mode (sis_priv,HW_SPEED_10_MBPS ,FDX_CAPABLE_HALF_SELECTED );/* Enable all known interrupts by setting the interrupt mask. */ -sw32 (imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE); +sw32 (imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE | TxDESC);sw32 (cr, RxENA |sr32 (cr));sw32 (ier,IE );
@@ -1581,7 +1581,7 @@ static void sis900_tx_timeout(struct net_device *net_dev)sw32 (txdp, sis_priv->tx_ring_dma);/* Enable all known interrupts by setting the interrupt mask. */ -sw32 (imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE); +sw32 (imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE | TxDESC); }/**
@@ -1621,7 +1621,7 @@ sis900_start_xmit(struct sk_buff *skb, struct net_device *net_dev)spin_unlock_irqrestore (&sis_priv->lock, flags);return NETDEV_TX_OK ; } - sis_priv->tx_ring[entry].cmdsts = (OWN | skb->len); + sis_priv->tx_ring[entry].cmdsts = (OWN |INTR | skb->len);sw32 (cr, TxENA |sr32 (cr)); sis_priv->cur_tx ++;
@@ -1677,7 +1677,7 @@ static irqreturn_t sis900_interrupt(int irq, void *dev_instance) do { status = sr32(isr); - if ((status & (HIBERR|TxURN|TxERR|TxIDLE|RxORN|RxERR|RxOK)) == 0) + if ((status & (HIBERR|TxURN|TxERR|TxIDLE|TxDESC|RxORN|RxERR|RxOK)) == 0) /* nothing intresting happened */ break; handled = 1;
@@ -1687,7 +1687,7 @@ static irqreturn_t sis900_interrupt(int irq, void *dev_instance)/* Rx interrupt */ sis900_rx (net_dev); -if (status & (TxURN | TxERR | TxIDLE)) +if (status & (TxURN | TxERR | TxIDLE | TxDESC))/* Tx interrupt */ sis900_finish_xmit (net_dev);
@@ -1899,8 +1899,8 @@ static void sis900_finish_xmit (struct net_device *net_dev)if (tx_status &OWN ) {/* The packet is not transmitted yet (owned by hardware) ! -* Note: the interrupt is generated only when Tx Machine -* is idle, so this is an almost impossible case */ +* Note: this is an almost impossible condition +* in case of TxDESC ('descriptor interrupt') */ break ; }
@@ -2476,7 +2476,7 @@ static int sis900_resume(struct pci_dev *pci_dev)sis900_set_mode (sis_priv,HW_SPEED_10_MBPS ,FDX_CAPABLE_HALF_SELECTED );/* Enable all known interrupts by setting the interrupt mask. */ -sw32 (imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE); +sw32 (imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE | TxDESC);sw32 (cr, RxENA |sr32 (cr));sw32 (ier,IE );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 49/54 ARM: dts: imx6ul: fix PWM[1-4] interrupts
In reply to Greg Kroah-Hartman[ Upstream commit 3cf10132ac8d536565f2c02f60a3aeb315863a52 ]
According to the i.MX6UL/L RM, table 3.1 "ARM Cortex A7 domain interrupt summary", the interrupts for the PWM[1-4] go from 83 to 86.
--- arch/arm/boot/dts/imx6ul.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/imx6ul.dtsi +4 -4
@@ -332,7 +332,7 @@ pwm1: pwm@02080000 { compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm"; reg = <0x02080000 0x4000>; - interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6UL_CLK_PWM1>, <&clks IMX6UL_CLK_PWM1>; clock-names = "ipg", "per";
@@ -343,7 +343,7 @@ pwm2: pwm@02084000 { compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm"; reg = <0x02084000 0x4000>; - interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6UL_CLK_PWM2>, <&clks IMX6UL_CLK_PWM2>; clock-names = "ipg", "per";
@@ -354,7 +354,7 @@ pwm3: pwm@02088000 { compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm"; reg = <0x02088000 0x4000>; - interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6UL_CLK_PWM3>, <&clks IMX6UL_CLK_PWM3>; clock-names = "ipg", "per";
@@ -365,7 +365,7 @@ pwm4: pwm@0208c000 { compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm"; reg = <0x0208c000 0x4000>; - interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6UL_CLK_PWM4>, <&clks IMX6UL_CLK_PWM4>; clock-names = "ipg", "per";
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 50/54 dm verity: use message limit for data block corruption message
In reply to Greg Kroah-Hartman[ Upstream commit 2eba4e640b2c4161e31ae20090a53ee02a518657 ]
DM verity should also use DMERR_LIMIT to limit repeat data block corruption messages.
--- drivers/md/dm-verity-target.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/md/dm-verity-target.c +2 -2
@@ -218,8 +218,8 @@ static int verity_handle_err(struct dm_verity *v, enum verity_block_type type,BUG (); } -DMERR ("%s: %s block %llu is corrupted" , v->data_dev->name, type_str, - block); +DMERR_LIMIT ("%s: %s block %llu is corrupted" , v->data_dev->name, + type_str, block);if (v->corrupted_errs ==DM_VERITY_MAX_CORRUPTED_ERRS )DMERR ("%s: reached maximum errors" , v->data_dev->name);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 51/54 ARC: hide unused function unw_hdr_alloc
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
commit fd5de2721ea7d16e2b16c4049ac49f229551b290 upstream.
As kernelci.org reports, this function is not used in vdk_hs38_defconfig:
arch/arc/kernel/unwind.c:188:14: warning: 'unw_hdr_alloc' defined but not used [-Wunused-function]
--- arch/arc/kernel/unwind.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
arch/arc/kernel/unwind.c +4 -5
@@ -185,11 +185,6 @@ static void *__init unw_hdr_alloc_early( MAX_DMA_ADDRESS); } -static void *unw_hdr_alloc (unsigned long sz) -{ -return kmalloc (sz,GFP_KERNEL ); -} - static void init_unwind_table(struct unwind_table *table, const char *name, const void *core_start, unsigned long core_size, const void *init_start, unsigned long init_size,
@@ -370,6 +365,10 @@ ret_err: }#ifdef CONFIG_MODULES +static void *unw_hdr_alloc (unsigned long sz) +{ +return kmalloc (sz,GFP_KERNEL ); +}static struct unwind_table *last_table;
Greg Kroah-Hartman
maintainerPATCH 52/54 s390: fix stfle zero padding
In reply to Greg Kroah-HartmanFrom: Heiko Carstens <[email protected]>
commit 4f18d869ffd056c7858f3d617c71345cf19be008 upstream.
The stfle inline assembly returns the number of double words written (condition code 0) or the double words it would have written (condition code 3), if the memory array it got as parameter would have been large enough.
The current stfle implementation assumes that the array is always large enough and clears those parts of the array that have not been written to with a subsequent memset call.
If however the array is not large enough memset will get a negative length parameter, which means that memset clears memory until it gets an exception and the kernel crashes.
To fix this simply limit the maximum length. Move also the inline assembly to an extra function to avoid clobbering of register 0, which might happen because of the added min_t invocation together with code instrumentation.
The bug was introduced with commit 14375bc4eb8d ("[S390] cleanup facility list handling") but was rather harmless, since it would only write to a rather large array. It became a potential problem with commit 3ab121ab1866 ("[S390] kernel: Add z/VM LGR detection"). Since then it writes to an array with only four double words, while some machines already deliver three double words. As soon as machines have a facility bit within the fifth double a crash on IPL would happen.
--- arch/s390/include/asm/facility.h | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)
arch/s390/include/asm/facility.h +14 -7
@@ -61,6 +61,18 @@ static inline int test_facility(unsignedreturn __test_facility (nr, &S390_lowcore.stfle_fac_list); } +static inline unsigned long __stfle_asm (u64 *stfle_fac_list,int size) +{ + register unsigned long reg0 asm("0") = size - 1; + + asmvolatile ( +".insn s,0xb2b00000,0(%1)" /* stfle */ + :"+d" (reg0) + :"a" (stfle_fac_list) + :"memory" ,"cc" ); +return reg0; +} +/** * stfle - Store facility list extended * @stfle_fac_list: array where facility list can be stored
@@ -78,13 +90,8 @@ static inline void stfle(u64 *stfle_fac_memcpy (stfle_fac_list, &S390_lowcore.stfl_fac_list,4 );if (S390_lowcore.stfl_fac_list &0x01000000 ) {/* More facility bits available with stfle */ - register unsigned long reg0 asm("0") = size - 1; - - asmvolatile (".insn s,0xb2b00000,0(%1)" /* stfle */ - :"+d" (reg0) - :"a" (stfle_fac_list) - :"memory" ,"cc" ); - nr = (reg0 +1 ) *8 ;/* # bytes stored by stfle */ + nr =__stfle_asm (stfle_fac_list, size); + nr = min_t(unsigned long, (nr + 1) * 8, size * 8); }memset ((char *) stfle_fac_list + nr,0 , size *8 - nr);preempt_enable ();
Greg Kroah-Hartman
maintainerPATCH 53/54 s390/qdio: (re-)initialize tiqdio list entries
In reply to Greg Kroah-HartmanFrom: Julian Wiedmann <[email protected]>
commit e54e4785cb5cb4896cf4285964aeef2125612fb2 upstream.
When tiqdio_remove_input_queues() removes a queue from the tiq_list as part of qdio_shutdown(), it doesn't re-initialize the queue's list entry and the prev/next pointers go stale.
If a subsequent qdio_establish() fails while sending the ESTABLISH cmd, it calls qdio_shutdown() again in QDIO_IRQ_STATE_ERR state and tiqdio_remove_input_queues() will attempt to remove the queue entry a second time. This dereferences the stale pointers, and bad things ensue. Fix this by re-initializing the list entry after removing it from the list.
For good practice also initialize the list entry when the queue is first allocated, and remove the quirky checks that papered over this omission. Note that prior to
commit e521813468f7 ("s390/qdio: fix access to uninitialized qdio_q fields"), these checks were bogus anyway.
setup_queues_misc() clears the whole queue struct, and thus needs to re-init the prev/next pointers as well.
--- drivers/s390/cio/qdio_setup.c | 2 ++ drivers/s390/cio/qdio_thinint.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/s390/cio/qdio_setup.c +2 -0
@@ -150,6 +150,7 @@ static int __qdio_allocate_qs(struct qdireturn -ENOMEM ; } irq_ptr_qs[i] = q; +INIT_LIST_HEAD (&q->entry); }return 0 ; }
@@ -178,6 +179,7 @@ static void setup_queues_misc(struct qdi q->mask =1 << (31 - i); q->nr = i; q->handler = handler; +INIT_LIST_HEAD (&q->entry); } static void setup_storage_lists(struct qdio_q *q, struct qdio_irq *irq_ptr,
drivers/s390/cio/qdio_thinint.c +2 -2
@@ -88,14 +88,14 @@ void tiqdio_remove_input_queues(struct qstruct qdio_q *q; q = irq_ptr->input_qs[0 ]; -/* if establish triggered an error */ -if (!q || !q->entry.prev || !q->entry.next) +if (!q)return ;mutex_lock (&tiq_list_lock);list_del_rcu (&q->entry);mutex_unlock (&tiq_list_lock);synchronize_rcu (); +INIT_LIST_HEAD (&q->entry); }static inline int has_multiple_inq_on_dsci (struct qdio_irq *irq_ptr)
Greg Kroah-Hartman
maintainerPATCH 54/54 s390/qdio: dont touch the dsci in tiqdio_add_input_queues()
In reply to Greg Kroah-HartmanFrom: Julian Wiedmann <[email protected]>
commit ac6639cd3db607d386616487902b4cc1850a7be5 upstream.
Current code sets the dsci to 0x00000080. Which doesn't make any sense, as the indicator area is located in the _left-most_ byte.
Worse: if the dsci is the _shared_ indicator, this potentially clears the indication of activity for a _different_ device. tiqdio_thinint_handler() will then have no reason to call that device's IRQ handler, and the device ends up stalling.
--- drivers/s390/cio/qdio_thinint.c | 1 - 1 file changed, 1 deletion(-)
drivers/s390/cio/qdio_thinint.c +0 -1
@@ -80,7 +80,6 @@ void tiqdio_add_input_queues(struct qdiomutex_lock (&tiq_list_lock);list_add_rcu (&irq_ptr->input_qs[0 ]->entry, &tiq_list);mutex_unlock (&tiq_list_lock); -xchg (irq_ptr->dsci,1 <<7 ); }void tiqdio_remove_input_queues (struct qdio_irq *irq_ptr)
stable-rc/linux-4.9.y boot: 105 boots: 0 failed, 104 passed with 1 offline (v4.9.185-55-gcc08f2abafc7)
stable-rc/linux-4.9.y boot: 105 boots: 0 failed, 104 passed with 1 offline (v4.9.185-55-gcc08f2abafc7)
Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-4.9.y/kernel/v4.9.185-55-gcc08f2abafc7/
Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.9.y/kernel/v4.9.185-55-gcc08f2abafc7/
Tree: stable-rc
Branch: linux-4.9.y
Git Describe: v4.9.185-55-gcc08f2abafc7
Git Commit: cc08f2abafc74b206e12ac1f1b11284ccc032572
Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
Tested: 50 unique boards, 23 SoC families, 15 builds out of 197
Offline Platforms:
arm64:
defconfig:
gcc-8
meson-gxbb-odroidc2: 1 offline lab
---
For more info write to <[email protected]>
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.9.186 release. There are 54 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat 20 Jul 2019 02:59:27 AM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.186-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.9.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
Summary
------------------------------------------------------------------------
kernel: 4.9.186-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-4.9.y
git commit: 0bfad9234a3a02e29c02d95e2c48f4f3aa86df8f
git describe: v4.9.185-55-g0bfad9234a3a
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-4.9-oe/build/v4.9.185-55-g0bfad9234a3a
No regressions (compared to build v4.9.185)
No fixes (compared to build v4.9.185)
Ran 23690 total tests in the following environments and test suites.
Environments
--------------
- dragonboard-410c - arm64
- hi6220-hikey - arm64
- i386
- juno-r2 - arm64
- qemu_arm
- qemu_arm64
- qemu_i386
- qemu_x86_64
- x15 - arm
- x86_64
Test Suites
-----------
* build
* install-android-platform-tools-r2600
* kselftest
* libhugetlbfs
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-cpuhotplug-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* ltp-timers-tests
* perf
* spectre-meltdown-checker-test
* v4l2-compliance
* network-basic-tests
* ltp-open-posix-tests
* prep-tmp-disk
* kvm-unit-tests
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-none
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Jon Hunter
maintainerQuoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.9.186 release. There are 54 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat 20 Jul 2019 02:59:27 AM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.186-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.9.y
and the diffstat can be found below.thanks,
greg k-h
All tests are passing for Tegra ...
Test results for stable-v4.9:
8 builds: 8 pass, 0 fail
16 boots: 16 pass, 0 fail
24 tests: 24 pass, 0 failLinux version: 4.9.186-rc1-g0bfad9234a3a
Boards tested: tegra124-jetson-tk1, tegra20-ventana,
tegra210-p2371-2180, tegra30-cardhu-a04
Cheers
Jon
Signature · 1 line
nvpublic
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.9.186 release. There are 54 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat 20 Jul 2019 02:59:27 AM UTC. Anything received after that time might be too late.
Build results:
total: 172 pass: 172 fail: 0 Qemu test results: total: 333 pass: 333 fail: 0
Guenter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.9.186 release. There are 54 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat 20 Jul 2019 02:59:27 AM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.186-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.9.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted with no regressions on my system.
-Kelsey
Built and booted in my x86 test machine. No regressions found.
Thank you
Bharath