4.19.61-stable review
Subsystems (9)
Greg Kroah-Hartman
maintainerPATCH 67/271 x86/cpu: Add Ice Lake NNPI to Intel family
In reply to Greg Kroah-Hartman[ Upstream commit e32d045cd4ba06b59878323e434bad010e78e658 ]
Add the CPUID model number of Ice Lake Neural Network Processor for Deep Learning Inference (ICL-NNPI) to the Intel family list. Ice Lake NNPI uses model number 0x9D and this will be documented in a future version of Intel Software Development Manual.
--- arch/x86/include/asm/intel-family.h | 1 + 1 file changed, 1 insertion(+)
arch/x86/include/asm/intel-family.h +1 -0
@@ -56,6 +56,7 @@#define INTEL_FAM6_ICELAKE_XEON_D 0x6C#define INTEL_FAM6_ICELAKE_DESKTOP 0x7D#define INTEL_FAM6_ICELAKE_MOBILE 0x7E +#define INTEL_FAM6_ICELAKE_NNPI 0x9D/* "Small Core" Processors (Atom) */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 218/271 padata: use smp_mb in padata_reorder to avoid orphaned padata jobs
In reply to Greg Kroah-HartmanFrom: Daniel Jordan <[email protected]>
commit cf144f81a99d1a3928f90b0936accfd3f45c9a0a upstream.
Testing padata with the tcrypt module on a 5.2 kernel...
# modprobe tcrypt alg="pcrypt(rfc4106(gcm(aes)))" type=3
# modprobe tcrypt mode=211 sec=1...produces this splat:
INFO: task modprobe:10075 blocked for more than 120 seconds.
Not tainted 5.2.0-base+ #16
modprobe D 0 10075 10064 0x80004080
Call Trace:
? __schedule+0x4dd/0x610
? ring_buffer_unlock_commit+0x23/0x100
schedule+0x6c/0x90
schedule_timeout+0x3b/0x320
? trace_buffer_unlock_commit_regs+0x4f/0x1f0
wait_for_common+0x160/0x1a0
? wake_up_q+0x80/0x80
{ crypto_wait_req } # entries in braces added by hand
{ do_one_aead_op }
{ test_aead_jiffies }
test_aead_speed.constprop.17+0x681/0xf30 [tcrypt]
do_test+0x4053/0x6a2b [tcrypt]
? 0xffffffffa00f4000
tcrypt_mod_init+0x50/0x1000 [tcrypt]
...The second modprobe command never finishes because in padata_reorder, CPU0's load of reorder_objects is executed before the unlocking store in spin_unlock_bh(pd->lock), causing CPU0 to miss CPU1's increment:
CPU0 CPU1
padata_reorder padata_do_serial
LOAD reorder_objects // 0
INC reorder_objects // 1 padata_reorder
TRYLOCK pd->lock // failed
UNLOCK pd->lock
CPU0 deletes the timer before returning from padata_reorder and since no other job is submitted to padata, modprobe waits indefinitely.
Add a pair of full barriers to guarantee proper ordering:
CPU0 CPU1
padata_reorder padata_do_serial
UNLOCK pd->lock
smp_mb()
LOAD reorder_objects
INC reorder_objects
smp_mb__after_atomic()
padata_reorder
TRYLOCK pd->locksmp_mb__after_atomic is needed so the read part of the trylock operation
comes after the INC, as Andrea points out. Thanks also to Andrea for
help with writing a litmus test.
--- kernel/padata.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
kernel/padata.c +12 -0
@@ -267,7 +267,12 @@ static void padata_reorder(struct parall* The next object that needs serialization might have arrived to * the reorder queues in the meantime, we will be called again * from the timer function if no one else cares for it. +* +* Ensure reorder_objects is read after pd->lock is dropped so we see +* an increment from another task in padata_do_serial. Pairs with +* smp_mb__after_atomic in padata_do_serial. */ +smp_mb ();if (atomic_read (&pd->reorder_objects) && !(pinst->flags &PADATA_RESET ))mod_timer (&pd->timer, jiffies +HZ );
@@ -387,6 +392,13 @@ void padata_do_serial(struct padata_privlist_add_tail (&padata->list, &pqueue->reorder.list);spin_unlock (&pqueue->reorder.lock); +/* +* Ensure the atomic_inc of reorder_objects above is ordered correctly +* with the trylock of pd->lock in padata_reorder. Pairs with smp_mb +* in padata_reorder. +*/ +smp_mb__after_atomic (); +put_cpu ();/* If we're running on the wrong CPU, call padata_reorder() via a
Greg Kroah-Hartman
maintainerPATCH 1/271 MIPS: ath79: fix ar933x uart parity mode
In reply to Greg Kroah-Hartman[ Upstream commit db13a5ba2732755cf13320f3987b77cf2a71e790 ]
While trying to get the uart with parity working I found setting even parity enabled odd parity insted. Fix the register settings to match the datasheet of AR9331.
A similar patch was created by 8devices, but not sent upstream.
https://github.com/8devices/openwrt-8devices/commit/77c5586ade3bb72cda010afad3f209ed0c98ea7c
--- arch/mips/include/asm/mach-ath79/ar933x_uart.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/mips/include/asm/mach-ath79/ar933x_uart.h +2 -2
@@ -27,8 +27,8 @@#define AR933X_UART_CS_PARITY_S 0#define AR933X_UART_CS_PARITY_M 0x3#define AR933X_UART_CS_PARITY_NONE 0 -#define AR933X_UART_CS_PARITY_ODD 1 -#define AR933X_UART_CS_PARITY_EVEN 2 +#define AR933X_UART_CS_PARITY_ODD 2 +#define AR933X_UART_CS_PARITY_EVEN 3#define AR933X_UART_CS_IF_MODE_S 2#define AR933X_UART_CS_IF_MODE_M 0x3#define AR933X_UART_CS_IF_MODE_NONE 0
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 10/271 ath10k: add peer id check in ath10k_peer_find_by_id
In reply to Greg Kroah-Hartman[ Upstream commit 49ed34b835e231aa941257394716bc689bc98d9f ]
For some SDIO chip, the peer id is 65535 for MPDU with error status, then test_bit will trigger buffer overflow for peer's memory, if kasan enabled, it will report error.
Reason is when station is in disconnecting status, firmware do not delete the peer info since it not disconnected completely, meanwhile some AP will still send data packet to station, then hardware will receive the packet and send to firmware, firmware's logic will report peer id of 65535 for MPDU with error status.
Add check for overflow the size of peer's peer_ids will avoid the buffer overflow access.
Call trace of kasan:
dump_backtrace+0x0/0x2ec show_stack+0x20/0x2c __dump_stack+0x20/0x28 dump_stack+0xc8/0xec print_address_description+0x74/0x240 kasan_report+0x250/0x26c __asan_report_load8_noabort+0x20/0x2c ath10k_peer_find_by_id+0x180/0x1e4 [ath10k_core] ath10k_htt_t2h_msg_handler+0x100c/0x2fd4 [ath10k_core] ath10k_htt_htc_t2h_msg_handler+0x20/0x34 [ath10k_core] ath10k_sdio_irq_handler+0xcc8/0x1678 [ath10k_sdio] process_sdio_pending_irqs+0xec/0x370 sdio_run_irqs+0x68/0xe4 sdio_irq_work+0x1c/0x28 process_one_work+0x3d8/0x8b0 worker_thread+0x508/0x7cc kthread+0x24c/0x264 ret_from_fork+0x10/0x18
Tested with QCA6174 SDIO with firmware
WLAN.RMH.4.4.1-00007-QCARMSWP-1.
--- drivers/net/wireless/ath/ath10k/txrx.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/ath/ath10k/txrx.c +3 -0
@@ -156,6 +156,9 @@ struct ath10k_peer *ath10k_peer_find_by_id(struct ath10k *ar, int peer_id) {struct ath10k_peer *peer; +if (peer_id >=BITS_PER_TYPE (peer->peer_ids)) +return NULL ; +lockdep_assert_held (&ar->data_lock);list_for_each_entry (peer, &ar->peers, list)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 11/271 wil6210: fix spurious interrupts in 3-msi
In reply to Greg Kroah-Hartman[ Upstream commit e10b0eddd5235aa5aef4e40b970e34e735611a80 ]
Interrupt is set in ICM (ICR & ~IMV) rising trigger. As the driver masks the IRQ after clearing it, there can be a race where an additional spurious interrupt is triggered when the driver unmask the IRQ.
This can happen in case HW triggers an interrupt after the clear and before the mask.
To prevent the second spurious interrupt the driver needs to mask the IRQ before reading and clearing it.
--- drivers/net/wireless/ath/wil6210/interrupt.c | 65 ++++++++++++-------- 1 file changed, 40 insertions(+), 25 deletions(-)
drivers/net/wireless/ath/wil6210/interrupt.c +40 -25
@@ -296,21 +296,24 @@ void wil_configure_interrupt_moderation(struct wil6210_priv *wil)static irqreturn_t wil6210_irq_rx (int irq,void *cookie) {struct wil6210_priv *wil = cookie; -u32 isr =wil_ioread32_and_clear (wil->csr + -HOSTADDR (RGF_DMA_EP_RX_ICR ) + - offsetof(struct RGF_ICR , ICR)); +u32 isr;bool need_unmask = true; +wil6210_mask_irq_rx (wil); + + isr =wil_ioread32_and_clear (wil->csr + +HOSTADDR (RGF_DMA_EP_RX_ICR ) + + offsetof(struct RGF_ICR , ICR)); +trace_wil6210_irq_rx (isr);wil_dbg_irq (wil,"ISR RX 0x%08x\n" , isr);if (unlikely (!isr)) {wil_err_ratelimited (wil,"spurious IRQ: RX\n" ); +wil6210_unmask_irq_rx (wil);return IRQ_NONE ; } -wil6210_mask_irq_rx (wil); -/* RX_DONE and RX_HTRSH interrupts are the same if interrupt * moderation is not used. Interrupt moderation may cause RX * buffer overflow while RX_DONE is delayed. The required
@@ -355,21 +358,24 @@ static irqreturn_t wil6210_irq_rx(int irq, void *cookie)static irqreturn_t wil6210_irq_rx_edma (int irq,void *cookie) {struct wil6210_priv *wil = cookie; -u32 isr =wil_ioread32_and_clear (wil->csr + -HOSTADDR (RGF_INT_GEN_RX_ICR ) + - offsetof(struct RGF_ICR , ICR)); +u32 isr;bool need_unmask = true; +wil6210_mask_irq_rx_edma (wil); + + isr =wil_ioread32_and_clear (wil->csr + +HOSTADDR (RGF_INT_GEN_RX_ICR ) + + offsetof(struct RGF_ICR , ICR)); +trace_wil6210_irq_rx (isr);wil_dbg_irq (wil,"ISR RX 0x%08x\n" , isr);if (unlikely (!isr)) {wil_err (wil,"spurious IRQ: RX\n" ); +wil6210_unmask_irq_rx_edma (wil);return IRQ_NONE ; } -wil6210_mask_irq_rx_edma (wil); -if (likely (isr &BIT_RX_STATUS_IRQ )) {wil_dbg_irq (wil,"RX status ring\n" ); isr &= ~BIT_RX_STATUS_IRQ ;
@@ -403,21 +409,24 @@ static irqreturn_t wil6210_irq_rx_edma(int irq, void *cookie)static irqreturn_t wil6210_irq_tx_edma (int irq,void *cookie) {struct wil6210_priv *wil = cookie; -u32 isr =wil_ioread32_and_clear (wil->csr + -HOSTADDR (RGF_INT_GEN_TX_ICR ) + - offsetof(struct RGF_ICR , ICR)); +u32 isr;bool need_unmask = true; +wil6210_mask_irq_tx_edma (wil); + + isr =wil_ioread32_and_clear (wil->csr + +HOSTADDR (RGF_INT_GEN_TX_ICR ) + + offsetof(struct RGF_ICR , ICR)); +trace_wil6210_irq_tx (isr);wil_dbg_irq (wil,"ISR TX 0x%08x\n" , isr);if (unlikely (!isr)) {wil_err (wil,"spurious IRQ: TX\n" ); +wil6210_unmask_irq_tx_edma (wil);return IRQ_NONE ; } -wil6210_mask_irq_tx_edma (wil); -if (likely (isr &BIT_TX_STATUS_IRQ )) {wil_dbg_irq (wil,"TX status ring\n" ); isr &= ~BIT_TX_STATUS_IRQ ;
@@ -446,21 +455,24 @@ static irqreturn_t wil6210_irq_tx_edma(int irq, void *cookie)static irqreturn_t wil6210_irq_tx (int irq,void *cookie) {struct wil6210_priv *wil = cookie; -u32 isr =wil_ioread32_and_clear (wil->csr + -HOSTADDR (RGF_DMA_EP_TX_ICR ) + - offsetof(struct RGF_ICR , ICR)); +u32 isr;bool need_unmask = true; +wil6210_mask_irq_tx (wil); + + isr =wil_ioread32_and_clear (wil->csr + +HOSTADDR (RGF_DMA_EP_TX_ICR ) + + offsetof(struct RGF_ICR , ICR)); +trace_wil6210_irq_tx (isr);wil_dbg_irq (wil,"ISR TX 0x%08x\n" , isr);if (unlikely (!isr)) {wil_err_ratelimited (wil,"spurious IRQ: TX\n" ); +wil6210_unmask_irq_tx (wil);return IRQ_NONE ; } -wil6210_mask_irq_tx (wil); -if (likely (isr &BIT_DMA_EP_TX_ICR_TX_DONE )) {wil_dbg_irq (wil,"TX done\n" ); isr &= ~BIT_DMA_EP_TX_ICR_TX_DONE ;
@@ -532,20 +544,23 @@ static bool wil_validate_mbox_regs(struct wil6210_priv *wil)static irqreturn_t wil6210_irq_misc (int irq,void *cookie) {struct wil6210_priv *wil = cookie; -u32 isr =wil_ioread32_and_clear (wil->csr + -HOSTADDR (RGF_DMA_EP_MISC_ICR ) + - offsetof(struct RGF_ICR , ICR)); +u32 isr; + +wil6210_mask_irq_misc (wil, false); + + isr =wil_ioread32_and_clear (wil->csr + +HOSTADDR (RGF_DMA_EP_MISC_ICR ) + + offsetof(struct RGF_ICR , ICR));trace_wil6210_irq_misc (isr);wil_dbg_irq (wil,"ISR MISC 0x%08x\n" , isr);if (!isr) {wil_err (wil,"spurious IRQ: MISC\n" ); +wil6210_unmask_irq_misc (wil, false);return IRQ_NONE ; } -wil6210_mask_irq_misc (wil, false); -if (isr &ISR_MISC_FW_ERROR ) {u32 fw_assert_code =wil_r (wil, wil->rgf_fw_assert_code_addr); u32 ucode_assert_code =
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 12/271 ath: DFS JP domain W56 fixed pulse type 3 RADAR detection
In reply to Greg Kroah-Hartman[ Upstream commit d8792393a783158cbb2c39939cb897dc5e5299b6 ]
Increase pulse width range from 1-2usec to 0-4usec.
During data traffic HW occasionally fails detecting radar pulses, so that SW cannot get enough radar reports to achieve the success rate.
Tested ath10k hw and fw:
* QCA9888(10.4-3.5.1-00052)
* QCA4019(10.4-3.2.1.1-00017)
* QCA9984(10.4-3.6-00104)
* QCA988X(10.2.4-1.0-00041)
Tested ath9k hw: AR9300
--- drivers/net/wireless/ath/dfs_pattern_detector.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/dfs_pattern_detector.c +1 -1
@@ -111,7 +111,7 @@ static const struct radar_detector_specs jp_radar_ref_types[] = {JP_PATTERN (0 ,0 ,1 ,1428 ,1428 ,1 ,18 ,29 , false),JP_PATTERN (1 ,2 ,3 ,3846 ,3846 ,1 ,18 ,29 , false),JP_PATTERN (2 ,0 ,1 ,1388 ,1388 ,1 ,18 ,50 , false), -JP_PATTERN (3 ,1 ,2 ,4000 ,4000 ,1 ,18 ,50 , false), +JP_PATTERN (3 ,0 ,4 ,4000 ,4000 ,1 ,18 ,50 , false),JP_PATTERN (4 ,0 ,5 ,150 ,230 ,1 ,23 ,50 , false),JP_PATTERN (5 ,6 ,10 ,200 ,500 ,1 ,16 ,50 , false), JP_PATTERN(6, 11, 20, 200, 500, 1, 12, 50, false),
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 13/271 regmap: debugfs: Fix memory leak in regmap_debugfs_init
In reply to Greg Kroah-Hartman[ Upstream commit 2899872b627e99b7586fe3b6c9f861da1b4d5072 ]
As detected by kmemleak running on i.MX6ULL board:
nreferenced object 0xd8366600 (size 64):
comm "swapper/0", pid 1, jiffies 4294937370 (age 933.220s) hex dump (first 32 bytes):
64 75 6d 6d 79 2d 69 6f 6d 75 78 63 2d 67 70 72 dummy-iomuxc-gpr
40 32 30 65 34 30 30 30 00 e3 f3 ab fe d1 1b dd @20e4000........
backtrace:
[<b0402aec>] kasprintf+0x2c/0x54
[<a6fbad2c>] regmap_debugfs_init+0x7c/0x31c
[<9c8d91fa>] __regmap_init+0xb5c/0xcf4
[<5b1c3d2a>] of_syscon_register+0x164/0x2c4
[<596a5d80>] syscon_node_to_regmap+0x64/0x90
[<49bd597b>] imx6ul_init_machine+0x34/0xa0
[<250a4dac>] customize_machine+0x1c/0x30
[<2d19fdaf>] do_one_initcall+0x7c/0x398
[<e6084469>] kernel_init_freeable+0x328/0x448
[<168c9101>] kernel_init+0x8/0x114
[<913268aa>] ret_from_fork+0x14/0x20
[<ce7b131a>] 0x0Root cause is that map->debugfs_name is allocated using kasprintf and then the pointer is lost by assigning it other memory address.
--- drivers/base/regmap/regmap-debugfs.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/base/regmap/regmap-debugfs.c +2 -0
@@ -575,6 +575,8 @@ void regmap_debugfs_init(struct regmap *map, const char *name) }if (!strcmp (name,"dummy" )) { +kfree (map->debugfs_name); + map->debugfs_name =kasprintf (GFP_KERNEL ,"dummy%d" , dummy_index); name = map->debugfs_name;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 16/271 media: spi: IR LED: add missing of table registration
In reply to Greg Kroah-Hartman[ Upstream commit 24e4cf770371df6ad49ed873f21618d9878f64c8 ]
MODULE_DEVICE_TABLE(of, <of_match_table> should be called to complete DT OF mathing mechanism and register it.
Before this patch:
modinfo drivers/media/rc/ir-spi.ko | grep alias
After this patch:
modinfo drivers/media/rc/ir-spi.ko | grep alias
alias: of:N*T*Cir-spi-ledC* alias: of:N*T*Cir-spi-led
--- drivers/media/rc/ir-spi.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/rc/ir-spi.c +1 -0
@@ -161,6 +161,7 @@ static const struct of_device_id ir_spi_of_match[] = { { .compatible = "ir-spi-led" }, {}, }; +MODULE_DEVICE_TABLE (of, ir_spi_of_match);static struct spi_driver ir_spi_driver = { .probe = ir_spi_probe,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 17/271 crypto: talitos - fix skcipher failure due to wrong output IV
In reply to Greg Kroah-Hartman[ Upstream commit 3e03e792865ae48b8cfc69a0b4d65f02f467389f ]
Selftests report the following:
[ 2.984845] alg: skcipher: cbc-aes-talitos encryption test failed (wrong output IV) on test vector 0, cfg="in-place" [ 2.995377] 00000000: 3d af ba 42 9d 9e b4 30 b4 22 da 80 2c 9f ac 41 [ 3.032673] alg: skcipher: cbc-des-talitos encryption test failed (wrong output IV) on test vector 0, cfg="in-place" [ 3.043185] 00000000: fe dc ba 98 76 54 32 10 [ 3.063238] alg: skcipher: cbc-3des-talitos encryption test failed (wrong output IV) on test vector 0, cfg="in-place" [ 3.073818] 00000000: 7d 33 88 93 0f 93 b2 42
This above dumps show that the actual output IV is indeed the input IV. This is due to the IV not being copied back into the request.
This patch fixes that.
--- drivers/crypto/talitos.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/crypto/talitos.c +4 -0
@@ -1553,11 +1553,15 @@ static void ablkcipher_done(struct device *dev, int err) {struct ablkcipher_request *areq = context; +struct crypto_ablkcipher *cipher =crypto_ablkcipher_reqtfm (areq); +struct talitos_ctx *ctx =crypto_ablkcipher_ctx (cipher); +unsigned int ivsize =crypto_ablkcipher_ivsize (cipher);struct talitos_edesc *edesc; edesc = container_of(desc, struct talitos_edesc, desc);common_nonsnoop_unmap (dev, edesc, areq); +memcpy (areq->info, ctx->iv, ivsize);kfree (edesc);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 18/271 media: ov7740: avoid invalid framesize setting
In reply to Greg Kroah-Hartman[ Upstream commit 6e4ab830ac6d6a0d7cd7f87dc5d6536369bf24a8 ]
If the requested framesize by VIDIOC_SUBDEV_S_FMT is larger than supported framesizes, it causes an out of bounds array access and the resulting framesize is unexpected.
Avoid out of bounds array access and select the default framesize.
--- drivers/media/i2c/ov7740.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/media/i2c/ov7740.c +5 -1
@@ -761,7 +761,11 @@ static int ov7740_try_fmt_internal(struct v4l2_subdev *sd, fsize++; } - +if (i >=ARRAY_SIZE (ov7740_framesizes)) { + fsize = &ov7740_framesizes[0 ]; + fmt->width = fsize->width; + fmt->height = fsize->height; + }if (ret_frmsize !=NULL ) *ret_frmsize = fsize;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 19/271 media: marvell-ccic: fix DMA s/g desc number calculation
In reply to Greg Kroah-Hartman[ Upstream commit 0c7aa32966dab0b8a7424e1b34c7f206817953ec ]
The commit d790b7eda953 ("[media] vb2-dma-sg: move dma_(un)map_sg here") left dma_desc_nent unset. It previously contained the number of DMA descriptors as returned from dma_map_sg().
We can now (since the commit referred to above) obtain the same value from the sg_table and drop dma_desc_nent altogether.
Tested on OLPC XO-1.75 machine. Doesn't affect the OLPC XO-1's Cafe driver, since that one doesn't do DMA.
[[email protected]: fix a checkpatch warning]
--- drivers/media/platform/marvell-ccic/mcam-core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/media/platform/marvell-ccic/mcam-core.c +3 -2
@@ -200,7 +200,6 @@ struct mcam_vb_buffer {struct list_head queue;struct mcam_dma_desc *dma_desc;/* Descriptor virtual address */ dma_addr_t dma_desc_pa;/* Descriptor physical address */ -int dma_desc_nent;/* Number of mapped descriptors */ };static inline struct mcam_vb_buffer *vb_to_mvb (struct vb2_v4l2_buffer *vb)
@@ -608,9 +607,11 @@ static void mcam_dma_contig_done(struct mcam_camera *cam, int frame)static void mcam_sg_next_buffer (struct mcam_camera *cam) {struct mcam_vb_buffer *buf; +struct sg_table *sg_table; buf = list_first_entry(&cam->buffers, struct mcam_vb_buffer, queue);list_del_init (&buf->queue); + sg_table =vb2_dma_sg_plane_desc (&buf->vb_buf.vb2_buf,0 );/* * Very Bad Not Good Things happen if you don't clear * C1_DESC_ENA before making any descriptor changes.
@@ -618,7 +619,7 @@ static void mcam_sg_next_buffer(struct mcam_camera *cam)mcam_reg_clear_bit (cam,REG_CTRL1 ,C1_DESC_ENA );mcam_reg_write (cam,REG_DMA_DESC_Y , buf->dma_desc_pa);mcam_reg_write (cam,REG_DESC_LEN_Y , - buf->dma_desc_nent*sizeof (struct mcam_dma_desc )); + sg_table->nents *sizeof (struct mcam_dma_desc ));mcam_reg_write (cam,REG_DESC_LEN_U ,0 );mcam_reg_write (cam,REG_DESC_LEN_V ,0 );mcam_reg_set_bit (cam,REG_CTRL1 ,C1_DESC_ENA );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 2/271 MIPS: fix build on non-linux hosts
In reply to Greg Kroah-Hartman[ Upstream commit 1196364f21ffe5d1e6d83cafd6a2edb89404a3ae ]
calc_vmlinuz_load_addr.c requires SZ_64K to be defined for alignment purposes. It included "../../../../include/linux/sizes.h" to define that size, however "sizes.h" tries to include <linux/const.h> which assumes linux system headers. These may not exist eg. the following error was encountered when building Linux for OpenWrt under macOS:
In file included from arch/mips/boot/compressed/calc_vmlinuz_load_addr.c:16:arch/mips/boot/compressed/../../../../include/linux/sizes.h:11:10: fatal error: 'linux/const.h' file not found
^~~~~~~~~~
Change makefile to force building on local linux headers instead of system headers. Also change eye-watering relative reference in include file spec.
Thanks to Jo-Philip Wich & Petr Štetiar for assistance in tracking this down & fixing.
--- arch/mips/boot/compressed/Makefile | 2 ++ arch/mips/boot/compressed/calc_vmlinuz_load_addr.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
arch/mips/boot/compressed/Makefile +2 -0
@@ -78,6 +78,8 @@ OBJCOPYFLAGS_piggy.o := --add-section=.image=$(obj)/vmlinux.bin.z \ $(obj)/piggy.o: $(obj)/dummy.o $(obj)/vmlinux.bin.z FORCE $(call if_changed,objcopy) +HOSTCFLAGS_calc_vmlinuz_load_addr.o += $(LINUXINCLUDE) + # Calculate the load address of the compressed kernel image hostprogs-y := calc_vmlinuz_load_addr
arch/mips/boot/compressed/calc_vmlinuz_load_addr.c +1 -1
@@ -13,7 +13,7 @@#include <stdint.h> #include <stdio.h> #include <stdlib.h> -#include "../../../../include/linux/sizes.h" +#include <linux/sizes.h> int main (int argc,char *argv[]) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 21/271 media: media_device_enum_links32: clean a reserved field
In reply to Greg Kroah-Hartman[ Upstream commit f49308878d7202e07d8761238e01bd0e5fce2750 ]
In v4l2-compliance utility, test MEDIA_IOC_ENUM_ENTITIES will check whether reserved field of media_links_enum filled with zero.
However, for 32 bit program, the reserved field is missing copy from kernel space to user space in media_device_enum_links32 function.
This patch adds the cleaning a reserved field logic in media_device_enum_links32 function.
--- drivers/media/media-device.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/media/media-device.c +8 -1
@@ -487,6 +487,7 @@ static long media_device_enum_links32(struct media_device *mdev, {struct media_links_enum links;compat_uptr_t pads_ptr, links_ptr; +int ret;memset (&links,0 ,sizeof (links));
@@ -498,7 +499,13 @@ static long media_device_enum_links32(struct media_device *mdev, links.pads =compat_ptr (pads_ptr); links.links =compat_ptr (links_ptr); -return media_device_enum_links (mdev, &links); + ret =media_device_enum_links (mdev, &links); +if (ret) +return ret; + +memset (ulinks->reserved,0 ,sizeof (ulinks->reserved)); + +return 0 ; }#define MEDIA_IOC_ENUM_LINKS32 _IOWR('|', 0x02, struct media_links_enum32)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 22/271 net: stmmac: dwmac1000: Clear unused address entries
In reply to Greg Kroah-Hartman[ Upstream commit 9463c445590091202659cdfdd44b236acadfbd84 ]
In case we don't use a given address entry we need to clear it because it could contain previous values that are no longer valid.
Found out while running stmmac selftests.
--- drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c +6 -0
@@ -216,6 +216,12 @@ static void dwmac1000_set_filter(struct mac_device_info *hw, GMAC_ADDR_LOW(reg)); reg++; } + +while (reg <= perfect_addr_number) { +writel (0 , ioaddr +GMAC_ADDR_HIGH (reg)); +writel (0 , ioaddr +GMAC_ADDR_LOW (reg)); + reg++; + } }#ifdef FRAME_FILTER_DEBUG
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 23/271 net: stmmac: dwmac4/5: Clear unused address entries
In reply to Greg Kroah-Hartman[ Upstream commit 0620ec6c62a5a07625b65f699adc5d1b90394ee6 ]
In case we don't use a given address entry we need to clear it because it could contain previous values that are no longer valid.
Found out while running stmmac selftests.
--- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +8 -2
@@ -444,14 +444,20 @@ static void dwmac4_set_filter(struct mac_device_info *hw,* are required */ value |=GMAC_PACKET_FILTER_PR ; - }else if (!netdev_uc_empty (dev)) { -int reg =1 ; + }else {struct netdev_hw_addr *ha; +int reg =1 ;netdev_for_each_uc_addr (ha, dev) {dwmac4_set_umac_addr (hw, ha->addr, reg); reg++; } + +while (reg <=GMAC_MAX_PERFECT_ADDRESSES ) { +writel (0 , ioaddr +GMAC_ADDR_HIGH (reg)); +writel (0 , ioaddr +GMAC_ADDR_LOW (reg)); + reg++; + } }writel (value, ioaddr +GMAC_PACKET_FILTER );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 25/271 signal/pid_namespace: Fix reboot_pid_ns to use send_sig not force_sig
In reply to Greg Kroah-Hartman[ Upstream commit f9070dc94542093fd516ae4ccea17ef46a4362c5 ]
The locking in force_sig_info is not prepared to deal with a task that exits or execs (as sighand may change). The is not a locking problem in force_sig as force_sig is only built to handle synchronous exceptions.
Further the function force_sig_info changes the signal state if the signal is ignored, or blocked or if SIGNAL_UNKILLABLE will prevent the delivery of the signal. The signal SIGKILL can not be ignored and can not be blocked and SIGNAL_UNKILLABLE won't prevent it from being delivered.
So using force_sig rather than send_sig for SIGKILL is confusing and pointless.
Because it won't impact the sending of the signal and and because using force_sig is wrong, replace force_sig with send_sig.
--- kernel/pid_namespace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/pid_namespace.c +1 -1
@@ -325,7 +325,7 @@ int reboot_pid_ns(struct pid_namespace *pid_ns, int cmd) }read_lock (&tasklist_lock); -force_sig (SIGKILL , pid_ns->child_reaper); +send_sig (SIGKILL , pid_ns->child_reaper,1 );read_unlock (&tasklist_lock);do_exit (0 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 26/271 signal/cifs: Fix cifs_put_tcp_session to call send_sig instead of force_sig
In reply to Greg Kroah-Hartman[ Upstream commit 72abe3bcf0911d69b46c1e8bdb5612675e0ac42c ]
The locking in force_sig_info is not prepared to deal with a task that exits or execs (as sighand may change). The is not a locking problem in force_sig as force_sig is only built to handle synchronous exceptions.
Further the function force_sig_info changes the signal state if the signal is ignored, or blocked or if SIGNAL_UNKILLABLE will prevent the delivery of the signal. The signal SIGKILL can not be ignored and can not be blocked and SIGNAL_UNKILLABLE won't prevent it from being delivered.
So using force_sig rather than send_sig for SIGKILL is confusing and pointless.
Because it won't impact the sending of the signal and and because using force_sig is wrong, replace force_sig with send_sig.
--- fs/cifs/connect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cifs/connect.c +1 -1
@@ -2428,7 +2428,7 @@ cifs_put_tcp_session(struct TCP_Server_Info *server, int from_reconnect) task =xchg (&server->tsk,NULL );if (task) -force_sig (SIGKILL , task); +send_sig (SIGKILL , task,1 ); } static struct TCP_Server_Info *
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 27/271 af_key: fix leaks in key_pol_get_resp and dump_sp.
In reply to Greg Kroah-Hartman[ Upstream commit 7c80eb1c7e2b8420477fbc998971d62a648035d9 ]
In both functions, if pfkey_xfrm_policy2msg failed we leaked the newly allocated sk_buff. Free it on error.
--- net/key/af_key.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
net/key/af_key.c +6 -2
@@ -2442,8 +2442,10 @@ static int key_pol_get_resp(struct sock *sk, struct xfrm_policy *xp, const struc goto out; } err =pfkey_xfrm_policy2msg (out_skb, xp, dir); -if (err <0 ) +if (err <0 ) { +kfree_skb (out_skb); goto out; + } out_hdr = (struct sadb_msg *) out_skb->data; out_hdr->sadb_msg_version = hdr->sadb_msg_version;
@@ -2694,8 +2696,10 @@ static int dump_sp(struct xfrm_policy *xp, int dir, int count, void *ptr)return PTR_ERR (out_skb); err =pfkey_xfrm_policy2msg (out_skb, xp, dir); -if (err <0 ) +if (err <0 ) { +kfree_skb (out_skb);return err; + } out_hdr = (struct sadb_msg *) out_skb->data; out_hdr->sadb_msg_version = pfk->dump.msg_version;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 28/271 xfrm: Fix xfrm sel prefix length validation
In reply to Greg Kroah-Hartman[ Upstream commit b38ff4075a80b4da5cb2202d7965332ca0efb213 ]
Family of src/dst can be different from family of selector src/dst. Use xfrm selector family to validate address prefix length, while verifying new sa from userspace.
Validated patch with this command:
ip xfrm state add src 1.1.6.1 dst 1.1.6.2 proto esp spi 4260196 \
reqid 20004 mode tunnel aead "rfc4106(gcm(aes))" \0x1111016400000000000000000000000044440001 128 \
sel src 1011:1:4::2/128 sel dst 1021:1:4::2/128 dev Port5
--- net/xfrm/xfrm_user.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
net/xfrm/xfrm_user.c +16 -0
@@ -150,6 +150,22 @@ static int verify_newsa_info(struct xfrm_usersa_info *p, err = -EINVAL ;switch (p->family) { +case AF_INET : +break ; + +case AF_INET6 : +#if IS_ENABLED (CONFIG_IPV6 ) +break ; +#else + err = -EAFNOSUPPORT ; + goto out; +#endif + +default : + goto out; + } + +switch (p->sel.family) {case AF_INET :if (p->sel.prefixlen_d >32 || p->sel.prefixlen_s >32 ) goto out;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 3/271 arm64/efi: Mark __efistub_stext_offset as an absolute symbol explicitly
In reply to Greg Kroah-Hartman[ Upstream commit aa69fb62bea15126e744af2e02acc0d6cf3ed4da ]
After r363059 and r363928 in LLVM, a build using ld.lld as the linker with CONFIG_RANDOMIZE_BASE enabled fails like so:
ld.lld: error: relocation R_AARCH64_ABS32 cannot be used against symbol __efistub_stext_offset; recompile with -fPIC
Fangrui and Peter figured out that ld.lld is incorrectly considering __efistub_stext_offset as a relative symbol because of the order in which symbols are evaluated. _text is treated as an absolute symbol and stext is a relative symbol, making __efistub_stext_offset a relative symbol.
Adding ABSOLUTE will force ld.lld to evalute this expression in the right context and does not change ld.bfd's behavior. ld.lld will need to be fixed but the developers do not see a quick or simple fix without some research (see the linked issue for further explanation). Add this simple workaround so that ld.lld can continue to link kernels.
--- arch/arm64/kernel/image.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm64/kernel/image.h +5 -1
@@ -73,7 +73,11 @@#ifdef CONFIG_EFI -__efistub_stext_offset = stext - _text; +/* +* Use ABSOLUTE() to avoid ld.lld treating this as a relative symbol: +* https://github.com/ClangBuiltLinux/linux/issues/561 +*/ +__efistub_stext_offset =ABSOLUTE (stext - _text);/* * The EFI stub has its own symbol namespace prefixed by __efistub_, to
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 30/271 perf annotate TUI browser: Do not use member from variable within its own initialization
In reply to Greg Kroah-Hartman[ Upstream commit da2019633f0b5c105ce658aada333422d8cb28fe ]
Some compilers will complain when using a member of a struct to initialize another member, in the same struct initialization.
For instance:
debian:8 Debian clang version 3.5.0-10 (tags/RELEASE_350/final) (based on LLVM 3.5.0)
oraclelinux:7 clang version 3.4.2 (tags/RELEASE_34/dot2-final)
Produce:
ui/browsers/annotate.c:104:12: error: variable 'ops' is uninitialized when used within its own initialization [-Werror,-Wuninitialized]
(!ops.current_entry ||
^~~1 error generated.
So use an extra variable, initialized just before that struct, to have the value used in the expressions used to init two of the struct members.
--- tools/perf/ui/browsers/annotate.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tools/perf/ui/browsers/annotate.c +3 -2
@@ -96,11 +96,12 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int struct annotate_browser *ab = container_of(browser, struct annotate_browser, b);struct annotation *notes =browser__annotation (browser); struct annotation_line *al = list_entry(entry, struct annotation_line, node); +const bool is_current_entry =ui_browser__is_current_entry (browser, row);struct annotation_write_ops ops = { .first_line = row ==0 , - .current_entry =ui_browser__is_current_entry (browser, row), + .current_entry = is_current_entry, .change_color = (!notes->options->hide_src_code && - (!ops.current_entry || + (!is_current_entry || (browser->use_navkeypressed && !browser->navkeypressed))), .width = browser->width,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 32/271 media: saa7164: fix remove_proc_entry warning
In reply to Greg Kroah-Hartman[ Upstream commit 50710eeefbc1ed25375942aad0c4d1eb4af0f330 ]
if saa7164_proc_create() fails, saa7164_fini() will trigger a warning,
name 'saa7164'
WARNING: CPU: 1 PID: 6311 at fs/proc/generic.c:672 remove_proc_entry+0x1e8/0x3a0 ? remove_proc_entry+0x1e8/0x3a0 ? try_stop_module+0x7b/0x240 ? proc_readdir+0x70/0x70 ? rcu_read_lock_sched_held+0xd7/0x100 saa7164_fini+0x13/0x1f [saa7164] __x64_sys_delete_module+0x30c/0x480 ? __ia32_sys_delete_module+0x480/0x480 ? __x64_sys_clock_gettime+0x11e/0x1c0 ? __x64_sys_timer_create+0x1a0/0x1a0 ? trace_hardirqs_off_caller+0x40/0x180 ? do_syscall_64+0x18/0x450 do_syscall_64+0x9f/0x450 entry_SYSCALL_64_after_hwframe+0x49/0xbe
Fix it by checking the return of proc_create_single() before calling remove_proc_entry().
--- drivers/media/pci/saa7164/saa7164-core.c | 33 ++++++++++++++++-------- 1 file changed, 22 insertions(+), 11 deletions(-)
drivers/media/pci/saa7164/saa7164-core.c +22 -11
@@ -1122,16 +1122,25 @@ static int saa7164_proc_show(struct seq_file *m, void *v) return 0; } +static struct proc_dir_entry *saa7164_pe; +static int saa7164_proc_create (void ) { -struct proc_dir_entry *pe; - - pe =proc_create_single ("saa7164" ,S_IRUGO ,NULL , saa7164_proc_show); -if (!pe) + saa7164_pe =proc_create_single ("saa7164" ,0444 ,NULL , saa7164_proc_show); +if (!saa7164_pe)return -ENOMEM ;return 0 ; } + +static void saa7164_proc_destroy (void ) +{ +if (saa7164_pe) +remove_proc_entry ("saa7164" ,NULL ); +} +#else +static int saa7164_proc_create (void ) {return 0 ; } +static void saa7164_proc_destroy (void ) {}#endif static int saa7164_thread_function (void *data)
@@ -1503,19 +1512,21 @@ static struct pci_driver saa7164_pci_driver = {static int __init saa7164_init (void ) { -printk (KERN_INFO "saa7164 driver loaded\n" ); +int ret =pci_register_driver (&saa7164_pci_driver); + +if (ret) +return ret; -#ifdef CONFIG_PROC_FS saa7164_proc_create (); -#endif -return pci_register_driver (&saa7164_pci_driver); + +pr_info ("saa7164 driver loaded\n" ); + +return 0 ; } static void __exit saa7164_fini(void) { -#ifdef CONFIG_PROC_FS -remove_proc_entry ("saa7164" ,NULL ); -#endif +saa7164_proc_destroy ();pci_unregister_driver (&saa7164_pci_driver); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 31/271 media: mc-device.c: dont memset __user pointer contents
In reply to Greg Kroah-Hartman[ Upstream commit 518fa4e0e0da97ea2e17c95ab57647ce748a96e2 ]
You can't memset the contents of a __user pointer. Instead, call copy_to_user to copy links.reserved (which is zeroed) to the user memory.
This fixes this sparse warning:
SPARSE:drivers/media/mc/mc-device.c drivers/media/mc/mc-device.c:521:16: warning: incorrect type in argument 1 (different address spaces)
--- drivers/media/media-device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/media/media-device.c +3 -2
@@ -503,8 +503,9 @@ static long media_device_enum_links32(struct media_device *mdev,if (ret)return ret; -memset (ulinks->reserved,0 ,sizeof (ulinks->reserved)); - +if (copy_to_user (ulinks->reserved, links.reserved, +sizeof (ulinks->reserved))) +return -EFAULT ;return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 33/271 media: staging: media: davinci_vpfe: - Fix for memory leak if decoder initialization fails.
In reply to Greg Kroah-Hartman[ Upstream commit 6995a659101bd4effa41cebb067f9dc18d77520d ]
Fix to avoid possible memory leak if the decoder initialization got failed.Free the allocated memory for file handle object before return in case decoder initialization fails.
--- drivers/staging/media/davinci_vpfe/vpfe_video.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/staging/media/davinci_vpfe/vpfe_video.c +3 -0
@@ -422,6 +422,9 @@ static int vpfe_open(struct file *file)/* If decoder is not initialized. initialize it */ if (!video->initialized &&vpfe_update_pipe_state (video)) {mutex_unlock (&video->lock); +v4l2_fh_del (&handle->vfh); +v4l2_fh_exit (&handle->vfh); +kfree (handle);return -ENODEV ; }/* Increment device users counter */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 36/271 crypto: talitos - Align SEC1 accesses to 32 bits boundaries.
In reply to Greg Kroah-Hartman[ Upstream commit c9cca7034b34a2d82e9a03b757de2485c294851c ]
The MPC885 reference manual states:
SEC Lite-initiated 8xx writes can occur only on 32-bit-word boundaries, but reads can occur on any byte boundary. Writing back a header read from a non-32-bit-word boundary will yield unpredictable results.
In order to ensure that, cra_alignmask is set to 3 for SEC1.
--- drivers/crypto/talitos.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/crypto/talitos.c +4 -1
@@ -3193,7 +3193,10 @@ static struct talitos_crypto_alg *talitos_alg_alloc(struct device *dev, alg->cra_priority = t_alg->algt.priority; else alg->cra_priority = TALITOS_CRA_PRIORITY; - alg->cra_alignmask =0 ; +if (has_ftr_sec1 (priv)) + alg->cra_alignmask =3 ; +else + alg->cra_alignmask =0 ; alg->cra_ctxsize =sizeof (struct talitos_ctx ); alg->cra_flags |=CRYPTO_ALG_KERN_DRIVER_ONLY ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 4/271 scsi: iscsi: set auth_protocol back to NULL if CHAP_A value is not supported
In reply to Greg Kroah-Hartman[ Upstream commit 5dd6c49339126c2c8df2179041373222362d6e49 ]
If the CHAP_A value is not supported, the chap_server_open() function should free the auth_protocol pointer and set it to NULL, or we will leave a dangling pointer around.
[ 66.010905] Unsupported CHAP_A value [ 66.011660] Security negotiation failed. [ 66.012443] iSCSI Login negotiation failed. [ 68.413924] general protection fault: 0000 [#1] SMP PTI [ 68.414962] CPU: 0 PID: 1562 Comm: targetcli Kdump: loaded Not tainted 4.18.0-80.el8.x86_64 #1 [ 68.416589] Hardware name: Red Hat KVM, BIOS 0.5.1 01/01/2011 [ 68.417677] RIP: 0010:__kmalloc_track_caller+0xc2/0x210
--- drivers/target/iscsi/iscsi_target_auth.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/target/iscsi/iscsi_target_auth.c +8 -8
@@ -89,6 +89,12 @@ static int chap_check_algorithm(const char *a_str)return CHAP_DIGEST_UNKNOWN ; } +static void chap_close (struct iscsi_conn *conn) +{ +kfree (conn->auth_protocol); + conn->auth_protocol =NULL ; +} + static struct iscsi_chap *chap_server_open( struct iscsi_conn *conn, struct iscsi_node_auth *auth,
@@ -126,7 +132,7 @@ static struct iscsi_chap *chap_server_open(case CHAP_DIGEST_UNKNOWN :default :pr_err ("Unsupported CHAP_A value\n" ); -kfree (conn->auth_protocol); +chap_close (conn);return NULL ; }
@@ -141,19 +147,13 @@ static struct iscsi_chap *chap_server_open(* Generate Challenge. */ if (chap_gen_challenge (conn,1 , aic_str, aic_len) <0 ) { -kfree (conn->auth_protocol); +chap_close (conn);return NULL ; }return chap; } -static void chap_close (struct iscsi_conn *conn) -{ -kfree (conn->auth_protocol); - conn->auth_protocol =NULL ; -} - static int chap_server_compute_md5( struct iscsi_conn *conn, struct iscsi_node_auth *auth,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 5/271 dmaengine: imx-sdma: fix use-after-free on probe error path
In reply to Greg Kroah-Hartman[ Upstream commit 2b8066c3deb9140fdf258417a51479b2aeaa7622 ]
If probe() fails anywhere beyond the point where sdma_get_firmware() is called, then a kernel oops may occur.
Problematic sequence of events:
1. probe() calls sdma_get_firmware(), which schedules the firmware callback to run when firmware becomes available, using the sdma instance structure as the context
2. probe() encounters an error, which deallocates the sdma instance structure
3. firmware becomes available, firmware callback is called with deallocated sdma instance structure
4. use after free - kernel oops !
Solution: only attempt to load firmware when we're certain that probe() will succeed. This guarantees that the firmware callback's context will remain valid.
Note that the remove() path is unaffected by this issue: the firmware loader will increment the driver module's use count, ensuring that the module cannot be unloaded while the firmware callback is pending or running.
--- drivers/dma/imx-sdma.c | 48 ++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 21 deletions(-)
drivers/dma/imx-sdma.c +27 -21
@@ -2039,27 +2039,6 @@ static int sdma_probe(struct platform_device *pdev)if (pdata && pdata->script_addrs)sdma_add_scripts (sdma, pdata->script_addrs); -if (pdata) { - ret =sdma_get_firmware (sdma, pdata->fw_name); -if (ret) -dev_warn (&pdev->dev,"failed to get firmware from platform data\n" ); - }else { -/* -* Because that device tree does not encode ROM script address, -* the RAM script in firmware is mandatory for device tree -* probe, otherwise it fails. -*/ - ret =of_property_read_string (np,"fsl,sdma-ram-script-name" , - &fw_name); -if (ret) -dev_warn (&pdev->dev,"failed to get firmware name\n" ); -else { - ret =sdma_get_firmware (sdma, fw_name); -if (ret) -dev_warn (&pdev->dev,"failed to get firmware from device tree\n" ); - } - } - sdma->dma_device.dev = &pdev->dev; sdma->dma_device.device_alloc_chan_resources = sdma_alloc_chan_resources;
@@ -2103,6 +2082,33 @@ static int sdma_probe(struct platform_device *pdev)of_node_put (spba_bus); } +/* +* Kick off firmware loading as the very last step: +* attempt to load firmware only if we're not on the error path, because +* the firmware callback requires a fully functional and allocated sdma +* instance. +*/ +if (pdata) { + ret =sdma_get_firmware (sdma, pdata->fw_name); +if (ret) +dev_warn (&pdev->dev,"failed to get firmware from platform data\n" ); + }else { +/* +* Because that device tree does not encode ROM script address, +* the RAM script in firmware is mandatory for device tree +* probe, otherwise it fails. +*/ + ret =of_property_read_string (np,"fsl,sdma-ram-script-name" , + &fw_name); +if (ret) { +dev_warn (&pdev->dev,"failed to get firmware name\n" ); + }else { + ret =sdma_get_firmware (sdma, fw_name); +if (ret) +dev_warn (&pdev->dev,"failed to get firmware from device tree\n" ); + } + } +return 0 ; err_register:
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 7/271 ath10k: Do not send probe response template for mesh
In reply to Greg Kroah-Hartman[ Upstream commit 97354f2c432788e3163134df6bb144f4b6289d87 ]
Currently mac80211 do not support probe response template for mesh point. When WMI_SERVICE_BEACON_OFFLOAD is enabled, host driver tries to configure probe response template for mesh, but it fails because the interface type is not NL80211_IFTYPE_AP but NL80211_IFTYPE_MESH_POINT.
To avoid this failure, skip sending probe response template to firmware for mesh point.
Tested HW: WCN3990/QCA6174/QCA9984
--- drivers/net/wireless/ath/ath10k/mac.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/ath/ath10k/mac.c +4 -0
@@ -1624,6 +1624,10 @@ static int ath10k_mac_setup_prb_tmpl(struct ath10k_vif *arvif)if (arvif->vdev_type !=WMI_VDEV_TYPE_AP )return 0 ; +/* For mesh, probe response and beacon share the same template */ +if (ieee80211_vif_is_mesh (vif)) +return 0 ; + prb =ieee80211_proberesp_get (hw, vif);if (!prb) {ath10k_warn (ar,"failed to get probe resp template from mac80211\n" );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 8/271 ath9k: Check for errors when reading SREV register
In reply to Greg Kroah-Hartman[ Upstream commit 2f90c7e5d09437a4d8d5546feaae9f1cf48cfbe1 ]
Right now, if an error is encountered during the SREV register read (i.e. an EIO in ath9k_regread()), that error code gets passed all the way to __ath9k_hw_init(), where it is visible during the "Chip rev not supported" message.
ath9k_htc 1-1.4:1.0: ath9k_htc: HTC initialized with 33 credits
ath: phy2: Mac Chip Rev 0x0f.3 is not supported by this driver
ath: phy2: Unable to initialize hardware; initialization status: -95
ath: phy2: Unable to initialize hardware; initialization status: -95
ath9k_htc: Failed to initialize the device
Check for -EIO explicitly in ath9k_hw_read_revisions() and return a boolean based on the success of the operation. Check for that in __ath9k_hw_init() and abort with a more debugging-friendly message if reading the revisions wasn't successful.
ath9k_htc 1-1.4:1.0: ath9k_htc: HTC initialized with 33 credits
ath: phy2: Failed to read SREV register
ath: phy2: Could not read hardware revision
ath: phy2: Unable to initialize hardware; initialization status: -95
ath: phy2: Unable to initialize hardware; initialization status: -95
ath9k_htc: Failed to initialize the device
This helps when debugging by directly showing the first point of failure and it could prevent possible errors if a 0x0f.3 revision is ever supported.
--- drivers/net/wireless/ath/ath9k/hw.c | 32 +++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 9 deletions(-)
drivers/net/wireless/ath/ath9k/hw.c +23 -9
@@ -252,8 +252,9 @@ void ath9k_hw_get_channel_centers(struct ath_hw *ah,/* Chip Revisions */ /******************/ -static void ath9k_hw_read_revisions (struct ath_hw *ah) +static bool ath9k_hw_read_revisions (struct ath_hw *ah) { +u32 srev;u32 val;if (ah->get_mac_revision)
@@ -269,25 +270,33 @@ static void ath9k_hw_read_revisions(struct ath_hw *ah) val =REG_READ (ah,AR_SREV ); ah->hw_version.macRev =MS (val,AR_SREV_REVISION2 ); } -return ; +return true;case AR9300_DEVID_AR9340 : ah->hw_version.macVersion =AR_SREV_VERSION_9340 ; -return ; +return true;case AR9300_DEVID_QCA955X : ah->hw_version.macVersion =AR_SREV_VERSION_9550 ; -return ; +return true;case AR9300_DEVID_AR953X : ah->hw_version.macVersion =AR_SREV_VERSION_9531 ; -return ; +return true;case AR9300_DEVID_QCA956X : ah->hw_version.macVersion =AR_SREV_VERSION_9561 ; -return ; +return true; } - val =REG_READ (ah,AR_SREV ) &AR_SREV_ID ; + srev =REG_READ (ah,AR_SREV ); + +if (srev == -EIO ) { +ath_err (ath9k_hw_common (ah), +"Failed to read SREV register" ); +return false; + } + + val = srev &AR_SREV_ID ;if (val ==0xFF ) { - val =REG_READ (ah,AR_SREV ); + val = srev; ah->hw_version.macVersion = (val &AR_SREV_VERSION2 ) >>AR_SREV_TYPE2_S ; ah->hw_version.macRev =MS (val,AR_SREV_REVISION2 );
@@ -306,6 +315,8 @@ static void ath9k_hw_read_revisions(struct ath_hw *ah)if (ah->hw_version.macVersion ==AR_SREV_VERSION_5416_PCIE ) ah->is_pciexpress = true; } + +return true; }/************************************/
@@ -559,7 +570,10 @@ static int __ath9k_hw_init(struct ath_hw *ah)struct ath_common *common =ath9k_hw_common (ah);int r =0 ; -ath9k_hw_read_revisions (ah); +if (!ath9k_hw_read_revisions (ah)) { +ath_err (common,"Could not read hardware revisions" ); +return -EOPNOTSUPP ; + }switch (ah->hw_version.macVersion) {case AR_SREV_VERSION_5416_PCI :
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 9/271 ath6kl: add some bounds checking
In reply to Greg Kroah-Hartman[ Upstream commit 5d6751eaff672ea77642e74e92e6c0ac7f9709ab ]
The "ev->traffic_class" and "reply->ac" variables come from the network and they're used as an offset into the wmi->stream_exist_for_ac[] array. Those variables are u8 so they can be 0-255 but the stream_exist_for_ac[] array only has WMM_NUM_AC (4) elements. We need to add a couple bounds checks to prevent array overflows.
I also modified one existing check from "if (traffic_class > 3) {" to "if (traffic_class >= WMM_NUM_AC) {" just to make them all consistent.
--- drivers/net/wireless/ath/ath6kl/wmi.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath6kl/wmi.c +9 -1
@@ -1178,6 +1178,10 @@ static int ath6kl_wmi_pstream_timeout_event_rx(struct wmi *wmi, u8 *datap,return -EINVAL ; ev = (struct wmi_pstream_timeout_event *) datap; +if (ev->traffic_class >=WMM_NUM_AC ) { +ath6kl_err ("invalid traffic class: %d\n" , ev->traffic_class); +return -EINVAL ; + }/* * When the pstream (fat pipe == AC) timesout, it means there were
@@ -1519,6 +1523,10 @@ static int ath6kl_wmi_cac_event_rx(struct wmi *wmi, u8 *datap, int len,return -EINVAL ; reply = (struct wmi_cac_event *) datap; +if (reply->ac >=WMM_NUM_AC ) { +ath6kl_err ("invalid AC: %d\n" , reply->ac); +return -EINVAL ; + }if ((reply->cac_indication ==CAC_INDICATION_ADMISSION_RESP ) && (reply->status_code !=IEEE80211_TSPEC_STATUS_ADMISS_ACCEPTED )) {
@@ -2635,7 +2643,7 @@ int ath6kl_wmi_delete_pstream_cmd(struct wmi *wmi, u8 if_idx, u8 traffic_class,u16 active_tsids =0 ;int ret; -if (traffic_class >3 ) { +if (traffic_class >=WMM_NUM_AC ) {ath6kl_err ("invalid traffic class: %d\n" , traffic_class);return -EINVAL ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 38/271 batman-adv: Fix duplicated OGMs on NETDEV_UP
In reply to Greg Kroah-Hartman[ Upstream commit 9e6b5648bbc4cd48fab62cecbb81e9cc3c6e7e88 ]
The state of slave interfaces are handled differently depending on whether the interface is up or not. All active interfaces (IFF_UP) will transmit OGMs. But for B.A.T.M.A.N. IV, also non-active interfaces are scheduling (low TTL) OGMs on active interfaces. The code which setups and schedules the OGMs must therefore already be called when the interfaces gets added as slave interface and the transmit function must then check whether it has to send out the OGM or not on the specific slave interface.
But the commit f0d97253fb5f ("batman-adv: remove ogm_emit and ogm_schedule API calls") moved the setup code from the enable function to the activate function. The latter is called either when the added slave was already up when batadv_hardif_enable_interface processed the new interface or when a NETDEV_UP event was received for this slave interfac. As result, each NETDEV_UP would schedule a new OGM worker for the interface and thus OGMs would be send a lot more than expected.
--- net/batman-adv/bat_iv_ogm.c | 4 ++-- net/batman-adv/hard-interface.c | 3 +++ net/batman-adv/types.h | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-)
net/batman-adv/bat_iv_ogm.c +2 -2
@@ -2485,7 +2485,7 @@ batadv_iv_ogm_neigh_is_sob(struct batadv_neigh_node *neigh1,return ret; } -static void batadv_iv_iface_activate (struct batadv_hard_iface *hard_iface) +static void batadv_iv_iface_enabled (struct batadv_hard_iface *hard_iface) {/* begin scheduling originator messages on that interface */ batadv_iv_ogm_schedule (hard_iface);
@@ -2825,8 +2825,8 @@ static void batadv_iv_gw_dump(struct sk_buff *msg, struct netlink_callback *cb,static struct batadv_algo_ops batadv_batman_iv__read_mostly = { .name ="BATMAN_IV" , .iface = { - .activate = batadv_iv_iface_activate, .enable = batadv_iv_ogm_iface_enable, + .enabled = batadv_iv_iface_enabled, .disable = batadv_iv_ogm_iface_disable, .update_mac = batadv_iv_ogm_iface_update_mac, .primary_set = batadv_iv_ogm_primary_iface_set,
net/batman-adv/hard-interface.c +3 -0
@@ -821,6 +821,9 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,batadv_hardif_recalc_extra_skbroom (soft_iface); +if (bat_priv->algo_ops->iface.enabled) + bat_priv->algo_ops->iface.enabled (hard_iface); + out:return 0 ;
net/batman-adv/types.h +3 -0
@@ -2130,6 +2130,9 @@ struct batadv_algo_iface_ops {/** @enable: init routing info when hard-interface is enabled */ int (*enable)(struct batadv_hard_iface *hard_iface); +/** @enabled: notification when hard-interface was enabled (optional) */ +void (*enabled)(struct batadv_hard_iface *hard_iface); +/** @disable: de-init routing info when hard-interface is disabled */ void (*disable)(struct batadv_hard_iface *hard_iface);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 47/271 crypto: inside-secure - do not rely on the hardware last bit for result descriptors
In reply to Greg Kroah-Hartman[ Upstream commit 89332590427235680236b9470e851afc49b3caa1 ]
When performing a transformation the hardware is given result descriptors to save the result data. Those result descriptors are batched using a 'first' and a 'last' bit. There are cases were more descriptors than needed are given to the engine, leading to the engine only using some of them, and not setting the last bit on the last descriptor we gave. This causes issues were the driver and the hardware aren't in sync anymore about the number of result descriptors given (as the driver do not give a pool of descriptor to use for any transformation, but a pool of descriptors to use *per* transformation).
This patch fixes it by attaching the number of given result descriptors to the requests, and by using this number instead of the 'last' bit found on the descriptors to process them.
--- .../crypto/inside-secure/safexcel_cipher.c | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-)
drivers/crypto/inside-secure/safexcel_cipher.c +18 -6
@@ -51,6 +51,8 @@ struct safexcel_cipher_ctx {struct safexcel_cipher_req {enum safexcel_cipher_direction direction; +/* Number of result descriptors associated to the request */ +unsigned int rdescs;bool needs_inv; };
@@ -333,7 +335,10 @@ static int safexcel_handle_req_result(struct safexcel_crypto_priv *priv, int rin *ret =0 ; - do { +if (unlikely (!sreq->rdescs)) +return 0 ; + +while (sreq->rdescs--) { rdesc =safexcel_ring_next_rptr (priv, &priv->ring[ring].rdr);if (IS_ERR (rdesc)) { dev_err(priv->dev,
@@ -346,7 +351,7 @@ static int safexcel_handle_req_result(struct safexcel_crypto_priv *priv, int rin *ret =safexcel_rdesc_check_errors (priv, rdesc); ndesc++; - }while (!rdesc->last_seg); + }safexcel_complete (priv, ring);
@@ -501,6 +506,7 @@ static int safexcel_send_req(struct crypto_async_request *base, int ring,static int safexcel_handle_inv_result (struct safexcel_crypto_priv *priv,int ring,struct crypto_async_request *base, +struct safexcel_cipher_req *sreq,bool *should_complete,int *ret) {struct safexcel_cipher_ctx *ctx =crypto_tfm_ctx (base->tfm);
@@ -509,7 +515,10 @@ static int safexcel_handle_inv_result(struct safexcel_crypto_priv *priv, *ret =0 ; - do { +if (unlikely (!sreq->rdescs)) +return 0 ; + +while (sreq->rdescs--) { rdesc =safexcel_ring_next_rptr (priv, &priv->ring[ring].rdr);if (IS_ERR (rdesc)) { dev_err(priv->dev,
@@ -522,7 +531,7 @@ static int safexcel_handle_inv_result(struct safexcel_crypto_priv *priv, *ret =safexcel_rdesc_check_errors (priv, rdesc); ndesc++; - }while (!rdesc->last_seg); + }safexcel_complete (priv, ring);
@@ -564,7 +573,7 @@ static int safexcel_skcipher_handle_result(struct safexcel_crypto_priv *priv,if (sreq->needs_inv) { sreq->needs_inv = false; - err =safexcel_handle_inv_result (priv, ring, async, + err =safexcel_handle_inv_result (priv, ring, async, sreq, should_complete, ret); }else { err = safexcel_handle_req_result(priv, ring, async, req->src,
@@ -587,7 +596,7 @@ static int safexcel_aead_handle_result(struct safexcel_crypto_priv *priv,if (sreq->needs_inv) { sreq->needs_inv = false; - err =safexcel_handle_inv_result (priv, ring, async, + err =safexcel_handle_inv_result (priv, ring, async, sreq, should_complete, ret); }else { err = safexcel_handle_req_result(priv, ring, async, req->src,
@@ -633,6 +642,8 @@ static int safexcel_skcipher_send(struct crypto_async_request *async, int ring, ret =safexcel_send_req (async, ring, sreq, req->src, req->dst, req->cryptlen,0 ,0 , req->iv, commands, results); + + sreq->rdescs = *results;return ret; }
@@ -655,6 +666,7 @@ static int safexcel_aead_send(struct crypto_async_request *async, int ring, req->cryptlen, req->assoclen,crypto_aead_authsize (tfm), req->iv, commands, results); + sreq->rdescs = *results;return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 48/271 net: fec: Do not use netdev messages too early
In reply to Greg Kroah-Hartman[ Upstream commit a19a0582363b9a5f8ba812f34f1b8df394898780 ]
When a valid MAC address is not found the current messages are shown:
fec 2188000.ethernet (unnamed net_device) (uninitialized): Invalid MAC address: 00:00:00:00:00:00 fec 2188000.ethernet (unnamed net_device) (uninitialized): Using random MAC address: aa:9f:25:eb:7e:aa
Since the network device has not been registered at this point, it is better to use dev_err()/dev_info() instead, which will provide cleaner log messages like these:
fec 2188000.ethernet: Invalid MAC address: 00:00:00:00:00:00 fec 2188000.ethernet: Using random MAC address: aa:9f:25:eb:7e:aa
Tested on a imx6dl-pico-pi board.
--- drivers/net/ethernet/freescale/fec_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/freescale/fec_main.c +3 -3
@@ -1689,10 +1689,10 @@ static void fec_get_mac(struct net_device *ndev)*/ if (!is_valid_ether_addr (iap)) {/* Report it and use a random ethernet address instead */ -netdev_err (ndev,"Invalid MAC address: %pM\n" , iap); +dev_err (&fep->pdev->dev,"Invalid MAC address: %pM\n" , iap);eth_hw_addr_random (ndev); -netdev_info (ndev,"Using random MAC address: %pM\n" , - ndev->dev_addr); +dev_info (&fep->pdev->dev,"Using random MAC address: %pM\n" , + ndev->dev_addr);return ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 49/271 net: axienet: Fix race condition causing TX hang
In reply to Greg Kroah-Hartman[ Upstream commit 7de44285c1f69ccfbe8be1d6a16fcd956681fee6 ]
It is possible that the interrupt handler fires and frees up space in the TX ring in between checking for sufficient TX ring space and stopping the TX queue in axienet_start_xmit. If this happens, the queue wake from the interrupt handler will occur before the queue is stopped, causing a lost wakeup and the adapter's transmit hanging.
To avoid this, after stopping the queue, check again whether there is sufficient space in the TX ring. If so, wake up the queue again.
--- .../net/ethernet/xilinx/xilinx_axienet_main.c | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
drivers/net/ethernet/xilinx/xilinx_axienet_main.c +17 -3
@@ -614,6 +614,10 @@ static void axienet_start_xmit_done(struct net_device *ndev) ndev->stats.tx_packets += packets; ndev->stats.tx_bytes += size; + +/* Matches barrier in axienet_start_xmit */ +smp_mb (); +netif_wake_queue (ndev); }
@@ -668,9 +672,19 @@ static int axienet_start_xmit(struct sk_buff *skb, struct net_device *ndev) cur_p = &lp->tx_bd_v[lp->tx_bd_tail];if (axienet_check_tx_bd_space (lp, num_frag)) { -if (!netif_queue_stopped (ndev)) -netif_stop_queue (ndev); -return NETDEV_TX_BUSY ; +if (netif_queue_stopped (ndev)) +return NETDEV_TX_BUSY ; + +netif_stop_queue (ndev); + +/* Matches barrier in axienet_start_xmit_done */ +smp_mb (); + +/* Space might have just been freed - check again */ +if (axienet_check_tx_bd_space (lp, num_frag)) +return NETDEV_TX_BUSY ; + +netif_wake_queue (ndev); }if (skb->ip_summed ==CHECKSUM_PARTIAL ) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 50/271 s390/qdio: handle PENDING state for QEBSM devices
In reply to Greg Kroah-Hartman[ Upstream commit 04310324c6f482921c071444833e70fe861b73d9 ]
When a CQ-enabled device uses QEBSM for SBAL state inspection, get_buf_states() can return the PENDING state for an Output Queue. get_outbound_buffer_frontier() isn't prepared for this, and any PENDING buffer will permanently stall all further completion processing on this Queue.
This isn't a concern for non-QEBSM devices, as get_buf_states() for such devices will manually turn PENDING buffers into EMPTY ones.
--- drivers/s390/cio/qdio_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/s390/cio/qdio_main.c +1 -0
@@ -749,6 +749,7 @@ static int get_outbound_buffer_frontier(struct qdio_q *q)switch (state) {case SLSB_P_OUTPUT_EMPTY : +case SLSB_P_OUTPUT_PENDING :/* the adapter got it */ DBF_DEV_EVENT (DBF_INFO , q->irq_ptr,"out empty:%1d %02x" , q->nr, count);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 51/271 RAS/CEC: Fix pfn insertion
In reply to Greg Kroah-Hartman[ Upstream commit 6d8e294bf5f0e85c34e8b14b064e2965f53f38b0 ]
When inserting random PFNs for debugging the CEC through (debugfs)/ras/cec/pfn, depending on the return value of pfn_set(), multiple values get inserted per a single write.
That is because simple_attr_write() interprets a retval of 0 as success and claims the whole input. However, pfn_set() returns the cec_add_elem() value, which, if > 0 and smaller than the whole input length, makes glibc continue issuing the write syscall until there's input left:
pfn_set
simple_attr_write
debugfs_attr_write
full_proxy_write
vfs_write
ksys_write
do_syscall_64
entry_SYSCALL_64_after_hwframe
leading to those repeated calls.
Return 0 to fix that.
--- drivers/ras/cec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/ras/cec.c +3 -1
@@ -369,7 +369,9 @@ static int pfn_set(void *data, u64 val) { *(u64 *)data = val; -return cec_add_elem (val); +cec_add_elem (val); + +return 0 ; }DEFINE_DEBUGFS_ATTRIBUTE (pfn_ops, u64_get, pfn_set,"0x%llx\n" );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 52/271 net: sfp: add mutex to prevent concurrent state checks
In reply to Greg Kroah-Hartman[ Upstream commit 2158e856f56bb762ef90f3ec244d41a519826f75 ]
sfp_check_state can potentially be called by both a threaded IRQ handler and delayed work. If it is concurrently called, it could result in incorrect state management. Add a st_mutex to protect the state - this lock gets taken outside of code that checks and handle state changes, and the existing sm_mutex nests inside of it.
--- drivers/net/phy/sfp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/phy/sfp.c +5 -1
@@ -185,10 +185,11 @@ struct sfp {struct gpio_desc *gpio[GPIO_MAX ];bool attached; +struct mutex st_mutex;/* Protects state */ unsigned int state;struct delayed_work poll;struct delayed_work timeout; -struct mutex sm_mutex; +struct mutex sm_mutex;/* Protects state machine */ unsigned char sm_mod_state;unsigned char sm_dev_state;unsigned short sm_state;
@@ -1718,6 +1719,7 @@ static void sfp_check_state(struct sfp *sfp) {unsigned int state, i, changed; +mutex_lock (&sfp->st_mutex); state =sfp_get_state (sfp); changed = state ^ sfp->state; changed &=SFP_F_PRESENT |SFP_F_LOS |SFP_F_TX_FAULT ;
@@ -1743,6 +1745,7 @@ static void sfp_check_state(struct sfp *sfp)sfp_sm_event (sfp, state &SFP_F_LOS ?SFP_E_LOS_HIGH :SFP_E_LOS_LOW );rtnl_unlock (); +mutex_unlock (&sfp->st_mutex); }static irqreturn_t sfp_irq (int irq,void *data)
@@ -1773,6 +1776,7 @@ static struct sfp *sfp_alloc(struct device *dev) sfp->dev = dev;mutex_init (&sfp->sm_mutex); +mutex_init (&sfp->st_mutex);INIT_DELAYED_WORK (&sfp->poll, sfp_poll);INIT_DELAYED_WORK (&sfp->timeout, sfp_timeout);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 55/271 perf test 6: Fix missing kvm module load for s390
In reply to Greg Kroah-Hartman[ Upstream commit 53fe307dfd309e425b171f6272d64296a54f4dff ]
Command
# perf test -Fv 6
fails with error
running test 100 'kvm-s390:kvm_s390_create_vm' failed to parse
event 'kvm-s390:kvm_s390_create_vm', err -1, str 'unknown tracepoint'
event syntax error: 'kvm-s390:kvm_s390_create_vm'
\___ unknown tracepointwhen the kvm module is not loaded or not built in.
Fix this by adding a valid function which tests if the module is loaded. Loaded modules (or builtin KVM support) have a directory named
/sys/kernel/debug/tracing/events/kvm-s390
for this tracepoint.
Check for existence of this directory.
--- tools/perf/tests/parse-events.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
tools/perf/tests/parse-events.c +27 -0
@@ -18,6 +18,32 @@#define PERF_TP_SAMPLE_TYPE (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | \ PERF_SAMPLE_CPU | PERF_SAMPLE_PERIOD) +#if defined(__s390x__) +/* Return true if kvm module is available and loaded. Test this +* and retun success when trace point kvm_s390_create_vm +* exists. Otherwise this test always fails. +*/ +static bool kvm_s390_create_vm_valid (void ) +{ +char *eventfile; +bool rc = false; + + eventfile =get_events_file ("kvm-s390" ); + +if (eventfile) { +DIR *mydir =opendir (eventfile); + +if (mydir) { + rc = true; +closedir (mydir); + } +put_events_file (eventfile); + } + +return rc; +} +#endif +static int test__checkevent_tracepoint (struct perf_evlist *evlist) {struct perf_evsel *evsel =perf_evlist__first (evlist);
@@ -1622,6 +1648,7 @@ static struct evlist_test test__events[] = { { .name = "kvm-s390:kvm_s390_create_vm", .check = test__checkevent_tracepoint, + .valid = kvm_s390_create_vm_valid, .id = 100, }, #endif
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 54/271 perf cs-etm: Properly set the value of old and head in snapshot mode
In reply to Greg Kroah-Hartman[ Upstream commit e45c48a9a4d20ebc7b639a62c3ef8f4b08007027 ]
This patch adds the necessary intelligence to properly compute the value of 'old' and 'head' when operating in snapshot mode. That way we can get the latest information in the AUX buffer and be compatible with the generic AUX ring buffer mechanic.
Tester notes:
Quoted 1 line
Leo, have you had the chance to test/review this one? Suzuki?
Sure. I applied this patch on the perf/core branch (with latest commit 3e4fbf36c1e3 'perf augmented_raw_syscalls: Move reading filename to the loop') and passed testing with below steps:
# perf record -e cs_etm/@tmc_etr0/ -S -m,64 --per-thread ./sort & [1] 19097 Bubble sorting array of 30000 elements
# kill -USR2 19097 # kill -USR2 19097 # kill -USR2 19097 [ perf record: Woken up 4 times to write data ] [ perf record: Captured and wrote 0.753 MB perf.data ]
--- tools/perf/arch/arm/util/cs-etm.c | 127 +++++++++++++++++++++++++++++- 1 file changed, 123 insertions(+), 4 deletions(-)
tools/perf/arch/arm/util/cs-etm.c +123 -4
@@ -32,6 +32,8 @@ struct cs_etm_recording {struct auxtrace_record itr;struct perf_pmu *cs_etm_pmu;struct perf_evlist *evlist; +int wrapped_cnt; +bool *wrapped;bool snapshot_mode;size_t snapshot_size; };
@@ -495,16 +497,131 @@ static int cs_etm_info_fill(struct auxtrace_record *itr,return 0 ; } -static int cs_etm_find_snapshot (struct auxtrace_record *itr__maybe_unused , +static int cs_etm_alloc_wrapped_array (struct cs_etm_recording *ptr,int idx) +{ +bool *wrapped; +int cnt = ptr->wrapped_cnt; + +/* Make @ptr->wrapped as big as @idx */ +while (cnt <= idx) + cnt++; + +/* +* Free'ed in cs_etm_recording_free(). Using realloc() to avoid +* cross compilation problems where the host's system supports +* reallocarray() but not the target. +*/ + wrapped =realloc (ptr->wrapped, cnt *sizeof (bool )); +if (!wrapped) +return -ENOMEM ; + + wrapped[cnt -1 ] = false; + ptr->wrapped_cnt = cnt; + ptr->wrapped = wrapped; + +return 0 ; +} + +static bool cs_etm_buffer_has_wrapped (unsigned char *buffer, +size_t buffer_size,u64 head) +{ +u64 i, watermark; +u64 *buf = (u64 *)buffer; +size_t buf_size = buffer_size; + +/* +* We want to look the very last 512 byte (chosen arbitrarily) in +* the ring buffer. +*/ + watermark = buf_size -512 ; + +/* +* @head is continuously increasing - if its value is equal or greater +* than the size of the ring buffer, it has wrapped around. +*/ +if (head >= buffer_size) +return true; + +/* +* The value of @head is somewhere within the size of the ring buffer. +* This can be that there hasn't been enough data to fill the ring +* buffer yet or the trace time was so long that @head has numerically +* wrapped around. To find we need to check if we have data at the very +* end of the ring buffer. We can reliably do this because mmap'ed +* pages are zeroed out and there is a fresh mapping with every new +* session. +*/ + +/* @head is less than 512 byte from the end of the ring buffer */ +if (head > watermark) + watermark = head; + +/* +* Speed things up by using 64 bit transactions (see "u64 *buf" above) +*/ + watermark >>=3 ; + buf_size >>=3 ; + +/* +* If we find trace data at the end of the ring buffer, @head has +* been there and has numerically wrapped around at least once. +*/ +for (i = watermark; i < buf_size; i++) +if (buf[i]) +return true; + +return false; +} + +static int cs_etm_find_snapshot (struct auxtrace_record *itr,int idx,struct auxtrace_mmap *mm, -unsigned char *data__maybe_unused , +unsigned char *data,u64 *head,u64 *old) { +int err; +bool wrapped; +struct cs_etm_recording *ptr = + container_of(itr, struct cs_etm_recording, itr); + +/* +* Allocate memory to keep track of wrapping if this is the first +* time we deal with this *mm. +*/ +if (idx >= ptr->wrapped_cnt) { + err =cs_etm_alloc_wrapped_array (ptr, idx); +if (err) +return err; + } + +/* +* Check to see if *head has wrapped around. If it hasn't only the +* amount of data between *head and *old is snapshot'ed to avoid +* bloating the perf.data file with zeros. But as soon as *head has +* wrapped around the entire size of the AUX ring buffer it taken. +*/ + wrapped = ptr->wrapped[idx]; +if (!wrapped &&cs_etm_buffer_has_wrapped (data, mm->len, *head)) { + wrapped = true; + ptr->wrapped[idx] = true; + } +pr_debug3 ("%s: mmap index %d old head %zu new head %zu size %zu\n" , __func__, idx, (size_t )*old, (size_t )*head, mm->len); - *old = *head; - *head += mm->len; +/* No wrap has occurred, we can just use *head and *old. */ +if (!wrapped) +return 0 ; + +/* +* *head has wrapped around - adjust *head and *old to pickup the +* entire content of the AUX buffer. +*/ +if (*head >= mm->len) { + *old = *head - mm->len; + }else { + *head += mm->len; + *old = *head - mm->len; + }return 0 ; }
@@ -545,6 +662,8 @@ static void cs_etm_recording_free(struct auxtrace_record *itr) {struct cs_etm_recording *ptr = container_of(itr, struct cs_etm_recording, itr); + +zfree (&ptr->wrapped);free (ptr); }
Signature · 9 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Greg Kroah-Hartman
maintainerPATCH 56/271 perf report: Fix OOM error in TUI mode on s390
In reply to Greg Kroah-Hartman[ Upstream commit 8a07aa4e9b7b0222129c07afff81634a884b2866 ]
Debugging a OOM error using the TUI interface revealed this issue on s390:
[tmricht@m83lp54 perf]$ cat /proc/kallsyms |sort
....00000001119b7158 B radix_tree_node_cachep 00000001119b8000 B __bss_stop00000001119b8000 B _end000003ff80002850 t autofs_mount [autofs4]000003ff80002868 t autofs_show_options [autofs4]000003ff80002a98 t autofs_evict_inode [autofs4]
....
There is a huge gap between the last kernel symbol __bss_stop/_end and the first kernel module symbol autofs_mount (from autofs4 module).
After reading the kernel symbol table via functions:
dso__load()
+--> dso__load_kernel_sym()
+--> dso__load_kallsyms()
+--> __dso_load_kallsyms()
+--> symbols__fixup_end()the symbol __bss_stop has a start address of 1119b8000 and an end address of 3ff80002850, as can be seen by this debug statement:
symbols__fixup_end __bss_stop start:0x1119b8000 end:0x3ff80002850
The size of symbol __bss_stop is 0x3fe6e64a850 bytes! It is the last kernel symbol and fills up the space until the first kernel module symbol.
This size kills the TUI interface when executing the following code:
process_sample_event()
hist_entry_iter__add()
hist_iter__report_callback()
hist_entry__inc_addr_samples()
symbol__inc_addr_samples(symbol = __bss_stop)
symbol__cycles_hist()
annotated_source__alloc_histograms(...,
symbol__size(sym),
...)This function allocates memory to save sample histograms. The symbol_size() marco is defined as sym->end - sym->start, which results in above value of 0x3fe6e64a850 bytes and
the call to calloc() in annotated_source__alloc_histograms() fails.
The histgram memory allocation might fail, make this failure no-fatal and continue processing.
Output before:
[tmricht@m83lp54 perf]$ ./perf --debug stderr=1 report -vvvvv \ -i ~/slow.data 2>/tmp/2 [tmricht@m83lp54 perf]$ tail -5 /tmp/2 __symbol__inc_addr_samples(875): ENOMEM! sym->name=__bss_stop, start=0x1119b8000, addr=0x2aa0005eb08, end=0x3ff80002850, func: 0
problem adding hist entry, skipping event0x938b8 [0x8]: failed to process type: 68 [Cannot allocate memory] [tmricht@m83lp54 perf]$
Output after:
[tmricht@m83lp54 perf]$ ./perf --debug stderr=1 report -vvvvv \ -i ~/slow.data 2>/tmp/2
[tmricht@m83lp54 perf]$ tail -5 /tmp/2
symbol__inc_addr_samples map:0x1597830 start:0x110730000 end:0x3ff80002850 symbol__hists notes->src:0x2aa2a70 nr_hists:1 symbol__inc_addr_samples sym:unlink_anon_vmas src:0x2aa2a70 __symbol__inc_addr_samples: addr=0x11094c69e
0x11094c670 unlink_anon_vmas: period++ [addr: 0x11094c69e, 0x2e, evidx=0]
=> nr_samples: 1, period: 526008
[tmricht@m83lp54 perf]$
There is no error about failed memory allocation and the TUI interface shows all entries.
--- tools/perf/util/annotate.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
tools/perf/util/annotate.c +2 -3
@@ -911,9 +911,8 @@ static int symbol__inc_addr_samples(struct symbol *sym, struct map *map,if (sym ==NULL )return 0 ; src =symbol__hists (sym, evsel->evlist->nr_entries); -if (src ==NULL ) -return -ENOMEM ; -return __symbol__inc_addr_samples (sym, map, src, evsel->idx, addr, sample); +return (src) ?__symbol__inc_addr_samples (sym, map, src, evsel->idx, + addr, sample) :0 ; } static int symbol__account_cycles(u64 addr, u64 start,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 58/271 media: uvcvideo: Fix access to uninitialized fields on probe error
In reply to Greg Kroah-Hartman[ Upstream commit 11a087f484bf15ff65f0a9f277aa5a61fd07ed2a ]
We need to check whether this work we are canceling actually is initialized.
--- drivers/media/usb/uvc/uvc_ctrl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/usb/uvc/uvc_ctrl.c +3 -1
@@ -2350,7 +2350,9 @@ void uvc_ctrl_cleanup_device(struct uvc_device *dev)struct uvc_entity *entity;unsigned int i; -cancel_work_sync (&dev->async_ctrl.work); +/* Can be uninitialized if we are aborting on probe error. */ +if (dev->async_ctrl.work.func) +cancel_work_sync (&dev->async_ctrl.work);/* Free controls and control mappings for all entities. */ list_for_each_entry (entity, &dev->entities, list) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 59/271 media: fdp1: Support M3N and E3 platforms
In reply to Greg Kroah-Hartman[ Upstream commit 4e8c120de9268fc26f583268b9d22e7d37c4595f ]
New Gen3 R-Car platforms incorporate the FDP1 with an updated version register. No code change is required to support these targets, but they will currently report an error stating that the device can not be identified.
Update the driver to match against the new device types.
--- drivers/media/platform/rcar_fdp1.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/media/platform/rcar_fdp1.c +8 -0
@@ -257,6 +257,8 @@ MODULE_PARM_DESC(debug, "activate debug info");#define FD1_IP_H3_ES1 0x02010101#define FD1_IP_M3W 0x02010202#define FD1_IP_H3 0x02010203 +#define FD1_IP_M3N 0x02010204 +#define FD1_IP_E3 0x02010205/* LUTs */ #define FD1_LUT_DIF_ADJ 0x1000
@@ -2365,6 +2367,12 @@ static int fdp1_probe(struct platform_device *pdev)case FD1_IP_H3 :dprintk (fdp1,"FDP1 Version R-Car H3\n" );break ; +case FD1_IP_M3N : +dprintk (fdp1,"FDP1 Version R-Car M3N\n" ); +break ; +case FD1_IP_E3 : +dprintk (fdp1,"FDP1 Version R-Car E3\n" ); +break ;default :dev_err (fdp1->dev,"FDP1 Unidentifiable (0x%08x)\n" , hw_version);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 61/271 gpio: omap: fix lack of irqstatus_raw0 for OMAP4
In reply to Greg Kroah-Hartman[ Upstream commit 64ea3e9094a1f13b96c33244a3fb3a0f45690bd2 ]
Commit 384ebe1c2849 ("gpio/omap: Add DT support to GPIO driver") added the register definition tables to the gpio-omap driver. Subsequently to that commit, commit 4e962e8998cc ("gpio/omap: remove cpu_is_omapxxxx() checks from *_runtime_resume()") added definitions for irqstatus_raw* registers to the legacy OMAP4 definitions, but missed the DT definitions.
This causes an unintentional change of behaviour for the 1.101 errata workaround on OMAP4 platforms. Fix this oversight.
--- drivers/gpio/gpio-omap.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpio/gpio-omap.c +2 -0
@@ -1687,6 +1687,8 @@ static struct omap_gpio_reg_offs omap4_gpio_regs = { .clr_dataout = OMAP4_GPIO_CLEARDATAOUT, .irqstatus = OMAP4_GPIO_IRQSTATUS0, .irqstatus2 = OMAP4_GPIO_IRQSTATUS1, + .irqstatus_raw0 = OMAP4_GPIO_IRQSTATUSRAW0, + .irqstatus_raw1 = OMAP4_GPIO_IRQSTATUSRAW1, .irqenable = OMAP4_GPIO_IRQSTATUSSET0, .irqenable2 = OMAP4_GPIO_IRQSTATUSSET1, .set_irqenable = OMAP4_GPIO_IRQSTATUSSET0,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 62/271 gpio: omap: ensure irq is enabled before wakeup
In reply to Greg Kroah-Hartman[ Upstream commit c859e0d479b3b4f6132fc12637c51e01492f31f6 ]
Documentation states:
NOTE: There must be a correlation between the wake-up enable and interrupt-enable registers. If a GPIO pin has a wake-up configured on it, it must also have the corresponding interrupt enabled (on one of the two interrupt lines).
Ensure that this condition is always satisfied by enabling the detection events after enabling the interrupt, and disabling the detection before disabling the interrupt. This ensures interrupt/wakeup events can not happen until both the wakeup and interrupt enables correlate.
If we do any clearing, clear between the interrupt enable/disable and trigger setting.
--- drivers/gpio/gpio-omap.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/gpio/gpio-omap.c +8 -7
@@ -837,9 +837,9 @@ static void omap_gpio_irq_shutdown(struct irq_data *d)raw_spin_lock_irqsave (&bank->lock, flags); bank->irq_usage &= ~(BIT (offset)); -omap_set_gpio_irqenable (bank, offset,0 ); -omap_clear_gpio_irqstatus (bank, offset);omap_set_gpio_triggering (bank, offset,IRQ_TYPE_NONE ); +omap_clear_gpio_irqstatus (bank, offset); +omap_set_gpio_irqenable (bank, offset,0 );if (!LINE_USED (bank->mod_usage, offset))omap_clear_gpio_debounce (bank, offset);omap_disable_gpio_module (bank, offset);
@@ -881,8 +881,8 @@ static void omap_gpio_mask_irq(struct irq_data *d)unsigned long flags;raw_spin_lock_irqsave (&bank->lock, flags); -omap_set_gpio_irqenable (bank, offset,0 );omap_set_gpio_triggering (bank, offset,IRQ_TYPE_NONE ); +omap_set_gpio_irqenable (bank, offset,0 );raw_spin_unlock_irqrestore (&bank->lock, flags); }
@@ -894,9 +894,6 @@ static void omap_gpio_unmask_irq(struct irq_data *d)unsigned long flags;raw_spin_lock_irqsave (&bank->lock, flags); -if (trigger) -omap_set_gpio_triggering (bank, offset, trigger); -omap_set_gpio_irqenable (bank, offset,1 );/*
@@ -904,9 +901,13 @@ static void omap_gpio_unmask_irq(struct irq_data *d)* is cleared, thus after the handler has run. OMAP4 needs this done * after enabing the interrupt to clear the wakeup status. */ -if (bank->level_mask &BIT (offset)) +if (bank->regs->leveldetect0 && bank->regs->wkup_en && + trigger & (IRQ_TYPE_LEVEL_HIGH |IRQ_TYPE_LEVEL_LOW ))omap_clear_gpio_irqstatus (bank, offset); +if (trigger) +omap_set_gpio_triggering (bank, offset, trigger); +raw_spin_unlock_irqrestore (&bank->lock, flags); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 63/271 regmap: fix bulk writes on paged registers
In reply to Greg Kroah-Hartman[ Upstream commit db057679de3e9e6a03c1bcd5aee09b0d25fd9f5b ]
On buses like SlimBus and SoundWire which does not support gather_writes yet in regmap, A bulk write on paged register would be silently ignored after programming page.
This is because local variable 'ret' value in regmap_raw_write_impl() gets reset to 0 once page register is written successfully and the code below checks for 'ret' value to be -ENOTSUPP before linearising the write buffer to send to bus->write().
Fix this by resetting the 'ret' value to -ENOTSUPP in cases where gather_writes() is not supported or single register write is not possible.
--- drivers/base/regmap/regmap.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/base/regmap/regmap.c +2 -0
@@ -1618,6 +1618,8 @@ static int _regmap_raw_write_impl(struct regmap *map, unsigned int reg, map->format.reg_bytes + map->format.pad_bytes, val, val_len); + else + ret = -ENOTSUPP ;/* If that didn't work fall back on linearising by hand. */ if (ret == -ENOTSUPP ) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 64/271 bpf: silence warning messages in core
In reply to Greg Kroah-Hartman[ Upstream commit aee450cbe482a8c2f6fa5b05b178ef8b8ff107ca ]
Compiling kernel/bpf/core.c with W=1 causes a flood of warnings:
kernel/bpf/core.c:1198:65: warning: initialized field overwritten [-Woverride-init]
1198 | #define BPF_INSN_3_TBL(x, y, z) [BPF_##x | BPF_##y | BPF_##z] = true
| ^~~~kernel/bpf/core.c:1087:2: note: in expansion of macro 'BPF_INSN_3_TBL'
1087 | INSN_3(ALU, ADD, X), \
| ^~~~~~
kernel/bpf/core.c:1202:3: note: in expansion of macro 'BPF_INSN_MAP'
1202 | BPF_INSN_MAP(BPF_INSN_2_TBL, BPF_INSN_3_TBL),
| ^~~~~~~~~~~~kernel/bpf/core.c:1198:65: note: (near initialization for 'public_insntable[12]')
1198 | #define BPF_INSN_3_TBL(x, y, z) [BPF_##x | BPF_##y | BPF_##z] = true
| ^~~~kernel/bpf/core.c:1087:2: note: in expansion of macro 'BPF_INSN_3_TBL'
1087 | INSN_3(ALU, ADD, X), \
| ^~~~~~
kernel/bpf/core.c:1202:3: note: in expansion of macro 'BPF_INSN_MAP'
1202 | BPF_INSN_MAP(BPF_INSN_2_TBL, BPF_INSN_3_TBL),
| ^~~~~~~~~~~~98 copies of the above.
The attached patch silences the warnings, because we *know* we're overwriting the default initializer. That leaves bpf/core.c with only 6 other warnings, which become more visible in comparison.
--- kernel/bpf/Makefile | 1 + 1 file changed, 1 insertion(+)
kernel/bpf/Makefile +1 -0
@@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 obj-y := core.o +CFLAGS_core.o += $(call cc-disable-warning, override-init) obj-$(CONFIG_BPF_SYSCALL) += syscall.o verifier.o inode.o helpers.o tnum.o obj-$(CONFIG_BPF_SYSCALL) += hashtab.o arraymap.o percpu_freelist.o bpf_lru_list.o lpm_trie.o map_in_map.o
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 66/271 selinux: fix empty write to keycreate file
In reply to Greg Kroah-Hartman[ Upstream commit 464c258aa45b09f16aa0f05847ed8895873262d9 ]
When sid == 0 (we are resetting keycreate_sid to the default value), we should skip the KEY__CREATE check.
Before this patch, doing a zero-sized write to /proc/self/keycreate would check if the current task can create unlabeled keys (which would usually fail with -EACCESS and generate an AVC). Now it skips the check and correctly sets the task's keycreate_sid to 0.
Bug report: https://bugzilla.redhat.com/show_bug.cgi?id=1719067
Tested using the reproducer from the report above.
--- security/selinux/hooks.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
security/selinux/hooks.c +6 -5
@@ -6550,11 +6550,12 @@ static int selinux_setprocattr(const char *name, void *value, size_t size) }else if (!strcmp (name,"fscreate" )) { tsec->create_sid = sid; }else if (!strcmp (name,"keycreate" )) { - error =avc_has_perm (&selinux_state, - mysid, sid,SECCLASS_KEY ,KEY__CREATE , -NULL ); -if (error) - goto abort_change; +if (sid) { + error =avc_has_perm (&selinux_state, mysid, sid, +SECCLASS_KEY ,KEY__CREATE ,NULL ); +if (error) + goto abort_change; + } tsec->keycreate_sid = sid; }else if (!strcmp (name,"sockcreate" )) { tsec->sockcreate_sid = sid;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 40/271 media: wl128x: Fix some error handling in fm_v4l2_init_video_device()
In reply to Greg Kroah-Hartman[ Upstream commit 69fbb3f47327d959830c94bf31893972b8c8f700 ]
X-Originating-IP: [10.175.113.25]
X-CFilter-Loop: Reflected
The fm_v4l2_init_video_device() forget to unregister v4l2/video device in the error path, it could lead to UAF issue, eg,
BUG: KASAN: use-after-free in atomic64_read include/asm-generic/atomic-instrumented.h:836 [inline] BUG: KASAN: use-after-free in atomic_long_read include/asm-generic/atomic-long.h:28 [inline] BUG: KASAN: use-after-free in __mutex_unlock_slowpath+0x92/0x690 kernel/locking/mutex.c:1206 Read of size 8 at addr ffff8881e84a7c70 by task v4l_id/3659 CPU: 1 PID: 3659 Comm: v4l_id Not tainted 5.1.0 #8 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1ubuntu1 04/01/2014 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0xa9/0x10e lib/dump_stack.c:113 print_address_description+0x65/0x270 mm/kasan/report.c:187 kasan_report+0x149/0x18d mm/kasan/report.c:317 atomic64_read include/asm-generic/atomic-instrumented.h:836 [inline] atomic_long_read include/asm-generic/atomic-long.h:28 [inline] __mutex_unlock_slowpath+0x92/0x690 kernel/locking/mutex.c:1206 fm_v4l2_fops_open+0xac/0x120 [fm_drv] v4l2_open+0x191/0x390 [videodev] chrdev_open+0x20d/0x570 fs/char_dev.c:417 do_dentry_open+0x700/0xf30 fs/open.c:777 do_last fs/namei.c:3416 [inline] path_openat+0x7c4/0x2a90 fs/namei.c:3532 do_filp_open+0x1a5/0x2b0 fs/namei.c:3563 do_sys_open+0x302/0x490 fs/open.c:1069 do_syscall_64+0x9f/0x450 arch/x86/entry/common.c:290 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x7f8180c17c8e ... Allocated by task 3642: set_track mm/kasan/common.c:87 [inline] __kasan_kmalloc.constprop.3+0xa0/0xd0 mm/kasan/common.c:497 fm_drv_init+0x13/0x1000 [fm_drv] do_one_initcall+0xbc/0x47d init/main.c:901 do_init_module+0x1b5/0x547 kernel/module.c:3456 load_module+0x6405/0x8c10 kernel/module.c:3804 __do_sys_finit_module+0x162/0x190 kernel/module.c:3898 do_syscall_64+0x9f/0x450 arch/x86/entry/common.c:290 entry_SYSCALL_64_after_hwframe+0x49/0xbe Freed by task 3642: set_track mm/kasan/common.c:87 [inline] __kasan_slab_free+0x130/0x180 mm/kasan/common.c:459 slab_free_hook mm/slub.c:1429 [inline] slab_free_freelist_hook mm/slub.c:1456 [inline] slab_free mm/slub.c:3003 [inline] kfree+0xe1/0x270 mm/slub.c:3958 fm_drv_init+0x1e6/0x1000 [fm_drv] do_one_initcall+0xbc/0x47d init/main.c:901 do_init_module+0x1b5/0x547 kernel/module.c:3456 load_module+0x6405/0x8c10 kernel/module.c:3804 __do_sys_finit_module+0x162/0x190 kernel/module.c:3898 do_syscall_64+0x9f/0x450 arch/x86/entry/common.c:290 entry_SYSCALL_64_after_hwframe+0x49/0xbe
Add relevant unregister functions to fix it.
--- drivers/media/radio/wl128x/fmdrv_v4l2.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/radio/wl128x/fmdrv_v4l2.c +3 -0
@@ -549,6 +549,7 @@ int fm_v4l2_init_video_device(struct fmdev *fmdev, int radio_nr)/* Register with V4L2 subsystem as RADIO device */ if (video_register_device (&gradio_dev,VFL_TYPE_RADIO , radio_nr)) { +v4l2_device_unregister (&fmdev->v4l2_dev);fmerr ("Could not register video device\n" );return -ENOMEM ; }
@@ -562,6 +563,8 @@ int fm_v4l2_init_video_device(struct fmdev *fmdev, int radio_nr)if (ret <0 ) {fmerr ("(fmdev): Can't init ctrl handler\n" );v4l2_ctrl_handler_free (&fmdev->ctrl_handler); +video_unregister_device (fmdev->radio_dev); +v4l2_device_unregister (&fmdev->v4l2_dev);return -EBUSY ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 68/271 ASoC: meson: axg-tdm: fix sample clock inversion
In reply to Greg Kroah-Hartman[ Upstream commit cb36ff785e868992e96e8b9e5a0c2822b680a9e2 ]
The content of SND_SOC_DAIFMT_FORMAT_MASK is a number, not a bitfield, so the test to check if the format is i2s is wrong. Because of this the clock setting may be wrong. For example, the sample clock gets inverted in DSP B mode, when it should not.
Fix the lrclk invert helper function
--- sound/soc/meson/axg-tdm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/meson/axg-tdm.h +1 -1
@@ -40,7 +40,7 @@ struct axg_tdm_iface {static inline bool axg_tdm_lrclk_invert (unsigned int fmt) { -return (fmt &SND_SOC_DAIFMT_I2S ) ^ +return ((fmt &SND_SOC_DAIFMT_FORMAT_MASK ) ==SND_SOC_DAIFMT_I2S ) ^ !!(fmt & (SND_SOC_DAIFMT_IB_IF |SND_SOC_DAIFMT_NB_IF )); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 69/271 rcu: Force inlining of rcu_read_lock()
In reply to Greg Kroah-Hartman[ Upstream commit 6da9f775175e516fc7229ceaa9b54f8f56aa7924 ]
When debugging options are turned on, the rcu_read_lock() function might not be inlined. This results in lockdep's print_lock() function printing "rcu_read_lock+0x0/0x70" instead of rcu_read_lock()'s caller. For example:
[ 10.579995] =============================
[ 10.584033] WARNING: suspicious RCU usage
[ 10.588074] 4.18.0.memcg_v2+ #1 Not tainted
[ 10.593162] -----------------------------
[ 10.597203] include/linux/rcupdate.h:281 Illegal context switch in
RCU read-side critical section!
[ 10.606220]
[ 10.606220] other info that might help us debug this:
[ 10.606220]
[ 10.614280]
[ 10.614280] rcu_scheduler_active = 2, debug_locks = 1
[ 10.620853] 3 locks held by systemd/1:
[ 10.624632] #0: (____ptrval____) (&type->i_mutex_dir_key#5){.+.+}, at: lookup_slow+0x42/0x70
[ 10.633232] #1: (____ptrval____) (rcu_read_lock){....}, at: rcu_read_lock+0x0/0x70
[ 10.640954] #2: (____ptrval____) (rcu_read_lock){....}, at: rcu_read_lock+0x0/0x70These "rcu_read_lock+0x0/0x70" strings are not providing any useful information. This commit therefore forces inlining of the rcu_read_lock() function so that rcu_read_lock()'s caller is instead shown.
--- include/linux/rcupdate.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/rcupdate.h +1 -1
@@ -620,7 +620,7 @@ static inline void rcu_preempt_sleep_check(void) { }* read-side critical sections may be preempted and they may also block, but * only when acquiring spinlocks that are subject to priority inheritance. */ -static inline void rcu_read_lock (void ) +static __always_inline void rcu_read_lock(void) {__rcu_read_lock ();__acquire (RCU );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 70/271 x86/cpufeatures: Add FDP_EXCPTN_ONLY and ZERO_FCS_FDS
In reply to Greg Kroah-Hartman[ Upstream commit cbb99c0f588737ec98c333558922ce47e9a95827 ]
Add the CPUID enumeration for Intel's de-feature bits to accommodate passing these de-features through to kvm guests.
These de-features are (from SDM vol 1, section 8.1.8):
- X86_FEATURE_FDP_EXCPTN_ONLY: If CPUID.(EAX=07H,ECX=0H):EBX[bit 6] = 1, the data pointer (FDP) is updated only for the x87 non-control instructions that incur unmasked x87 exceptions.
- X86_FEATURE_ZERO_FCS_FDS: If CPUID.(EAX=07H,ECX=0H):EBX[bit 13] = 1, the processor deprecates FCS and FDS; it saves each as 0000H.
--- arch/x86/include/asm/cpufeatures.h | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/include/asm/cpufeatures.h +2 -0
@@ -239,12 +239,14 @@#define X86_FEATURE_BMI1 ( 9*32+ 3)/* 1st group bit manipulation extensions */ #define X86_FEATURE_HLE ( 9*32+ 4)/* Hardware Lock Elision */ #define X86_FEATURE_AVX2 ( 9*32+ 5)/* AVX2 instructions */ +#define X86_FEATURE_FDP_EXCPTN_ONLY ( 9*32+ 6)/* "" FPU data pointer updated only on x87 exceptions */ #define X86_FEATURE_SMEP ( 9*32+ 7)/* Supervisor Mode Execution Protection */ #define X86_FEATURE_BMI2 ( 9*32+ 8)/* 2nd group bit manipulation extensions */ #define X86_FEATURE_ERMS ( 9*32+ 9)/* Enhanced REP MOVSB/STOSB instructions */ #define X86_FEATURE_INVPCID ( 9*32+10)/* Invalidate Processor Context ID */ #define X86_FEATURE_RTM ( 9*32+11)/* Restricted Transactional Memory */ #define X86_FEATURE_CQM ( 9*32+12)/* Cache QoS Monitoring */ +#define X86_FEATURE_ZERO_FCS_FDS ( 9*32+13)/* "" Zero out FPU CS and FPU DS */ #define X86_FEATURE_MPX ( 9*32+14)/* Memory Protection Extension */ #define X86_FEATURE_RDT_A ( 9*32+15)/* Resource Director Technology Allocation */ #define X86_FEATURE_AVX512F ( 9*32+16)/* AVX-512 Foundation */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 72/271 net: hns3: fix for skb leak when doing selftest
In reply to Greg Kroah-Hartman[ Upstream commit 8f9eed1a8791b83eb1c54c261d68424717e4111e ]
If hns3_nic_net_xmit does not return NETDEV_TX_BUSY when doing a loopback selftest, the skb is not freed in hns3_clean_tx_ring or hns3_nic_net_xmit, which causes skb not freed problem.
This patch fixes it by freeing skb when hns3_nic_net_xmit does not return NETDEV_TX_OK.
--- drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +4 -2
@@ -245,11 +245,13 @@ static int hns3_lp_run_test(struct net_device *ndev, enum hnae3_loop mode)skb_get (skb); tx_ret =hns3_nic_net_xmit (skb, ndev); -if (tx_ret ==NETDEV_TX_OK ) +if (tx_ret ==NETDEV_TX_OK ) { good_cnt++; -else + }else { +kfree_skb (skb);netdev_err (ndev,"hns3_lb_run_test xmit failed: %d\n" , tx_ret); + } }if (good_cnt !=HNS3_NIC_LB_TEST_PKT_NUM ) { ret_val =HNS3_NIC_LB_TEST_TX_CNT_ERR ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 71/271 qed: iWARP - Fix tc for MPA ll2 connection
In reply to Greg Kroah-Hartman[ Upstream commit cb94d52b93c74fe1f2595734fabeda9f8ae891ee ]
The driver needs to assign a lossless traffic class for the MPA ll2 connection to ensure no packets are dropped when returning from the driver as they will never be re-transmitted by the peer.
--- drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/qlogic/qed/qed_iwarp.c +2 -0
@@ -2709,6 +2709,8 @@ qed_iwarp_ll2_start(struct qed_hwfn *p_hwfn, data.input.rx_num_desc = n_ooo_bufs *2 ; data.input.tx_num_desc = data.input.rx_num_desc; data.input.tx_max_bds_per_packet =QED_IWARP_MAX_BDS_PER_FPDU ; + data.input.tx_tc =PKT_LB_TC ; + data.input.tx_dest =QED_LL2_TX_DEST_LB ; data.p_connection_handle = &iwarp_info->ll2_mpa_handle; data.input.secondary_queue = true; data.cbs = &cbs;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 73/271 block: null_blk: fix race condition for null_del_dev
In reply to Greg Kroah-Hartman[ Upstream commit 7602843fd873cae43a444b83b14dfdd114a9659c ]
Dulicate call of null_del_dev() will trigger null pointer error like below. The reason is a race condition between nullb_device_power_store() and nullb_group_drop_item().
CPU#0 CPU#1
---------------- -----------------
do_rmdir()
Quoted 2 lines
configfs_rmdir()client_drop_item()
>nullb_group_drop_item()
nullb_device_power_store()
>null_del_dev()
>test_and_clear_bit(NULLB_DEV_FL_UP
>null_del_dev()
^^^^^
Duplicated null_dev_dev() triger null pointer error
>clear_bit(NULLB_DEV_FL_UPThe fix could be keep the sequnce of clear NULLB_DEV_FL_UP and null_del_dev().
[ 698.613600] BUG: unable to handle kernel NULL pointer dereference at 0000000000000018 [ 698.613608] #PF error: [normal kernel read fault] [ 698.613611] PGD 0 P4D 0 [ 698.613619] Oops: 0000 [#1] SMP PTI [ 698.613627] CPU: 3 PID: 6382 Comm: rmdir Not tainted 5.0.0+ #35 [ 698.613631] Hardware name: LENOVO 20LJS2EV08/20LJS2EV08, BIOS R0SET33W (1.17 ) 07/18/2018 [ 698.613644] RIP: 0010:null_del_dev+0xc/0x110 [null_blk] [ 698.613649] Code: 00 00 00 5b 41 5c 41 5d 41 5e 41 5f 5d c3 0f 0b eb 97 e8 47 bb 2a e8 0f 1f 80 00 00 00 00 0f 1f 44 00 00 55 48 89 e5 41 54 53 <8b> 77 18 48 89 fb 4c 8b 27 48 c7 c7 40 57 1e c1 e8 bf c7 cb e8 48 [ 698.613654] RSP: 0018:ffffb887888bfde0 EFLAGS: 00010286 [ 698.613659] RAX: 0000000000000000 RBX: ffff9d436d92bc00 RCX: ffff9d43a9184681 [ 698.613663] RDX: ffffffffc11e5c30 RSI: 0000000068be6540 RDI: 0000000000000000 [ 698.613667] RBP: ffffb887888bfdf0 R08: 0000000000000001 R09: 0000000000000000 [ 698.613671] R10: ffffb887888bfdd8 R11: 0000000000000f16 R12: ffff9d436d92bc08 [ 698.613675] R13: ffff9d436d94e630 R14: ffffffffc11e5088 R15: ffffffffc11e5000 [ 698.613680] FS: 00007faa68be6540(0000) GS:ffff9d43d14c0000(0000) knlGS:0000000000000000 [ 698.613685] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 698.613689] CR2: 0000000000000018 CR3: 000000042f70c002 CR4: 00000000003606e0 [ 698.613693] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 698.613697] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 698.613700] Call Trace: [ 698.613712] nullb_group_drop_item+0x50/0x70 [null_blk] [ 698.613722] client_drop_item+0x29/0x40 [ 698.613728] configfs_rmdir+0x1ed/0x300 [ 698.613738] vfs_rmdir+0xb2/0x130 [ 698.613743] do_rmdir+0x1c7/0x1e0 [ 698.613750] __x64_sys_rmdir+0x17/0x20 [ 698.613759] do_syscall_64+0x5a/0x110 [ 698.613768] entry_SYSCALL_64_after_hwframe+0x44/0xa9
--- drivers/block/null_blk_main.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/block/null_blk_main.c +6 -5
@@ -321,11 +321,12 @@ static ssize_t nullb_device_power_store(struct config_item *item,set_bit (NULLB_DEV_FL_CONFIGURED , &dev->flags); dev->power = newp; }else if (dev->power && !newp) { -mutex_lock (&lock); - dev->power = newp; -null_del_dev (dev->nullb); -mutex_unlock (&lock); -clear_bit (NULLB_DEV_FL_UP , &dev->flags); +if (test_and_clear_bit (NULLB_DEV_FL_UP , &dev->flags)) { +mutex_lock (&lock); + dev->power = newp; +null_del_dev (dev->nullb); +mutex_unlock (&lock); + }clear_bit (NULLB_DEV_FL_CONFIGURED , &dev->flags); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 74/271 blkcg, writeback: dead memcgs shouldnt contribute to writeback ownership arbitration
In reply to Greg Kroah-Hartman[ Upstream commit 6631142229005e1b1c311a09efe9fb3cfdac8559 ]
wbc_account_io() collects information on cgroup ownership of writeback pages to determine which cgroup should own the inode. Pages can stay associated with dead memcgs but we want to avoid attributing IOs to dead blkcgs as much as possible as the association is likely to be stale. However, currently, pages associated with dead memcgs contribute to the accounting delaying and/or confusing the arbitration.
Fix it by ignoring pages associated with dead memcgs.
--- fs/fs-writeback.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
fs/fs-writeback.c +7 -1
@@ -721,6 +721,7 @@ void wbc_detach_inode(struct writeback_control *wbc)void wbc_account_io (struct writeback_control *wbc,struct page *page,size_t bytes) { +struct cgroup_subsys_state *css;int id;/*
@@ -732,7 +733,12 @@ void wbc_account_io(struct writeback_control *wbc, struct page *page,if (!wbc->wb)return ; - id =mem_cgroup_css_from_page (page)->id; + css =mem_cgroup_css_from_page (page); +/* dead cgroups shouldn't contribute to inode ownership arbitration */ +if (!(css->flags &CSS_ONLINE )) +return ; + + id = css->id;if (id == wbc->wb_id) { wbc->wb_bytes += bytes;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 75/271 xfrm: fix sa selector validation
In reply to Greg Kroah-Hartman[ Upstream commit b8d6d0079757cbd1b69724cfd1c08e2171c68cee ]
After commit b38ff4075a80, the following command does not work anymore:
$ ip xfrm state add src 10.125.0.2 dst 10.125.0.1 proto esp spi 34 reqid 1 \ mode tunnel enc 'cbc(aes)' 0xb0abdba8b782ad9d364ec81e3a7d82a1 auth-trunc \ 'hmac(sha1)' 0xe26609ebd00acb6a4d51fca13e49ea78a72c73e6 96 flag align4
In fact, the selector is not mandatory, allow the user to provide an empty selector.
--- net/xfrm/xfrm_user.c | 3 +++ 1 file changed, 3 insertions(+)
net/xfrm/xfrm_user.c +3 -0
@@ -166,6 +166,9 @@ static int verify_newsa_info(struct xfrm_usersa_info *p, }switch (p->sel.family) { +case AF_UNSPEC : +break ; +case AF_INET :if (p->sel.prefixlen_d >32 || p->sel.prefixlen_s >32 ) goto out;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 76/271 sched/core: Add __sched tag for io_schedule()
In reply to Greg Kroah-Hartman[ Upstream commit e3b929b0a184edb35531153c5afcaebb09014f9d ]
Non-inline io_schedule() was introduced in:
commit 10ab56434f2f ("sched/core: Separate out io_schedule_prepare() and io_schedule_finish()")
Keep in line with io_schedule_timeout(), otherwise "/proc/<pid>/wchan" will report io_schedule() rather than its callers when waiting for IO.
--- kernel/sched/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/core.c +1 -1
@@ -5133,7 +5133,7 @@ long __sched io_schedule_timeout(long timeout) }EXPORT_SYMBOL (io_schedule_timeout); -void io_schedule (void ) +void __sched io_schedule(void) {int token;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 41/271 net: hns3: set ops to null when unregister ad_dev
In reply to Greg Kroah-Hartman[ Upstream commit 594a81b39525f0a17e92c2e0b167ae1400650380 ]
The hclge/hclgevf and hns3 module can be unloaded independently, when hclge/hclgevf unloaded firstly, the ops of ae_dev should be set to NULL, otherwise it will cause an use-after-free problem.
--- drivers/net/ethernet/hisilicon/hns3/hnae3.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/hisilicon/hns3/hnae3.c +2 -0
@@ -229,6 +229,7 @@ void hnae3_unregister_ae_algo(struct hnae3_ae_algo *ae_algo) ae_algo->ops->uninit_ae_dev (ae_dev);hnae3_set_bit (ae_dev->flag,HNAE3_DEV_INITED_B ,0 ); + ae_dev->ops =NULL ; }list_del (&ae_algo->node);
@@ -316,6 +317,7 @@ void hnae3_unregister_ae_dev(struct hnae3_ae_dev *ae_dev) ae_algo->ops->uninit_ae_dev (ae_dev);hnae3_set_bit (ae_dev->flag,HNAE3_DEV_INITED_B ,0 ); + ae_dev->ops =NULL ; }list_del (&ae_dev->node);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 43/271 arm64: mm: make CONFIG_ZONE_DMA32 configurable
In reply to Greg Kroah-Hartman[ Upstream commit 0c1f14ed12262f45a3af1d588e4d7bd12438b8f5 ]
This change makes CONFIG_ZONE_DMA32 defuly y and allows users to overwrite it only when CONFIG_EXPERT=y.
For the SoCs that do not need CONFIG_ZONE_DMA32, this is the first step to manage all available memory by a single zone(normal zone) to reduce the overhead of multiple zones.
The change also fixes a build error when CONFIG_NUMA=y and CONFIG_ZONE_DMA32=n.
arch/arm64/mm/init.c:195:17: error: use of undeclared identifier 'ZONE_DMA32'
max_zone_pfns[ZONE_DMA32] = PFN_DOWN(max_zone_dma_phys());
Change since v1:
1. only expose CONFIG_ZONE_DMA32 when CONFIG_EXPERT=y
2. remove redundant IS_ENABLED(CONFIG_ZONE_DMA32)
--- arch/arm64/Kconfig | 3 ++- arch/arm64/mm/init.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-)
arch/arm64/Kconfig +2 -1
@@ -251,7 +251,8 @@ config GENERIC_CALIBRATE_DELAY def_bool y config ZONE_DMA32 - def_bool y + bool "Support DMA32 zone" if EXPERT + default y config HAVE_GENERIC_GUP def_bool y
arch/arm64/mm/init.c +3 -2
@@ -233,8 +233,9 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) {unsigned long max_zone_pfns[MAX_NR_ZONES ] = {0 }; -if (IS_ENABLED (CONFIG_ZONE_DMA32 )) - max_zone_pfns[ZONE_DMA32 ] =PFN_DOWN (max_zone_dma_phys ()); +#ifdef CONFIG_ZONE_DMA32 + max_zone_pfns[ZONE_DMA32 ] =PFN_DOWN (max_zone_dma_phys ()); +#endif max_zone_pfns[ZONE_NORMAL ] = max;free_area_init_nodes (max_zone_pfns);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 44/271 perf jvmti: Address gcc string overflow warning for strncpy()
In reply to Greg Kroah-Hartman[ Upstream commit 279ab04dbea1370d2eac0f854270369ccaef8a44 ]
We are getting false positive gcc warning when we compile with gcc9 (9.1.1):
CC jvmti/libjvmti.o
In file included from /usr/include/string.h:494,
from jvmti/libjvmti.c:5:
In function ‘strncpy’,
inlined from ‘copy_class_filename.constprop’ at jvmti/libjvmti.c:166:3:
/usr/include/bits/string_fortified.h:106:10: error: ‘__builtin_strncpy’ specified bound depends on the length of the source argument [-Werror=stringop-overflow=]
106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
jvmti/libjvmti.c: In function ‘copy_class_filename.constprop’:
jvmti/libjvmti.c:165:26: note: length computed here
165 | size_t file_name_len = strlen(file_name);
| ^~~~~~~~~~~~~~~~~cc1: all warnings being treated as errors
As per Arnaldo's suggestion use strlcpy(), which does the same thing and keeps gcc silent.
--- tools/perf/jvmti/libjvmti.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/jvmti/libjvmti.c +2 -2
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/compiler.h> +#include <linux/string.h> #include <sys/types.h> #include <stdio.h> #include <string.h>
@@ -150,8 +151,7 @@ copy_class_filename(const char * class_sign, const char * file_name, char * resu result[i] ='\0' ; }else {/* fallback case */ -size_t file_name_len =strlen (file_name); -strncpy (result, file_name, file_name_len < max_length ? file_name_len : max_length); +strlcpy (result, file_name, max_length); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 46/271 net: stmmac: modify default value of tx-frames
In reply to Greg Kroah-Hartman[ Upstream commit d2facb4b3983425f6776c24dd678a82dbe673773 ]
the default value of tx-frames is 25, it's too late when passing tstamp to stack, then the ptp4l will fail:
ptp4l -i eth0 -f gPTP.cfg -m
ptp4l: selected /dev/ptp0 as PTP clock
ptp4l: port 1: INITIALIZING to LISTENING on INITIALIZE
ptp4l: port 0: INITIALIZING to LISTENING on INITIALIZE
ptp4l: port 1: link up
ptp4l: timed out while polling for tx timestamp
ptp4l: increasing tx_timestamp_timeout may correct this issue,
but it is likely caused by a driver bug
ptp4l: port 1: send peer delay response failed
ptp4l: port 1: LISTENING to FAULTY on FAULT_DETECTED (FT_UNSPECIFIED)
ptp4l tests pass when changing the tx-frames from 25 to 1 with ethtool -C option.
It should be fine to set tx-frames default value to 1, so ptp4l will pass by default.
--- drivers/net/ethernet/stmicro/stmmac/common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/common.h +1 -1
@@ -261,7 +261,7 @@ struct stmmac_safety_stats {#define STMMAC_COAL_TX_TIMER 1000#define STMMAC_MAX_COAL_TX_TICK 100000#define STMMAC_TX_MAX_FRAMES 256 -#define STMMAC_TX_FRAMES 25 +#define STMMAC_TX_FRAMES 1/* Packets types */ enum packets_types {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 37/271 tua6100: Avoid build warnings.
In reply to Greg Kroah-Hartman[ Upstream commit 621ccc6cc5f8d6730b740d31d4818227866c93c9 ]
Rename _P to _P_VAL and _R to _R_VAL to avoid global namespace conflicts:
drivers/media/dvb-frontends/tua6100.c: In function ‘tua6100_set_params’:drivers/media/dvb-frontends/tua6100.c:79: warning: "_P" redefined
#define _P 32
In file included from ./include/acpi/platform/aclinux.h:54,
from ./include/acpi/platform/acenv.h:152,
from ./include/acpi/acpi.h:22,
from ./include/linux/acpi.h:34,
from ./include/linux/i2c.h:17,
from drivers/media/dvb-frontends/tua6100.h:30,
from drivers/media/dvb-frontends/tua6100.c:32:./include/linux/ctype.h:14: note: this is the location of the previous definition
#define _P 0x10 /* punct */
--- drivers/media/dvb-frontends/tua6100.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/media/dvb-frontends/tua6100.c +11 -11
@@ -75,8 +75,8 @@ static int tua6100_set_params(struct dvb_frontend *fe)struct i2c_msg msg1 = { .addr = priv->i2c_address, .flags =0 , .buf = reg1, .len =4 };struct i2c_msg msg2 = { .addr = priv->i2c_address, .flags =0 , .buf = reg2, .len =3 }; -#define _R 4 -#define _P 32 +#define _R_VAL 4 +#define _P_VAL 32#define _ri 4000000// setup register 0
@@ -91,14 +91,14 @@ static int tua6100_set_params(struct dvb_frontend *fe)else reg1[1 ] =0x0c ; -if (_P ==64 ) +if (_P_VAL ==64 ) reg1[1 ] |=0x40 ;if (c->frequency >=1525000 ) reg1[1 ] |=0x80 ;// register 2 - reg2[1 ] = (_R >>8 ) &0x03 ; - reg2[2 ] = _R; + reg2[1 ] = (_R_VAL >>8 ) &0x03 ; + reg2[2 ] = _R_VAL;if (c->frequency <1455000 ) reg2[1 ] |=0x1c ;else if (c->frequency <1630000 )
@@ -110,18 +110,18 @@ static int tua6100_set_params(struct dvb_frontend *fe)* The N divisor ratio (note: c->frequency is in kHz, but we * need it in Hz) */ - prediv = (c->frequency * _R) / (_ri /1000 ); - div = prediv / _P; + prediv = (c->frequency * _R_VAL) / (_ri /1000 ); + div = prediv / _P_VAL; reg1[1 ] |= (div >>9 ) &0x03 ; reg1[2 ] = div >>1 ; reg1[3 ] = (div <<7 ); - priv->frequency = ((div * _P) * (_ri /1000 )) / _R; + priv->frequency = ((div * _P_VAL) * (_ri /1000 )) / _R_VAL;// Finally, calculate and store the value for A - reg1[3 ] |= (prediv - (div*_P)) &0x7f ; + reg1[3 ] |= (prediv - (div*_P_VAL)) &0x7f ; -#undef _R -#undef _P +#undef _R_VAL +#undef _P_VAL#undef _riif (fe->ops.i2c_gate_ctrl)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 79/271 x86/atomic: Fix smp_mb__{before,after}_atomic()
In reply to Greg Kroah-Hartman[ Upstream commit 69d927bba39517d0980462efc051875b7f4db185 ]
Recent probing at the Linux Kernel Memory Model uncovered a 'surprise'. Strongly ordered architectures where the atomic RmW primitive implies full memory ordering and smp_mb__{before,after}_atomic() are a simple barrier() (such as x86) fail for:
*x = 1; atomic_inc(u); smp_mb__after_atomic(); r0 = *y;
Because, while the atomic_inc() implies memory order, it (surprisingly) does not provide a compiler barrier. This then allows the compiler to re-order like so:
atomic_inc(u); *x = 1; smp_mb__after_atomic(); r0 = *y;
Which the CPU is then allowed to re-order (under TSO rules) like:
atomic_inc(u); r0 = *y; *x = 1;
And this very much was not intended. Therefore strengthen the atomic RmW ops to include a compiler barrier.
NOTE: atomic_{or,and,xor} and the bitops already had the compiler barrier.
--- Documentation/atomic_t.txt | 3 +++ arch/x86/include/asm/atomic.h | 8 ++++---- arch/x86/include/asm/atomic64_64.h | 8 ++++---- arch/x86/include/asm/barrier.h | 4 ++-- 4 files changed, 13 insertions(+), 10 deletions(-)
Documentation/atomic_t.txt +3 -0
@@ -177,6 +177,9 @@ These helper barriers exist because architectures have varying implicit ordering on their SMP atomic primitives. For example our TSO architectures provide full ordered atomics and these barriers are no-ops. +NOTE: when the atomic RmW ops are fully ordered, they should also imply a +compiler barrier. + Thus: atomic_fetch_add();
arch/x86/include/asm/atomic.h +4 -4
@@ -54,7 +54,7 @@ static __always_inline void arch_atomic_add(int i, atomic_t *v) { asmvolatile (LOCK_PREFIX "addl %1,%0" :"+m" (v->counter) - :"ir" (i)); + :"ir" (i) :"memory" ); }/**
@@ -68,7 +68,7 @@ static __always_inline void arch_atomic_sub(int i, atomic_t *v) { asmvolatile (LOCK_PREFIX "subl %1,%0" :"+m" (v->counter) - :"ir" (i)); + :"ir" (i) :"memory" ); }/**
@@ -95,7 +95,7 @@ static __always_inline bool arch_atomic_sub_and_test(int i, atomic_t *v) static __always_inline void arch_atomic_inc(atomic_t *v) { asmvolatile (LOCK_PREFIX "incl %0" - :"+m" (v->counter)); + :"+m" (v->counter) ::"memory" ); }#define arch_atomic_inc arch_atomic_inc
@@ -108,7 +108,7 @@ static __always_inline void arch_atomic_inc(atomic_t *v) static __always_inline void arch_atomic_dec(atomic_t *v) { asmvolatile (LOCK_PREFIX "decl %0" - :"+m" (v->counter)); + :"+m" (v->counter) ::"memory" ); }#define arch_atomic_dec arch_atomic_dec
arch/x86/include/asm/atomic64_64.h +4 -4
@@ -45,7 +45,7 @@ static __always_inline void arch_atomic64_add(long i, atomic64_t *v) { asmvolatile (LOCK_PREFIX "addq %1,%0" :"=m" (v->counter) - :"er" (i),"m" (v->counter)); + :"er" (i),"m" (v->counter) :"memory" ); }/**
@@ -59,7 +59,7 @@ static inline void arch_atomic64_sub(long i, atomic64_t *v) { asmvolatile (LOCK_PREFIX "subq %1,%0" :"=m" (v->counter) - :"er" (i),"m" (v->counter)); + :"er" (i),"m" (v->counter) :"memory" ); }/**
@@ -87,7 +87,7 @@ static __always_inline void arch_atomic64_inc(atomic64_t *v) { asmvolatile (LOCK_PREFIX "incq %0" :"=m" (v->counter) - :"m" (v->counter)); + :"m" (v->counter) :"memory" ); }#define arch_atomic64_inc arch_atomic64_inc
@@ -101,7 +101,7 @@ static __always_inline void arch_atomic64_dec(atomic64_t *v) { asmvolatile (LOCK_PREFIX "decq %0" :"=m" (v->counter) - :"m" (v->counter)); + :"m" (v->counter) :"memory" ); }#define arch_atomic64_dec arch_atomic64_dec
arch/x86/include/asm/barrier.h +2 -2
@@ -80,8 +80,8 @@ do { \ })/* Atomic operations are already serializing on x86 */ -#define __smp_mb__before_atomic () barrier() -#define __smp_mb__after_atomic () barrier() +#define __smp_mb__before_atomic () do { } while (0) +#define __smp_mb__after_atomic () do { } while (0)#include <asm-generic/barrier.h>
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 89/271 nvme-pci: set the errno on ctrl state change error
In reply to Greg Kroah-Hartman[ Upstream commit e71afda49335620e3d9adf56015676db33a3bd86 ]
This patch removes the confusing assignment of the variable result at the time of declaration and sets the value in error cases next to the places where the actual error is happening.
Here we also set the result value to -ENODEV when we fail at the final ctrl state transition in nvme_reset_work(). Without this assignment result will hold 0 from nvme_setup_io_queue() and on failure 0 will be passed to he nvme_remove_dead_ctrl() from final state transition.
--- drivers/nvme/host/pci.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/nvme/host/pci.c +5 -2
@@ -2253,11 +2253,13 @@ static void nvme_reset_work(struct work_struct *work)struct nvme_dev *dev = container_of(work, struct nvme_dev, ctrl.reset_work);bool was_suspend = !!(dev->ctrl.ctrl_config &NVME_CC_SHN_NORMAL ); -int result = -ENODEV ; +int result;enum nvme_ctrl_state new_state =NVME_CTRL_LIVE ; -if (WARN_ON (dev->ctrl.state !=NVME_CTRL_RESETTING )) +if (WARN_ON (dev->ctrl.state !=NVME_CTRL_RESETTING )) { + result = -ENODEV ; goto out; + }/* * If we're called to reset a live controller first shut it down before
@@ -2355,6 +2357,7 @@ static void nvme_reset_work(struct work_struct *work)if (!nvme_change_ctrl_state (&dev->ctrl, new_state)) {dev_warn (dev->ctrl.device,"failed to mark controller state %d\n" , new_state); + result = -ENODEV ; goto out; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 90/271 lightnvm: pblk: fix freeing of merged pages
In reply to Greg Kroah-Hartman[ Upstream commit 510fd8ea98fcb586c01aef93d87c060a159ac30a ]
bio_add_pc_page() may merge pages when a bio is padded due to a flush. Fix iteration over the bio to free the correct pages in case of a merge.
--- drivers/lightnvm/pblk-core.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
drivers/lightnvm/pblk-core.c +10 -8
@@ -288,14 +288,16 @@ void pblk_free_rqd(struct pblk *pblk, struct nvm_rq *rqd, int type)void pblk_bio_free_pages (struct pblk *pblk,struct bio *bio,int off,int nr_pages) { -struct bio_vec bv; -int i; - -WARN_ON (off + nr_pages != bio->bi_vcnt); - -for (i = off; i < nr_pages + off; i++) { - bv = bio->bi_io_vec[i]; -mempool_free (bv.bv_page, &pblk->page_bio_pool); +struct bio_vec *bv; +struct page *page; +int i, e, nbv =0 ; + +for (i =0 ; i < bio->bi_vcnt; i++) { + bv = &bio->bi_io_vec[i]; + page = bv->bv_page; +for (e =0 ; e < bv->bv_len; e +=PBLK_EXPOSED_PAGE_SIZE , nbv++) +if (nbv >= off) +mempool_free (page++, &pblk->page_bio_pool); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 88/271 nvme-pci: properly report state change failure in nvme_reset_work
In reply to Greg Kroah-Hartman[ Upstream commit cee6c269b016ba89c62e34d6bccb103ee2c7de4f ]
If the state change to NVME_CTRL_CONNECTING fails, the dmesg is going to be like:
[ 293.689160] nvme nvme0: failed to mark controller CONNECTING [ 293.689160] nvme nvme0: Removing after probe failure status: 0
Even it prints the first line to indicate the situation, the second line is not proper because the status is 0 which means normally success of the previous operation.
This patch makes it indicate the proper error value when it fails.
[ 25.932367] nvme nvme0: failed to mark controller CONNECTING [ 25.932369] nvme nvme0: Removing after probe failure status: -16
This situation is able to be easily reproduced by:
root@target:~# rmmod nvme && modprobe nvme && rmmod nvme
--- drivers/nvme/host/pci.c | 1 + 1 file changed, 1 insertion(+)
drivers/nvme/host/pci.c +1 -0
@@ -2294,6 +2294,7 @@ static void nvme_reset_work(struct work_struct *work)if (!nvme_change_ctrl_state (&dev->ctrl,NVME_CTRL_CONNECTING )) {dev_warn (dev->ctrl.device,"failed to mark controller CONNECTING\n" ); + result = -EBUSY ; goto out; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 92/271 ipsec: select crypto ciphers for xfrm_algo
In reply to Greg Kroah-Hartman[ Upstream commit 597179b0ba550bd83fab1a9d57c42a9343c58514 ]
kernelci.org reports failed builds on arc because of what looks like an old missed 'select' statement:
net/xfrm/xfrm_algo.o: In function `xfrm_probe_algs':
xfrm_algo.c:(.text+0x1e8): undefined reference to `crypto_has_ahash'
I don't see this in randconfig builds on other architectures, but it's fairly clear we want to select the hash code for it, like we do for all its other users. As Herbert points out, CRYPTO_BLKCIPHER is also required even though it has not popped up in build tests.
--- net/xfrm/Kconfig | 2 ++ 1 file changed, 2 insertions(+)
net/xfrm/Kconfig +2 -0
@@ -14,6 +14,8 @@ config XFRM_ALGO tristate select XFRM select CRYPTO + select CRYPTO_HASH + select CRYPTO_BLKCIPHER config XFRM_USER tristate "Transformation user configuration interface"
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 53/271 ipset: Fix memory accounting for hash types on resize
In reply to Greg Kroah-Hartman[ Upstream commit 11921796f4799ca9c61c4b22cc54d84aa69f8a35 ]
If a fresh array block is allocated during resize, the current in-memory set size should be increased by the size of the block, not replaced by it.
Before the fix, adding entries to a hash set type, leading to a table resize, caused an inconsistent memory size to be reported. This becomes more obvious when swapping sets with similar sizes:
# cat hash_ip_size.sh #!/bin/sh FAIL_RETRIES=10
tries=0
while [ ${tries} -lt ${FAIL_RETRIES} ]; do
ipset create t1 hash:ip
for i in `seq 1 4345`; do
ipset add t1 1.2.$((i / 255)).$((i % 255))
done
t1_init="$(ipset list t1|sed -n 's/Size in memory: \(.*\)/\1/p')"
ipset create t2 hash:ip
for i in `seq 1 4360`; do
ipset add t2 1.2.$((i / 255)).$((i % 255))
done
t2_init="$(ipset list t2|sed -n 's/Size in memory: \(.*\)/\1/p')"
ipset swap t1 t2
t1_swap="$(ipset list t1|sed -n 's/Size in memory: \(.*\)/\1/p')"
t2_swap="$(ipset list t2|sed -n 's/Size in memory: \(.*\)/\1/p')"
ipset destroy t1
ipset destroy t2
tries=$((tries + 1))
if [ ${t1_init} -lt 10000 ] || [ ${t2_init} -lt 10000 ]; then
echo "FAIL after ${tries} tries:"
echo "T1 size ${t1_init}, after swap ${t1_swap}"
echo "T2 size ${t2_init}, after swap ${t2_swap}"
exit 1
fi
done
echo "PASS"
# echo -n 'func hash_ip4_resize +p' > /sys/kernel/debug/dynamic_debug/control
# ./hash_ip_size.sh
[ 2035.018673] attempt to resize set t1 from 10 to 11, t 00000000fe6551fa
[ 2035.078583] set t1 resized from 10 (00000000fe6551fa) to 11 (00000000172a0163)
[ 2035.080353] Table destroy by resize 00000000fe6551fa
FAIL after 4 tries:
T1 size 9064, after swap 71128
T2 size 71128, after swap 9064--- net/netfilter/ipset/ip_set_hash_gen.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/ipset/ip_set_hash_gen.h +1 -1
@@ -625,7 +625,7 @@ mtype_resize(struct ip_set *set, bool retried) goto cleanup; } m->size =AHASH_INIT_SIZE ; - extsize =ext_size (AHASH_INIT_SIZE , dsize); + extsize +=ext_size (AHASH_INIT_SIZE , dsize);RCU_INIT_POINTER (hbucket (t, key), m); }else if (m->pos >= m->size) {struct hbucket *ht;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 91/271 arm64: Do not enable IRQs for ct_user_exit
In reply to Greg Kroah-Hartman[ Upstream commit 9034f6251572a4744597c51dea5ab73a55f2b938 ]
For el0_dbg and el0_error, DAIF bits get explicitly cleared before calling ct_user_exit.
When context tracking is disabled, DAIF gets set (almost) immediately after. When context tracking is enabled, among the first things done is disabling IRQs.
What is actually needed is:
- PSR.D = 0 so the system can be debugged (should be already the case)
- PSR.A = 0 so async error can be handled during context tracking
Do not clear PSR.I in those two locations.
--- arch/arm64/kernel/entry.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/kernel/entry.S +2 -2
@@ -824,7 +824,7 @@ el0_dbg: mov x1, x25 mov x2, sp bl do_debug_exception - enable_daif + enable_da_f ct_user_exit b ret_to_user el0_inv:
@@ -876,7 +876,7 @@ el0_error_naked: enable_dbg mov x0, sp bl do_serror - enable_daif + enable_da_f ct_user_exit b ret_to_user ENDPROC(el0_error)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 93/271 ipvs: defer hook registration to avoid leaks
In reply to Greg Kroah-Hartman[ Upstream commit cf47a0b882a4e5f6b34c7949d7b293e9287f1972 ]
syzkaller reports for memory leak when registering hooks [1]
As we moved the nf_unregister_net_hooks() call into __ip_vs_dev_cleanup(), defer the nf_register_net_hooks() call, so that hooks are allocated and freed from same pernet_operations (ipvs_core_dev_ops).
[1]
BUG: memory leak
unreferenced object 0xffff88810acd8a80 (size 96):
comm "syz-executor073", pid 7254, jiffies 4294950560 (age 22.250s) hex dump (first 32 bytes):
02 00 00 00 00 00 00 00 50 8b bb 82 ff ff ff ff ........P....... 00 00 00 00 00 00 00 00 00 77 bb 82 ff ff ff ff .........w......
backtrace:
[<0000000013db61f1>] kmemleak_alloc_recursive include/linux/kmemleak.h:55 [inline] [<0000000013db61f1>] slab_post_alloc_hook mm/slab.h:439 [inline] [<0000000013db61f1>] slab_alloc_node mm/slab.c:3269 [inline] [<0000000013db61f1>] kmem_cache_alloc_node_trace+0x15b/0x2a0 mm/slab.c:3597 [<000000001a27307d>] __do_kmalloc_node mm/slab.c:3619 [inline] [<000000001a27307d>] __kmalloc_node+0x38/0x50 mm/slab.c:3627 [<0000000025054add>] kmalloc_node include/linux/slab.h:590 [inline] [<0000000025054add>] kvmalloc_node+0x4a/0xd0 mm/util.c:431 [<0000000050d1bc00>] kvmalloc include/linux/mm.h:637 [inline] [<0000000050d1bc00>] kvzalloc include/linux/mm.h:645 [inline] [<0000000050d1bc00>] allocate_hook_entries_size+0x3b/0x60 net/netfilter/core.c:61 [<00000000e8abe142>] nf_hook_entries_grow+0xae/0x270 net/netfilter/core.c:128 [<000000004b94797c>] __nf_register_net_hook+0x9a/0x170 net/netfilter/core.c:337 [<00000000d1545cbc>] nf_register_net_hook+0x34/0xc0 net/netfilter/core.c:464 [<00000000876c9b55>] nf_register_net_hooks+0x53/0xc0 net/netfilter/core.c:480 [<000000002ea868e0>] __ip_vs_init+0xe8/0x170 net/netfilter/ipvs/ip_vs_core.c:2280 [<000000002eb2d451>] ops_init+0x4c/0x140 net/core/net_namespace.c:130 [<000000000284ec48>] setup_net+0xde/0x230 net/core/net_namespace.c:316 [<00000000a70600fa>] copy_net_ns+0xf0/0x1e0 net/core/net_namespace.c:439 [<00000000ff26c15e>] create_new_namespaces+0x141/0x2a0 kernel/nsproxy.c:107 [<00000000b103dc79>] copy_namespaces+0xa1/0xe0 kernel/nsproxy.c:165 [<000000007cc008a2>] copy_process.part.0+0x11fd/0x2150 kernel/fork.c:2035 [<00000000c344af7c>] copy_process kernel/fork.c:1800 [inline] [<00000000c344af7c>] _do_fork+0x121/0x4f0 kernel/fork.c:2369
--- net/netfilter/ipvs/ip_vs_core.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)
net/netfilter/ipvs/ip_vs_core.c +14 -7
@@ -2218,7 +2218,6 @@ static const struct nf_hook_ops ip_vs_ops[] = {static int __net_init __ip_vs_init (struct net *net) {struct netns_ipvs *ipvs; -int ret; ipvs =net_generic (net, ip_vs_net_id);if (ipvs ==NULL )
@@ -2250,17 +2249,11 @@ static int __net_init __ip_vs_init(struct net *net)if (ip_vs_sync_net_init (ipvs) <0 ) goto sync_fail; - ret =nf_register_net_hooks (net, ip_vs_ops,ARRAY_SIZE (ip_vs_ops)); -if (ret <0 ) - goto hook_fail; -return 0 ;/* * Error handling */ -hook_fail: -ip_vs_sync_net_cleanup (ipvs); sync_fail:ip_vs_conn_net_cleanup (ipvs); conn_fail:
@@ -2290,6 +2283,19 @@ static void __net_exit __ip_vs_cleanup(struct net *net) net->ipvs =NULL ; } +static int __net_init __ip_vs_dev_init (struct net *net) +{ +int ret; + + ret =nf_register_net_hooks (net, ip_vs_ops,ARRAY_SIZE (ip_vs_ops)); +if (ret <0 ) + goto hook_fail; +return 0 ; + +hook_fail: +return ret; +} + static void __net_exit __ip_vs_dev_cleanup(struct net *net) {struct netns_ipvs *ipvs =net_ipvs (net);
@@ -2309,6 +2315,7 @@ static struct pernet_operations ipvs_core_ops = { };static struct pernet_operations ipvs_core_dev_ops = { + .init = __ip_vs_dev_init, .exit = __ip_vs_dev_cleanup, };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 96/271 ntp: Limit TAI-UTC offset
In reply to Greg Kroah-Hartman[ Upstream commit d897a4ab11dc8a9fda50d2eccc081a96a6385998 ]
Don't allow the TAI-UTC offset of the system clock to be set by adjtimex() to a value larger than 100000 seconds.
This prevents an overflow in the conversion to int, prevents the CLOCK_TAI clock from getting too far ahead of the CLOCK_REALTIME clock, and it is still large enough to allow leap seconds to be inserted at the maximum rate currently supported by the kernel (once per day) for the next ~270 years, however unlikely it is that someone can survive a catastrophic event which slowed down the rotation of the Earth so much.
--- kernel/time/ntp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/time/ntp.c +3 -1
@@ -43,6 +43,7 @@ static u64 tick_length_base;#define MAX_TICKADJ 500LL/* usecs */ #define MAX_TICKADJ_SCALED \ (((MAX_TICKADJ * NSEC_PER_USEC) << NTP_SCALE_SHIFT) / NTP_INTERVAL_FREQ) +#define MAX_TAI_OFFSET 100000/* * phase-lock loop variables
@@ -698,7 +699,8 @@ static inline void process_adjtimex_modes(const struct timex *txc, s32 *time_tai time_constant =max (time_constant,0l ); } -if (txc->modes &ADJ_TAI && txc->constant >=0 ) +if (txc->modes &ADJ_TAI && + txc->constant >=0 && txc->constant <=MAX_TAI_OFFSET ) *time_tai = txc->constant;if (txc->modes &ADJ_OFFSET )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 98/271 acpi/arm64: ignore 5.1 FADTs that are reported as 5.0
In reply to Greg Kroah-Hartman[ Upstream commit 2af22f3ec3ca452f1e79b967f634708ff01ced8a ]
Some Qualcomm Snapdragon based laptops built to run Microsoft Windows are clearly ACPI 5.1 based, given that that is the first ACPI revision that supports ARM, and introduced the FADT 'arm_boot_flags' field, which has a non-zero field on those systems.
So in these cases, infer from the ARM boot flags that the FADT must be 5.1 or later, and treat it as 5.1.
--- arch/arm64/kernel/acpi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
arch/arm64/kernel/acpi.c +7 -3
@@ -154,10 +154,14 @@ static int __init acpi_fadt_sanity_check(void)*/ if (table->revision <5 || (table->revision ==5 && fadt->minor_revision <1 )) { -pr_err ("Unsupported FADT revision %d.%d, should be 5.1+\n" , +pr_err (FW_BUG "Unsupported FADT revision %d.%d, should be 5.1+\n" , table->revision, fadt->minor_revision); - ret = -EINVAL ; - goto out; + +if (!fadt->arm_boot_flags) { + ret = -EINVAL ; + goto out; + } +pr_err ("FADT has ARM boot flags set, assuming 5.1\n" ); }if (!(fadt->flags &ACPI_FADT_HW_REDUCED )) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 99/271 media: coda: fix mpeg2 sequence number handling
In reply to Greg Kroah-Hartman[ Upstream commit 56d159a4ec6d8da7313aac6fcbb95d8fffe689ba ]
Sequence number handling assumed that the BIT processor frame number starts counting at 1, but this is not true for the MPEG-2 decoder, which starts at 0. Fix the sequence counter offset detection to handle this.
--- drivers/media/platform/coda/coda-bit.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/media/platform/coda/coda-bit.c +4 -1
@@ -1728,6 +1728,7 @@ static int __coda_start_decoding(struct coda_ctx *ctx)v4l2_err (&dev->v4l2_dev,"CODA_COMMAND_SEQ_INIT timeout\n" );return ret; } + ctx->sequence_offset = ~0U ; ctx->initialized =1 ;/* Update kfifo out pointer from coda bitstream read pointer */
@@ -2147,7 +2148,9 @@ static void coda_finish_decode(struct coda_ctx *ctx)v4l2_err (&dev->v4l2_dev,"decoded frame index out of range: %d\n" , decoded_idx); }else { - val =coda_read (dev,CODA_RET_DEC_PIC_FRAME_NUM ) -1 ; + val =coda_read (dev,CODA_RET_DEC_PIC_FRAME_NUM ); +if (ctx->sequence_offset ==-1 ) + ctx->sequence_offset = val; val -= ctx->sequence_offset;spin_lock_irqsave (&ctx->buffer_meta_lock, flags);if (!list_empty (&ctx->buffer_meta_list)) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 100/271 media: coda: fix last buffer handling in V4L2_ENC_CMD_STOP
In reply to Greg Kroah-Hartman[ Upstream commit f3775f89852d167990b0d718587774cf00d22ac2 ]
coda_encoder_cmd() is racy, as the last scheduled picture run worker can still be in-flight while the ENC_CMD_STOP command is issued. Depending on the exact timing the sequence numbers might already be changed, but the last buffer might not have been put on the destination queue yet.
In this case the current implementation would prematurely wake the destination queue with last_buffer_dequeued=true, causing userspace to call streamoff before the last buffer is handled.
Close this race window by synchronizing with the pic_run_worker before doing the sequence check.
--- drivers/media/platform/coda/coda-common.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/platform/coda/coda-common.c +2 -0
@@ -997,6 +997,8 @@ static int coda_encoder_cmd(struct file *file, void *fh,/* Set the stream-end flag on this context */ ctx->bit_stream_param |=CODA_BIT_STREAM_END_FLAG ; +flush_work (&ctx->pic_run_work); +/* If there is no buffer in flight, wake up */ if (!ctx->streamon_out || ctx->qsequence == ctx->osequence) { dst_vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 101/271 media: coda: increment sequence offset for the last returned frame
In reply to Greg Kroah-Hartman[ Upstream commit b3b7d96817cdb8b6fc353867705275dce8f41ccc ]
If no more frames are decoded in bitstream end mode, and a previously decoded frame has been returned, the firmware still increments the frame number. To avoid a sequence number mismatch after decoder restart, increment the sequence_offset correction parameter.
--- drivers/media/platform/coda/coda-bit.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/platform/coda/coda-bit.c +3 -0
@@ -2143,6 +2143,9 @@ static void coda_finish_decode(struct coda_ctx *ctx)else if (ctx->display_idx <0 ) ctx->hold = true; }else if (decoded_idx ==-2 ) { +if (ctx->display_idx >=0 && + ctx->display_idx < ctx->num_internal_frames) + ctx->sequence_offset++;/* no frame was decoded, we still return remaining buffers */ }else if (decoded_idx <0 || decoded_idx >= ctx->num_internal_frames) { v4l2_err(&dev->v4l2_dev,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 102/271 media: vimc: cap: check v4l2_fill_pixfmt return value
In reply to Greg Kroah-Hartman[ Upstream commit 77ae46e11df5c96bb4582633851f838f5d954df4 ]
v4l2_fill_pixfmt() returns -EINVAL if the pixelformat used as parameter is invalid or if the user is trying to use a multiplanar format with the singleplanar API. Currently, the vimc_cap_try_fmt_vid_cap() returns such value, but vimc_cap_s_fmt_vid_cap() is ignoring it. Fix that and returns an error value if vimc_cap_try_fmt_vid_cap() has failed.
--- drivers/media/platform/vimc/vimc-capture.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/media/platform/vimc/vimc-capture.c +4 -1
@@ -132,12 +132,15 @@ static int vimc_cap_s_fmt_vid_cap(struct file *file, void *priv, struct v4l2_format *f) {struct vimc_cap_device *vcap =video_drvdata (file); +int ret;/* Do not change the format while stream is on */ if (vb2_is_busy (&vcap->queue))return -EBUSY ; -vimc_cap_try_fmt_vid_cap (file, priv, f); + ret =vimc_cap_try_fmt_vid_cap (file, priv, f); +if (ret) +return ret;dev_dbg (vcap->dev,"%s: format update: " "old:%dx%d (0x%x, %d, %d, %d, %d) "
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 94/271 media: s5p-mfc: Make additional clocks optional
In reply to Greg Kroah-Hartman[ Upstream commit e08efef8fe7db87206314c19b341612c719f891a ]
Since the beginning the second clock ('special', 'sclk') was optional and it is not available on some variants of Exynos SoCs (i.e. Exynos5420 with v7 of MFC hardware).
However commit 1bce6fb3edf1 ("[media] s5p-mfc: Rework clock handling") made handling of all specified clocks mandatory. This patch restores original behavior of the driver and fixes its operation on Exynos5420 SoCs.
--- drivers/media/platform/s5p-mfc/s5p_mfc_pm.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/media/platform/s5p-mfc/s5p_mfc_pm.c +5 -0
@@ -38,6 +38,11 @@ int s5p_mfc_init_pm(struct s5p_mfc_dev *dev)for (i =0 ; i < pm->num_clocks; i++) { pm->clocks[i] =devm_clk_get (pm->device, pm->clk_names[i]);if (IS_ERR (pm->clocks[i])) { +/* additional clocks are optional */ +if (i &&PTR_ERR (pm->clocks[i]) == -ENOENT ) { + pm->clocks[i] =NULL ; +continue ; + }mfc_err ("Failed to get clock: %s\n" , pm->clk_names[i]);return PTR_ERR (pm->clocks[i]);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 80/271 perf evsel: Make perf_evsel__name() accept a NULL argument
In reply to Greg Kroah-Hartman[ Upstream commit fdbdd7e8580eac9bdafa532746c865644d125e34 ]
In which case it simply returns "unknown", like when it can't figure out the evsel->name value.
This makes this code more robust and fixes a problem in 'perf trace' where a NULL evsel was being passed to a routine that only used the evsel for printing its name when a invalid syscall id was passed.
--- tools/perf/util/evsel.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
tools/perf/util/evsel.c +7 -1
@@ -590,6 +590,9 @@ const char *perf_evsel__name(struct perf_evsel *evsel) {char bf[128 ]; +if (!evsel) + goto out_unknown; +if (evsel->name)return evsel->name;
@@ -626,7 +629,10 @@ const char *perf_evsel__name(struct perf_evsel *evsel) evsel->name =strdup (bf); -return evsel->name ?:"unknown" ; +if (evsel->name) +return evsel->name; +out_unknown: +return "unknown" ; }const char *perf_evsel__group_name (struct perf_evsel *evsel)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 97/271 timer_list: Guard procfs specific code
In reply to Greg Kroah-Hartman[ Upstream commit a9314773a91a1d3b36270085246a6715a326ff00 ]
With CONFIG_PROC_FS=n the following warning is emitted:
kernel/time/timer_list.c:361:36: warning: unused variable 'timer_list_sops' [-Wunused-const-variable]
static const struct seq_operations timer_list_sops = {
Add #ifdef guard around procfs specific code.
--- kernel/time/timer_list.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-)
kernel/time/timer_list.c +19 -17
@@ -287,23 +287,6 @@ static inline void timer_list_header(struct seq_file *m, u64 now)SEQ_printf (m,"\n" ); } -static int timer_list_show (struct seq_file *m,void *v) -{ -struct timer_list_iter *iter = v; - -if (iter->cpu ==-1 && !iter->second_pass) -timer_list_header (m, iter->now); -else if (!iter->second_pass) -print_cpu (m, iter->cpu, iter->now); -#ifdef CONFIG_GENERIC_CLOCKEVENTS - else if (iter->cpu == -1 && iter->second_pass) - timer_list_show_tickdevices_header(m); - else - print_tickdevice(m, tick_get_device(iter->cpu), iter->cpu); -#endif -return 0 ; -} -void sysrq_timer_list_show (void ) {u64 now =ktime_to_ns (ktime_get ());
@@ -322,6 +305,24 @@ void sysrq_timer_list_show(void)return ; } +#ifdef CONFIG_PROC_FS +static int timer_list_show (struct seq_file *m,void *v) +{ +struct timer_list_iter *iter = v; + +if (iter->cpu ==-1 && !iter->second_pass) +timer_list_header (m, iter->now); +else if (!iter->second_pass) +print_cpu (m, iter->cpu, iter->now); +#ifdef CONFIG_GENERIC_CLOCKEVENTS + else if (iter->cpu == -1 && iter->second_pass) + timer_list_show_tickdevices_header(m); + else + print_tickdevice(m, tick_get_device(iter->cpu), iter->cpu); +#endif +return 0 ; +} +static void *move_iter (struct timer_list_iter *iter,loff_t offset) {for (; offset; offset--) {
@@ -381,3 +382,4 @@ static int __init init_timer_list_procfs(void) return 0; }__initcall (init_timer_list_procfs); +#endif
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 95/271 media: i2c: fix warning same module names
In reply to Greg Kroah-Hartman[ Upstream commit b2ce5617dad254230551feda3599f2cc68e53ad8 ]
When building with CONFIG_VIDEO_ADV7511 and CONFIG_DRM_I2C_ADV7511 enabled as loadable modules, we see the following warning:
drivers/gpu/drm/bridge/adv7511/adv7511.ko
drivers/media/i2c/adv7511.ko
Rework so that the file is named adv7511-v4l2.c.
---
drivers/media/i2c/Makefile | 2 +-
drivers/media/i2c/{adv7511.c => adv7511-v4l2.c} | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
rename drivers/media/i2c/{adv7511.c => adv7511-v4l2.c} (99%)drivers/media/i2c/Makefile +1 -1
@@ -36,7 +36,7 @@ obj-$(CONFIG_VIDEO_ADV748X) += adv748x/ obj-$(CONFIG_VIDEO_ADV7604) += adv7604.o obj-$(CONFIG_VIDEO_ADV7842) += adv7842.o obj-$(CONFIG_VIDEO_AD9389B) += ad9389b.o -obj-$(CONFIG_VIDEO_ADV7511) += adv7511.o +obj-$(CONFIG_VIDEO_ADV7511) += adv7511-v4l2.o obj-$(CONFIG_VIDEO_VPX3220) += vpx3220.o obj-$(CONFIG_VIDEO_VS6624) += vs6624.o obj-$(CONFIG_VIDEO_BT819) += bt819.o
drivers/media/i2c/adv7511-v4l2.c renamed from drivers/media/i2c/adv7511.c +5 -0
@@ -5,6 +5,11 @@* Copyright 2013 Cisco Systems, Inc. and/or its affiliates. All rights reserved. */ +/* +* This file is named adv7511-v4l2.c so it doesn't conflict with the Analog +* Device ADV7511 (config fragment CONFIG_DRM_I2C_ADV7511). +*/ +#include <linux/kernel.h> #include <linux/module.h>
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 45/271 net: stmmac: dwmac4: fix flow control issue
In reply to Greg Kroah-Hartman[ Upstream commit ee326fd01e79dfa42014d55931260b68b9fa3273 ]
Current dwmac4_flow_ctrl will not clear GMAC_RX_FLOW_CTRL_RFE/GMAC_RX_FLOW_CTRL_RFE bits, so MAC hw will keep flow control on although expecting flow control off by ethtool. Add codes to fix it.
--- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +6 -2
@@ -475,8 +475,9 @@ static void dwmac4_flow_ctrl(struct mac_device_info *hw, unsigned int duplex,if (fc &FLOW_RX ) {pr_debug ("\tReceive Flow-Control ON\n" ); flow |=GMAC_RX_FLOW_CTRL_RFE ; -writel (flow, ioaddr +GMAC_RX_FLOW_CTRL ); } +writel (flow, ioaddr +GMAC_RX_FLOW_CTRL ); +if (fc &FLOW_TX ) {pr_debug ("\tTransmit Flow-Control ON\n" );
@@ -484,7 +485,7 @@ static void dwmac4_flow_ctrl(struct mac_device_info *hw, unsigned int duplex,pr_debug ("\tduplex mode: PAUSE %d\n" , pause_time);for (queue =0 ; queue < tx_cnt; queue++) { - flow |=GMAC_TX_FLOW_CTRL_TFE ; + flow =GMAC_TX_FLOW_CTRL_TFE ;if (duplex) flow |=
@@ -492,6 +493,9 @@ static void dwmac4_flow_ctrl(struct mac_device_info *hw, unsigned int duplex,writel (flow, ioaddr +GMAC_QX_TX_FLOW_CTRL (queue)); } + }else { +for (queue =0 ; queue < tx_cnt; queue++) +writel (0 , ioaddr +GMAC_QX_TX_FLOW_CTRL (queue)); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 42/271 cpupower : frequency-set -r option misses the last cpu in related cpu list
In reply to Greg Kroah-Hartman[ Upstream commit 04507c0a9385cc8280f794a36bfff567c8cc1042 ]
To set frequency on specific cpus using cpupower, following syntax can be used :
cpupower -c #i frequency-set -f #f -r
While setting frequency using cpupower frequency-set command, if we use '-r' option, it is expected to set frequency for all cpus related to cpu #i. But it is observed to be missing the last cpu in related cpu list. This patch fixes the problem.
--- tools/power/cpupower/utils/cpufreq-set.c | 2 ++ 1 file changed, 2 insertions(+)
tools/power/cpupower/utils/cpufreq-set.c +2 -0
@@ -306,6 +306,8 @@ int cmd_freq_set(int argc, char **argv)bitmask_setbit (cpus_chosen, cpus->cpu); cpus = cpus->next; } +/* Set the last cpu in related cpus list */ +bitmask_setbit (cpus_chosen, cpus->cpu);cpufreq_put_related_cpus (cpus); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 77/271 sched/fair: Fix "runnable_avg_yN_inv" not used warnings
In reply to Greg Kroah-Hartman[ Upstream commit 509466b7d480bc5d22e90b9fbe6122ae0e2fbe39 ]
runnable_avg_yN_inv[] is only used in kernel/sched/pelt.c but was included in several other places because they need other macros all came from kernel/sched/sched-pelt.h which was generated by Documentation/scheduler/sched-pelt. As the result, it causes compilation a lot of warnings,
kernel/sched/sched-pelt.h:4:18: warning: 'runnable_avg_yN_inv' defined but not used [-Wunused-const-variable=] kernel/sched/sched-pelt.h:4:18: warning: 'runnable_avg_yN_inv' defined but not used [-Wunused-const-variable=] kernel/sched/sched-pelt.h:4:18: warning: 'runnable_avg_yN_inv' defined but not used [-Wunused-const-variable=]
...
Silence it by appending the __maybe_unused attribute for it, so all generated variables and macros can still be kept in the same file.
--- Documentation/scheduler/sched-pelt.c | 3 ++- kernel/sched/sched-pelt.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
Documentation/scheduler/sched-pelt.c +2 -1
@@ -20,7 +20,8 @@ void calc_runnable_avg_yN_inv(void)int i;unsigned int x; -printf ("static const u32 runnable_avg_yN_inv[] = {" ); +/* To silence -Wunused-but-set-variable warnings. */ +printf ("static const u32 runnable_avg_yN_inv[] __maybe_unused = {" );for (i =0 ; i <HALFLIFE ; i++) { x = ((1UL <<32 )-1 )*pow (y, i);
kernel/sched/sched-pelt.h +1 -1
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Generated by Documentation/scheduler/sched-pelt; do not modify. */ -static const u32 runnable_avg_yN_inv[] = { +static const u32 runnable_avg_yN_inv[]__maybe_unused = {0xffffffff ,0xfa83b2da ,0xf5257d14 ,0xefe4b99a ,0xeac0c6e6 ,0xe5b906e6 ,0xe0ccdeeb ,0xdbfbb796 ,0xd744fcc9 ,0xd2a81d91 ,0xce248c14 ,0xc9b9bd85 ,0xc5672a10 ,0xc12c4cc9 ,0xbd08a39e ,0xb8fbaf46 ,0xb504f333 ,0xb123f581 ,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 65/271 media: s5p-mfc: fix reading min scratch buffer size on MFC v6/v7
In reply to Greg Kroah-Hartman[ Upstream commit be22203aec440c1761ce8542c2636ac6c8951e3a ]
MFC v6 and v7 has no register to read min scratch buffer size, so it has to be read conditionally only if hardware supports it. This fixes following NULL pointer exception on SoCs with MFC v6/v7:
8<--- cut here ---
Unable to handle kernel NULL pointer dereference at virtual address 00000000 pgd = f25837f9 [00000000] *pgd=bd93d835 Internal error: Oops: 17 [#1] PREEMPT SMP ARM Modules linked in: btmrvl_sdio btmrvl bluetooth mwifiex_sdio mwifiex ecdh_generic ecc Hardware name: SAMSUNG EXYNOS (Flattened Device Tree) PC is at s5p_mfc_get_min_scratch_buf_size+0x30/0x3c LR is at s5p_mfc_get_min_scratch_buf_size+0x28/0x3c
...
[<c074f998>] (s5p_mfc_get_min_scratch_buf_size) from [<c0745bc0>] (s5p_mfc_irq+0x814/0xa5c) [<c0745bc0>] (s5p_mfc_irq) from [<c019a218>] (__handle_irq_event_percpu+0x64/0x3f8) [<c019a218>] (__handle_irq_event_percpu) from [<c019a5d8>] (handle_irq_event_percpu+0x2c/0x7c) [<c019a5d8>] (handle_irq_event_percpu) from [<c019a660>] (handle_irq_event+0x38/0x5c) [<c019a660>] (handle_irq_event) from [<c019ebc4>] (handle_fasteoi_irq+0xc4/0x180) [<c019ebc4>] (handle_fasteoi_irq) from [<c0199270>] (generic_handle_irq+0x24/0x34) [<c0199270>] (generic_handle_irq) from [<c0199888>] (__handle_domain_irq+0x7c/0xec) [<c0199888>] (__handle_domain_irq) from [<c04ac298>] (gic_handle_irq+0x58/0x9c) [<c04ac298>] (gic_handle_irq) from [<c0101ab0>] (__irq_svc+0x70/0xb0)
Exception stack(0xe73ddc60 to 0xe73ddca8)
...
[<c0101ab0>] (__irq_svc) from [<c01967d8>] (console_unlock+0x5a8/0x6a8) [<c01967d8>] (console_unlock) from [<c01981d0>] (vprintk_emit+0x118/0x2d8) [<c01981d0>] (vprintk_emit) from [<c01983b0>] (vprintk_default+0x20/0x28) [<c01983b0>] (vprintk_default) from [<c01989b4>] (printk+0x30/0x54) [<c01989b4>] (printk) from [<c07500b8>] (s5p_mfc_init_decode_v6+0x1d4/0x284) [<c07500b8>] (s5p_mfc_init_decode_v6) from [<c07230d0>] (vb2_start_streaming+0x24/0x150) [<c07230d0>] (vb2_start_streaming) from [<c0724e4c>] (vb2_core_streamon+0x11c/0x15c) [<c0724e4c>] (vb2_core_streamon) from [<c07478b8>] (vidioc_streamon+0x64/0xa0) [<c07478b8>] (vidioc_streamon) from [<c0709640>] (__video_do_ioctl+0x28c/0x45c) [<c0709640>] (__video_do_ioctl) from [<c0709bc8>] (video_usercopy+0x260/0x8a4) [<c0709bc8>] (video_usercopy) from [<c02b3820>] (do_vfs_ioctl+0xb0/0x9fc) [<c02b3820>] (do_vfs_ioctl) from [<c02b41a0>] (ksys_ioctl+0x34/0x58) [<c02b41a0>] (ksys_ioctl) from [<c0101000>] (ret_fast_syscall+0x0/0x28)
Exception stack(0xe73ddfa8 to 0xe73ddff0) ... ---[ end trace 376cf5ba6e0bee93 ]---
--- drivers/media/platform/s5p-mfc/s5p_mfc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/platform/s5p-mfc/s5p_mfc.c +2 -1
@@ -527,7 +527,8 @@ static void s5p_mfc_handle_seq_done(struct s5p_mfc_ctx *ctx, dev); ctx->mv_count =s5p_mfc_hw_call (dev->mfc_ops, get_mv_count, dev); - ctx->scratch_buf_size =s5p_mfc_hw_call (dev->mfc_ops, +if (FW_HAS_E_MIN_SCRATCH_BUF (dev)) + ctx->scratch_buf_size =s5p_mfc_hw_call (dev->mfc_ops, get_min_scratch_buf_size, dev);if (ctx->img_width ==0 || ctx->img_height ==0 ) ctx->state =MFCINST_ERROR ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 60/271 iommu: Fix a leak in iommu_insert_resv_region
In reply to Greg Kroah-Hartman[ Upstream commit ad0834dedaa15c3a176f783c0373f836e44b4700 ]
In case we expand an existing region, we unlink this latter and insert the larger one. In that case we should free the original region after the insertion. Also we can immediately return.
--- drivers/iommu/iommu.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/iommu/iommu.c +5 -3
@@ -211,18 +211,21 @@ static int iommu_insert_resv_region(struct iommu_resv_region *new, pos = pos->next; }else if ((start >= a) && (end <= b)) {if (new->type == type) - goto done; +return 0 ;else pos = pos->next; }else {if (new->type == type) {phys_addr_t new_start =min (a, start);phys_addr_t new_end =max (b, end); +int ret;list_del (&entry->list); entry->start = new_start; entry->length = new_end - new_start +1 ; -iommu_insert_resv_region (entry, regions); + ret =iommu_insert_resv_region (entry, regions); +kfree (entry); +return ret; }else { pos = pos->next; }
@@ -235,7 +238,6 @@ static int iommu_insert_resv_region(struct iommu_resv_region *new,return -ENOMEM ;list_add_tail (®ion->list, pos); -done:return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 57/271 irqchip/meson-gpio: Add support for Meson-G12A SoC
In reply to Greg Kroah-Hartman[ Upstream commit c64a9e804ccf86eb202bfd1c6a8c5233c75a0431 ]
The Meson-G12A SoC uses the same GPIO interrupt controller IP block as the other Meson SoCs, A totle of 100 pins can be spied on, which is the sum of:
- 223:100 undefined (no interrupt)
- 99:97 3 pins on bank GPIOE - 96:77 20 pins on bank GPIOX - 76:61 16 pins on bank GPIOA - 60:53 8 pins on bank GPIOC - 52:37 16 pins on bank BOOT - 36:28 9 pins on bank GPIOH - 27:12 16 pins on bank GPIOZ - 11:0 12 pins in the AO domain
--- drivers/irqchip/irq-meson-gpio.c | 1 + 1 file changed, 1 insertion(+)
drivers/irqchip/irq-meson-gpio.c +1 -0
@@ -73,6 +73,7 @@ static const struct of_device_id meson_irq_gpio_matches[] = { { .compatible = "amlogic,meson-gxbb-gpio-intc", .data = &gxbb_params }, { .compatible = "amlogic,meson-gxl-gpio-intc", .data = &gxl_params }, { .compatible = "amlogic,meson-axg-gpio-intc", .data = &axg_params }, + { .compatible = "amlogic,meson-g12a-gpio-intc", .data = &axg_params }, { } };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 39/271 locking/lockdep: Fix merging of hlocks with non-zero references
In reply to Greg Kroah-Hartman[ Upstream commit d9349850e188b8b59e5322fda17ff389a1c0cd7d ]
The sequence
static DEFINE_WW_CLASS(test_ww_class); struct ww_acquire_ctx ww_ctx; struct ww_mutex ww_lock_a; struct ww_mutex ww_lock_b; struct ww_mutex ww_lock_c; struct mutex lock_c; ww_acquire_init(&ww_ctx, &test_ww_class); ww_mutex_init(&ww_lock_a, &test_ww_class); ww_mutex_init(&ww_lock_b, &test_ww_class); ww_mutex_init(&ww_lock_c, &test_ww_class); mutex_init(&lock_c); ww_mutex_lock(&ww_lock_a, &ww_ctx); mutex_lock(&lock_c); ww_mutex_lock(&ww_lock_b, &ww_ctx); ww_mutex_lock(&ww_lock_c, &ww_ctx); mutex_unlock(&lock_c); (*) ww_mutex_unlock(&ww_lock_c); ww_mutex_unlock(&ww_lock_b); ww_mutex_unlock(&ww_lock_a); ww_acquire_fini(&ww_ctx); (**)
will trigger the following error in __lock_release() when calling mutex_release() at **:
DEBUG_LOCKS_WARN_ON(depth <= 0)
The problem is that the hlock merging happening at * updates the references for test_ww_class incorrectly to 3 whereas it should've updated it to 4 (representing all the instances for ww_ctx and ww_lock_[abc]).
Fix this by updating the references during merging correctly taking into account that we can have non-zero references (both for the hlock that we merge into another hlock or for the hlock we are merging into).
--- kernel/locking/lockdep.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
kernel/locking/lockdep.c +9 -9
@@ -3326,17 +3326,17 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,if (depth) { hlock = curr->held_locks + depth -1 ;if (hlock->class_idx == class_idx && nest_lock) { -if (hlock->references) { -/* -* Check: unsigned int references:12, overflow. -*/ -if (DEBUG_LOCKS_WARN_ON (hlock->references == (1 <<12 )-1 )) -return 0 ; +if (!references) + references++; +if (!hlock->references) hlock->references++; - }else { - hlock->references =2 ; - } + + hlock->references += references; + +/* Overflow */ +if (DEBUG_LOCKS_WARN_ON (hlock->references < references)) +return 0 ;return 1 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainercover 4.19.61-stable review
This is the start of the stable review cycle for the 4.19.61 release. There are 271 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 Fri 26 Jul 2019 07:13:35 PM 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.19.61-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.19.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.19.61-rc1
Junxiao Bi <[email protected]>
dm bufio: fix deadlock with loop device
Josua Mayer <[email protected]>
dt-bindings: allow up to four clocks for orion-mdio
Josua Mayer <[email protected]>
net: mvmdio: allow up to four clocks to be specified for orion-mdio
Tejun Heo <[email protected]>
blkcg: update blkcg_print_stat() to handle larger outputs
Tejun Heo <[email protected]>
blk-iolatency: clear use_delay when io.latency is set to zero
Konstantin Khlebnikov <[email protected]>
blk-throttle: fix zero wait time for iops throttled group
Lee, Chiasheng <[email protected]>
usb: Handle USB3 remote wakeup for LPM enabled devices correctly
Szymon Janc <[email protected]>
Bluetooth: Add SMP workaround Microsoft Surface Precision Mouse bug
Alexander Shishkin <[email protected]>
intel_th: msu: Fix single mode with disabled IOMMU
liaoweixiong <[email protected]>
mtd: spinand: read returns badly if the last page has bitflips
Xiaolei Li <[email protected]>
mtd: rawnand: mtk: Correct low level time calculation of r/w cycle
Dan Carpenter <[email protected]>
eCryptfs: fix a couple type promotion bugs
Jorge Ramirez-Ortiz <[email protected]>
mmc: sdhci-msm: fix mutex while in spinlock
Nathan Lynch <[email protected]>
powerpc/pseries: Fix oops in hotplug memory notifier
Greg Kurz <[email protected]>
powerpc/powernv/npu: Fix reference leak
Ravi Bangoria <[email protected]>
powerpc/watchpoint: Restore NV GPRs while returning from exception
Christophe Leroy <[email protected]>
powerpc/32s: fix suspend/resume when IBATs 4-7 are used
Helge Deller <[email protected]>
parisc: Fix kernel panic due invalid values in IAOQ0 or IAOQ1
Helge Deller <[email protected]>
parisc: Ensure userspace privilege for ptraced processes in regset functions
Ard Biesheuvel <[email protected]>
crypto: caam - limit output IV to CBC to work around CTR mode DMA issue
Steve Longerbeam <[email protected]>
gpu: ipu-v3: ipu-ic: Fix saturation bit offset in TPMEM
Darrick J. Wong <[email protected]>
xfs: abort unaligned nowait directio early
Brian Foster <[email protected]>
xfs: serialize unaligned dio writes against all other dio writes
Luis R. Rodriguez <[email protected]>
xfs: fix reporting supported extra file attributes for statx()
Darrick J. Wong <[email protected]>
xfs: reserve blocks for ifree transaction during log recovery
Darrick J. Wong <[email protected]>
xfs: don't ever put nlink > 0 inodes on the unlinked list
Darrick J. Wong <[email protected]>
xfs: rename m_inotbt_nores to m_finobt_nores
Darrick J. Wong <[email protected]>
xfs: don't overflow xattr listent buffer
Dave Chinner <[email protected]>
xfs: flush removing page cache in xfs_reflink_remap_prep
Darrick J. Wong <[email protected]>
xfs: fix pagecache truncation prior to reflink
Drew Davenport <[email protected]>
include/asm-generic/bug.h: fix "cut here" for WARN_ON for __WARN_TAINT architectures
Jan Harkes <[email protected]>
coda: pass the host file in vma->vm_file on mmap
Dan Williams <[email protected]>
libnvdimm/pfn: fix fsdax-mode namespace info-block zero-fields
Aaron Armstrong Skomra <[email protected]>
HID: wacom: correct touch resolution x/y typo
Aaron Armstrong Skomra <[email protected]>
HID: wacom: generic: Correct pad syncing
Aaron Armstrong Skomra <[email protected]>
HID: wacom: generic: only switch the mode on devices with LEDs
Danit Goldberg <[email protected]>
IB/mlx5: Report correctly tag matching rendezvous capability
Filipe Manana <[email protected]>
Btrfs: add missing inode version, ctime and mtime updates when punching hole
Filipe Manana <[email protected]>
Btrfs: fix fsync not persisting dentry deletions due to inode evictions
Filipe Manana <[email protected]>
Btrfs: fix data loss after inode eviction, renaming it, and fsync it
Niklas Cassel <[email protected]>
PCI: qcom: Ensure that PERST is asserted for at least 100 ms
Mika Westerberg <[email protected]>
PCI: Do not poll for PME if the device is in D3cold
Dexuan Cui <[email protected]>
PCI: hv: Fix a use-after-free bug in hv_eject_device_work()
Alexander Shishkin <[email protected]>
intel_th: pci: Add Ice Lake NNPI support
Andres Rodriguez <[email protected]>
drm/edid: parse CEA blocks embedded in DisplayID
Kim Phillips <[email protected]>
perf/x86/amd/uncore: Set the thread mask for F17h L3 PMCs
Kim Phillips <[email protected]>
perf/x86/amd/uncore: Do not set 'ThreadMask' and 'SliceMask' for non-L3 PMCs
Kan Liang <[email protected]>
perf/x86/intel: Fix spurious NMI on fixed counter
David Rientjes <[email protected]>
x86/boot: Fix memory leak in default_get_smp_config()
YueHaibing <[email protected]>
9p/virtio: Add cleanup path in p9_virtio_init
YueHaibing <[email protected]>
9p/xen: Add cleanup path in p9_trans_xen_init
Juergen Gross <[email protected]>
xen/events: fix binding user event channels to cpus
Damien Le Moal <[email protected]>
dm zoned: fix zone state management race
Daniel Jordan <[email protected]>
padata: use smp_mb in padata_reorder to avoid orphaned padata jobs
Lyude Paul <[email protected]>
drm/nouveau/i2c: Enable i2c pads & busses during preinit
Masahiro Yamada <[email protected]>
kconfig: fix missing choice values in auto.conf
Radoslaw Burny <[email protected]>
fs/proc/proc_sysctl.c: fix the default values of i_uid/i_gid on /proc/sys inodes.
Jon Hunter <[email protected]>
arm64: tegra: Fix AGIC register range
Like Xu <[email protected]>
KVM: x86/vPMU: refine kvm_pmu err msg when event creation failed
Sakari Ailus <[email protected]>
media: videobuf2-dma-sg: Prevent size from overflowing
Sakari Ailus <[email protected]>
media: videobuf2-core: Prevent size alignment wrapping buffer size to 0
Ezequiel Garcia <[email protected]>
media: coda: Remove unbalanced and unneeded mutex unlock
Boris Brezillon <[email protected]>
media: v4l2: Test type instead of cfg->type in v4l2_ctrl_new_custom()
Hui Wang <[email protected]>
ALSA: hda/realtek: apply ALC891 headset fixup to one Dell machine
Kailang Yang <[email protected]>
ALSA: hda/realtek - Fixed Headphone Mic can't record on Dell platform
Takashi Iwai <[email protected]>
ALSA: seq: Break too long mutex context in the write loop
Xiao Ni <[email protected]>
raid5-cache: Need to do start() part job after adding journal device
Mark Brown <[email protected]>
ASoC: dapm: Adapt for debugfs API change
Christophe Leroy <[email protected]>
lib/scatterlist: Fix mapping iterator when sg->offset is greater than PAGE_SIZE
Trond Myklebust <[email protected]>
pnfs: Fix a problem where we gratuitously start doing I/O through the MDS
Trond Myklebust <[email protected]>
pNFS: Fix a typo in pnfs_update_layout
Trond Myklebust <[email protected]>
pnfs/flexfiles: Fix PTR_ERR() dereferences in ff_layout_track_ds_error
Trond Myklebust <[email protected]>
NFSv4: Handle the special Linux file open access mode
Emmanuel Grumbach <[email protected]>
iwlwifi: fix RF-Kill interrupt while FW load for gen2 devices
Emmanuel Grumbach <[email protected]>
iwlwifi: don't WARN when calling iwl_get_shared_mem_conf with RF-Kill
Emmanuel Grumbach <[email protected]>
iwlwifi: pcie: fix ALIVE interrupt handling for gen2 devices w/o MSI-X
Emmanuel Grumbach <[email protected]>
iwlwifi: pcie: don't service an interrupt that was masked
Jon Hunter <[email protected]>
arm64: tegra: Update Jetson TX1 GPU regulator timings
Krzysztof Kozlowski <[email protected]>
regulator: s2mps11: Fix buck7 and buck8 wrong voltages
Hui Wang <[email protected]>
Input: alps - fix a mismatch between a condition check and its comment
Nick Black <[email protected]>
Input: synaptics - whitelist Lenovo T580 SMBus intertouch
Hui Wang <[email protected]>
Input: alps - don't handle ALPS cs19 trackpoint-only device
Grant Hernandez <[email protected]>
Input: gtco - bounds check collection indent level
Coly Li <[email protected]>
bcache: destroy dc->writeback_write_wq if failed to create dc->writeback_thread
Coly Li <[email protected]>
bcache: fix mistaken sysfs entry for io_error counter
Coly Li <[email protected]>
bcache: ignore read-ahead request failure on backing device
Coly Li <[email protected]>
bcache: Revert "bcache: free heap cache_set->flush_btree in bch_journal_free"
Coly Li <[email protected]>
bcache: Revert "bcache: fix high CPU occupancy during journal"
Coly Li <[email protected]>
Revert "bcache: set CACHE_SET_IO_DISABLE in bch_cached_dev_error()"
Wen Yang <[email protected]>
crypto: crypto4xx - fix a potential double free in ppc4xx_trng_probe
Cfir Cohen <[email protected]>
crypto: ccp/gcm - use const time tag comparison.
Hook, Gary <[email protected]>
crypto: ccp - memset structure fields to zero before reuse
Christian Lamparter <[email protected]>
crypto: crypto4xx - block ciphers should only accept complete blocks
Christian Lamparter <[email protected]>
crypto: crypto4xx - fix blocksize for cfb and ofb
Christian Lamparter <[email protected]>
crypto: crypto4xx - fix AES CTR blocksize value
Eric Biggers <[email protected]>
crypto: chacha20poly1305 - fix atomic sleep when using async algorithm
Elena Petrova <[email protected]>
crypto: arm64/sha2-ce - correct digest for empty data in finup
Elena Petrova <[email protected]>
crypto: arm64/sha1-ce - correct digest for empty data in finup
Hook, Gary <[email protected]>
crypto: ccp - Validate the the error value used to index error messages
Eric Biggers <[email protected]>
crypto: ghash - fix unaligned memory access in ghash_setkey()
Finn Thain <[email protected]>
scsi: mac_scsi: Fix pseudo DMA implementation, take 2
Finn Thain <[email protected]>
scsi: mac_scsi: Increase PIO/PDMA transfer length threshold
Shivasharan S <[email protected]>
scsi: megaraid_sas: Fix calculation of target ID
Ming Lei <[email protected]>
scsi: core: Fix race on creating sense cache
Finn Thain <[email protected]>
Revert "scsi: ncr5380: Increase register polling limit"
Finn Thain <[email protected]>
scsi: NCR5380: Always re-enable reselection interrupt
Finn Thain <[email protected]>
scsi: NCR5380: Reduce goto statements in NCR5380_select()
Juergen Gross <[email protected]>
xen: let alloc_xenballooned_pages() fail if not enough memory free
Denis Efremov <[email protected]>
floppy: fix out-of-bounds read in copy_buffer
Denis Efremov <[email protected]>
floppy: fix invalid pointer dereference in drive_name
Denis Efremov <[email protected]>
floppy: fix out-of-bounds read in next_valid_format
Denis Efremov <[email protected]>
floppy: fix div-by-zero in setup_format_params
Colin Ian King <[email protected]>
iavf: fix dereference of null rx_buffer pointer
Josua Mayer <[email protected]>
net: mvmdio: defer probe of orion-mdio if a clock is not ready
Taehee Yoo <[email protected]>
gtp: fix use-after-free in gtp_newlink()
Taehee Yoo <[email protected]>
gtp: fix use-after-free in gtp_encap_destroy()
Taehee Yoo <[email protected]>
gtp: fix Illegal context switch in RCU read-side critical section.
Taehee Yoo <[email protected]>
gtp: fix suspicious RCU usage
csonsino <[email protected]>
Bluetooth: validate BLE connection interval updates
Taehee Yoo <[email protected]>
gtp: add missing gtp_encap_disable_sock() in gtp_encap_enable()
Matias Karhumaa <[email protected]>
Bluetooth: Check state in l2cap_disconnect_rsp
Seeteena Thoufeek <[email protected]>
perf tests: Fix record+probe_libc_inet_pton.sh for powerpc64
Josua Mayer <[email protected]>
Bluetooth: 6lowpan: search for destination address in all peers
João Paulo Rechi Vita <[email protected]>
Bluetooth: Add new 13d3:3501 QCA_ROME device
João Paulo Rechi Vita <[email protected]>
Bluetooth: Add new 13d3:3491 QCA_ROME device
Tomas Bortoli <[email protected]>
Bluetooth: hci_bcsp: Fix memory leak in rx_skb
Jiri Olsa <[email protected]>
tools: bpftool: Fix json dump crash on powerpc
Geert Uytterhoeven <[email protected]>
gpiolib: Fix references to gpiod_[gs]et_*value_cansleep() variants
Cong Wang <[email protected]>
bonding: validate ip header before check IPPROTO_IGMP
Jiri Benc <[email protected]>
selftests: bpf: fix inlines in test_lwt_seg6local
Leo Yan <[email protected]>
bpf, libbpf, smatch: Fix potential NULL pointer dereference
David Howells <[email protected]>
rxrpc: Fix oops in tracepoint
Phong Tran <[email protected]>
net: usb: asix: init MAC address buffers
Guilherme G. Piccoli <[email protected]>
bnx2x: Prevent ptp_task to be rescheduled indefinitely
Andi Kleen <[email protected]>
perf stat: Fix group lookup for metric group
Andi Kleen <[email protected]>
perf stat: Make metric event lookup more robust
Baruch Siach <[email protected]>
bpf: fix uapi bpf_prog_info fields alignment
Andrei Otcheretianski <[email protected]>
iwlwifi: mvm: Drop large non sta frames
Vedang Patel <[email protected]>
igb: clear out skb->tstamp after reading the txtime
Maxime Chevallier <[email protected]>
net: mvpp2: prs: Don't override the sign bit in SRAM parser shift
Wen Gong <[email protected]>
ath10k: destroy sdio workqueue while remove sdio module
Yunsheng Lin <[email protected]>
net: hns3: add some error checking in hclge_tm module
Yonglong Liu <[email protected]>
net: hns3: fix a -Wformat-nonliteral compile warning
Coly Li <[email protected]>
bcache: fix potential deadlock in cached_def_free()
Coly Li <[email protected]>
bcache: check c->gc_thread by IS_ERR_OR_NULL in cache_set_flush()
Coly Li <[email protected]>
bcache: acquire bch_register_lock later in cached_dev_free()
Coly Li <[email protected]>
bcache: check CACHE_SET_IO_DISABLE bit in bch_journal()
Coly Li <[email protected]>
bcache: check CACHE_SET_IO_DISABLE in allocator code
Eiichi Tsukata <[email protected]>
EDAC: Fix global-out-of-bounds write when setting edac_mc_poll_msec
Ahmad Masri <[email protected]>
wil6210: drop old event after wmi_call timeout
Arnd Bergmann <[email protected]>
crypto: asymmetric_keys - select CRYPTO_HASH where needed
Arnd Bergmann <[email protected]>
crypto: serpent - mark __serpent_setkey_sbox noinline
Mauro S. M. Rodrigues <[email protected]>
ixgbe: Check DDM existence in transceiver before access
Ferdinand Blomqvist <[email protected]>
rslib: Fix handling of of caller provided syndrome
Ferdinand Blomqvist <[email protected]>
rslib: Fix decoding of shortened codes
Nathan Chancellor <[email protected]>
xsk: Properly terminate assignment in xskq_produce_flush_desc
Marek Szyprowski <[email protected]>
clocksource/drivers/exynos_mct: Increase priority over ARM arch timer
Tejun Heo <[email protected]>
libata: don't request sense data on !ZAC ATA devices
Amadeusz Sławiński <[email protected]>
ASoC: Intel: hdac_hdmi: Set ops to NULL on remove
Kyle Meyer <[email protected]>
perf tools: Increase MAX_NR_CPUS and MAX_CACHES
Miaoqing Pan <[email protected]>
ath10k: fix PCIE device wake up failed
Claire Chang <[email protected]>
ath10k: add missing error handling
Julian Anastasov <[email protected]>
ipvs: fix tinfo memory leak in start_sync_thread
Lorenzo Bianconi <[email protected]>
mt7601u: fix possible memory leak when the device is disconnected
Masahiro Yamada <[email protected]>
x86/build: Add 'set -e' to mkcapflags.sh to delete broken capflags.c
Lorenzo Bianconi <[email protected]>
mt7601u: do not schedule rx_tasklet when the device has been disconnected
Ping-Ke Shih <[email protected]>
rtlwifi: rtl8192cu: fix error handle when usb probe failed
Icenowy Zheng <[email protected]>
net: stmmac: sun8i: force select external PHY when no internal one
Hans Verkuil <[email protected]>
media: hdpvr: fix locking and a missing msleep
André Almeida <[email protected]>
media: vimc: cap: check v4l2_fill_pixfmt return value
Philipp Zabel <[email protected]>
media: coda: increment sequence offset for the last returned frame
Marco Felsch <[email protected]>
media: coda: fix last buffer handling in V4L2_ENC_CMD_STOP
Philipp Zabel <[email protected]>
media: coda: fix mpeg2 sequence number handling
Ard Biesheuvel <[email protected]>
acpi/arm64: ignore 5.1 FADTs that are reported as 5.0
Nathan Huckleberry <[email protected]>
timer_list: Guard procfs specific code
Miroslav Lichvar <[email protected]>
ntp: Limit TAI-UTC offset
Anders Roxell <[email protected]>
media: i2c: fix warning same module names
Marek Szyprowski <[email protected]>
media: s5p-mfc: Make additional clocks optional
Julian Anastasov <[email protected]>
ipvs: defer hook registration to avoid leaks
Arnd Bergmann <[email protected]>
ipsec: select crypto ciphers for xfrm_algo
Julien Thierry <[email protected]>
arm64: Do not enable IRQs for ct_user_exit
Heiner Litz <[email protected]>
lightnvm: pblk: fix freeing of merged pages
Chaitanya Kulkarni <[email protected]>
nvme-pci: set the errno on ctrl state change error
Minwoo Im <[email protected]>
nvme-pci: properly report state change failure in nvme_reset_work
Anton Eidelman <[email protected]>
nvme: fix possible io failures when removing multipathed ns
Pan Bian <[email protected]>
EDAC/sysfs: Fix memory leak when creating a csrow object
Rafael J. Wysocki <[email protected]>
ACPICA: Clear status of GPEs on first direct enable
Dennis Zhou <[email protected]>
blk-iolatency: only account submitted bios
Qian Cai <[email protected]>
x86/cacheinfo: Fix a -Wtype-limits warning
Denis Kirjanov <[email protected]>
ipoib: correcly show a VF hardware address
Jason Wang <[email protected]>
vhost_net: disable zerocopy by default
Arnaldo Carvalho de Melo <[email protected]>
perf evsel: Make perf_evsel__name() accept a NULL argument
Peter Zijlstra <[email protected]>
x86/atomic: Fix smp_mb__{before,after}_atomic()Kan Liang <[email protected]>
perf/x86/intel/uncore: Handle invalid event coding for free-running counter
Qian Cai <[email protected]>
sched/fair: Fix "runnable_avg_yN_inv" not used warnings
Gao Xiang <[email protected]>
sched/core: Add __sched tag for io_schedule()
Nicolas Dichtel <[email protected]>
xfrm: fix sa selector validation
Tejun Heo <[email protected]>
blkcg, writeback: dead memcgs shouldn't contribute to writeback ownership arbitration
Bob Liu <[email protected]>
block: null_blk: fix race condition for null_del_dev
Yunsheng Lin <[email protected]>
net: hns3: fix for skb leak when doing selftest
Michal Kalderon <[email protected]>
qed: iWARP - Fix tc for MPA ll2 connection
Aaron Lewis <[email protected]>
x86/cpufeatures: Add FDP_EXCPTN_ONLY and ZERO_FCS_FDS
Waiman Long <[email protected]>
rcu: Force inlining of rcu_read_lock()
Jerome Brunet <[email protected]>
ASoC: meson: axg-tdm: fix sample clock inversion
Rajneesh Bhardwaj <[email protected]>
x86/cpu: Add Ice Lake NNPI to Intel family
Ondrej Mosnacek <[email protected]>
selinux: fix empty write to keycreate file
Marek Szyprowski <[email protected]>
media: s5p-mfc: fix reading min scratch buffer size on MFC v6/v7
Valdis Kletnieks <[email protected]>
bpf: silence warning messages in core
Srinivas Kandagatla <[email protected]>
regmap: fix bulk writes on paged registers
Russell King <[email protected]>
gpio: omap: ensure irq is enabled before wakeup
Russell King <[email protected]>
gpio: omap: fix lack of irqstatus_raw0 for OMAP4
Eric Auger <[email protected]>
iommu: Fix a leak in iommu_insert_resv_region
Kieran Bingham <[email protected]>
media: fdp1: Support M3N and E3 platforms
Oliver Neukum <[email protected]>
media: uvcvideo: Fix access to uninitialized fields on probe error
Xingyu Chen <[email protected]>
irqchip/meson-gpio: Add support for Meson-G12A SoC
Thomas Richter <[email protected]>
perf report: Fix OOM error in TUI mode on s390
Thomas Richter <[email protected]>
perf test 6: Fix missing kvm module load for s390
Mathieu Poirier <[email protected]>
perf cs-etm: Properly set the value of 'old' and 'head' in snapshot mode
Stefano Brivio <[email protected]>
ipset: Fix memory accounting for hash types on resize
Robert Hancock <[email protected]>
net: sfp: add mutex to prevent concurrent state checks
Borislav Petkov <[email protected]>
RAS/CEC: Fix pfn insertion
Julian Wiedmann <[email protected]>
s390/qdio: handle PENDING state for QEBSM devices
Robert Hancock <[email protected]>
net: axienet: Fix race condition causing TX hang
Fabio Estevam <[email protected]>
net: fec: Do not use netdev messages too early
Antoine Tenart <[email protected]>
crypto: inside-secure - do not rely on the hardware last bit for result descriptors
Biao Huang <[email protected]>
net: stmmac: modify default value of tx-frames
Biao Huang <[email protected]>
net: stmmac: dwmac4: fix flow control issue
Jiri Olsa <[email protected]>
perf jvmti: Address gcc string overflow warning for strncpy()
Miles Chen <[email protected]>
arm64: mm: make CONFIG_ZONE_DMA32 configurable
Abhishek Goel <[email protected]>
cpupower : frequency-set -r option misses the last cpu in related cpu list
Weihang Li <[email protected]>
net: hns3: set ops to null when unregister ad_dev
Kefeng Wang <[email protected]>
media: wl128x: Fix some error handling in fm_v4l2_init_video_device()
Imre Deak <[email protected]>
locking/lockdep: Fix merging of hlocks with non-zero references
Sven Eckelmann <[email protected]>
batman-adv: Fix duplicated OGMs on NETDEV_UP
David S. Miller <[email protected]>
tua6100: Avoid build warnings.
Christophe Leroy <[email protected]>
crypto: talitos - Align SEC1 accesses to 32 bits boundaries.
Christophe Leroy <[email protected]>
crypto: talitos - properly handle split ICV.
Ioana Ciornei <[email protected]>
net: phy: Check against net_device being NULL
Shailendra Verma <[email protected]>
media: staging: media: davinci_vpfe: - Fix for memory leak if decoder initialization fails.
Kefeng Wang <[email protected]>
media: saa7164: fix remove_proc_entry warning
Hans Verkuil <[email protected]>
media: mc-device.c: don't memset __user pointer contents
Arnaldo Carvalho de Melo <[email protected]>
perf annotate TUI browser: Do not use member from variable within its own initialization
Eric Biggers <[email protected]>
fscrypt: clean up some BUG_ON()s in block encryption/decryption
Anirudh Gupta <[email protected]>
xfrm: Fix xfrm sel prefix length validation
Jeremy Sowden <[email protected]>
af_key: fix leaks in key_pol_get_resp and dump_sp.
Eric W. Biederman <[email protected]>
signal/cifs: Fix cifs_put_tcp_session to call send_sig instead of force_sig
Eric W. Biederman <[email protected]>
signal/pid_namespace: Fix reboot_pid_ns to use send_sig not force_sig
Michal Kalderon <[email protected]>
qed: Set the doorbell address correctly
Jose Abreu <[email protected]>
net: stmmac: dwmac4/5: Clear unused address entries
Jose Abreu <[email protected]>
net: stmmac: dwmac1000: Clear unused address entries
Jungo Lin <[email protected]>
media: media_device_enum_links32: clean a reserved field
Kangjie Lu <[email protected]>
media: vpss: fix a potential NULL pointer dereference
Lubomir Rintel <[email protected]>
media: marvell-ccic: fix DMA s/g desc number calculation
Akinobu Mita <[email protected]>
media: ov7740: avoid invalid framesize setting
Christophe Leroy <[email protected]>
crypto: talitos - fix skcipher failure due to wrong output IV
Daniel Gomez <[email protected]>
media: spi: IR LED: add missing of table registration
Oliver Neukum <[email protected]>
media: dvb: usb: fix use after free in dvb_usb_device_exit
Jeremy Sowden <[email protected]>
batman-adv: fix for leaked TVLV handler.
Daniel Baluta <[email protected]>
regmap: debugfs: Fix memory leak in regmap_debugfs_init
Anilkumar Kolli <[email protected]>
ath: DFS JP domain W56 fixed pulse type 3 RADAR detection
Maya Erez <[email protected]>
wil6210: fix spurious interrupts in 3-msi
Wen Gong <[email protected]>
ath10k: add peer id check in ath10k_peer_find_by_id
Dan Carpenter <[email protected]>
ath6kl: add some bounds checking
Tim Schumacher <[email protected]>
ath9k: Check for errors when reading SREV register
Surabhi Vishnoi <[email protected]>
ath10k: Do not send probe response template for mesh
Gustavo A. R. Silva <[email protected]>
wil6210: fix potential out-of-bounds read
Sven Van Asbroeck <[email protected]>
dmaengine: imx-sdma: fix use-after-free on probe error path
Maurizio Lombardi <[email protected]>
scsi: iscsi: set auth_protocol back to NULL if CHAP_A value is not supported
Nathan Chancellor <[email protected]>
arm64/efi: Mark __efistub_stext_offset as an absolute symbol explicitly
Kevin Darbyshire-Bryant <[email protected]>
MIPS: fix build on non-linux hosts
Stefan Hellermann <[email protected]>
MIPS: ath79: fix ar933x uart parity mode
-------------
Diffstat:
Documentation/atomic_t.txt | 3 +
.../devicetree/bindings/net/marvell-orion-mdio.txt | 2 +-
Documentation/scheduler/sched-pelt.c | 3 +-
Makefile | 4 +-
arch/arm64/Kconfig | 3 +-
arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 3 +-
arch/arm64/boot/dts/nvidia/tegra210.dtsi | 2 +-
arch/arm64/crypto/sha1-ce-glue.c | 2 +-
arch/arm64/crypto/sha2-ce-glue.c | 2 +-
arch/arm64/kernel/acpi.c | 10 +-
arch/arm64/kernel/entry.S | 4 +-
arch/arm64/kernel/image.h | 6 +-
arch/arm64/mm/init.c | 5 +-
arch/mips/boot/compressed/Makefile | 2 +
arch/mips/boot/compressed/calc_vmlinuz_load_addr.c | 2 +-
arch/mips/include/asm/mach-ath79/ar933x_uart.h | 4 +-
arch/parisc/kernel/ptrace.c | 31 +-
arch/powerpc/kernel/exceptions-64s.S | 9 +-
arch/powerpc/kernel/swsusp_32.S | 73 +++-
arch/powerpc/platforms/powermac/sleep.S | 68 +++-
arch/powerpc/platforms/powernv/npu-dma.c | 15 +-
arch/powerpc/platforms/pseries/hotplug-memory.c | 3 +
arch/x86/events/amd/uncore.c | 15 +-
arch/x86/events/intel/core.c | 8 +-
arch/x86/events/intel/uncore.h | 10 +
arch/x86/events/intel/uncore_snbep.c | 1 +
arch/x86/include/asm/atomic.h | 8 +-
arch/x86/include/asm/atomic64_64.h | 8 +-
arch/x86/include/asm/barrier.h | 4 +-
arch/x86/include/asm/cpufeatures.h | 2 +
arch/x86/include/asm/intel-family.h | 1 +
arch/x86/kernel/cpu/cacheinfo.c | 3 +-
arch/x86/kernel/cpu/mkcapflags.sh | 2 +
arch/x86/kernel/mpparse.c | 10 +-
arch/x86/kvm/pmu.c | 4 +-
block/blk-cgroup.c | 8 +-
block/blk-iolatency.c | 8 +-
block/blk-throttle.c | 9 +-
crypto/asymmetric_keys/Kconfig | 3 +
crypto/chacha20poly1305.c | 30 +-
crypto/ghash-generic.c | 8 +-
crypto/serpent_generic.c | 8 +-
drivers/acpi/acpica/acevents.h | 3 +-
drivers/acpi/acpica/evgpe.c | 8 +-
drivers/acpi/acpica/evgpeblk.c | 2 +-
drivers/acpi/acpica/evxface.c | 2 +-
drivers/acpi/acpica/evxfgpe.c | 2 +-
drivers/ata/libata-eh.c | 8 +-
drivers/base/regmap/regmap-debugfs.c | 2 +
drivers/base/regmap/regmap.c | 2 +
drivers/block/floppy.c | 34 +-
drivers/block/null_blk_main.c | 11 +-
drivers/bluetooth/btusb.c | 2 +
drivers/bluetooth/hci_bcsp.c | 5 +
drivers/clocksource/exynos_mct.c | 4 +-
drivers/crypto/amcc/crypto4xx_alg.c | 36 +-
drivers/crypto/amcc/crypto4xx_core.c | 24 +-
drivers/crypto/amcc/crypto4xx_core.h | 10 +-
drivers/crypto/amcc/crypto4xx_trng.c | 1 -
drivers/crypto/caam/caamalg.c | 15 +-
drivers/crypto/ccp/ccp-dev.c | 96 +++---
drivers/crypto/ccp/ccp-dev.h | 2 +-
drivers/crypto/ccp/ccp-ops.c | 15 +-
drivers/crypto/inside-secure/safexcel_cipher.c | 24 +-
drivers/crypto/talitos.c | 35 +-
drivers/dma/imx-sdma.c | 48 +--
drivers/edac/edac_mc_sysfs.c | 24 +-
drivers/edac/edac_module.h | 2 +-
drivers/gpio/gpio-omap.c | 17 +-
drivers/gpio/gpiolib.c | 7 +-
drivers/gpu/drm/drm_edid.c | 81 ++++-
drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c | 20 ++
drivers/gpu/ipu-v3/ipu-ic.c | 2 +-
drivers/hid/wacom_sys.c | 3 +
drivers/hid/wacom_wac.c | 19 +-
drivers/hid/wacom_wac.h | 1 +
drivers/hwtracing/intel_th/msu.c | 2 +-
drivers/hwtracing/intel_th/pci.c | 5 +
drivers/infiniband/hw/mlx5/main.c | 8 +-
drivers/infiniband/ulp/ipoib/ipoib_main.c | 1 +
drivers/input/mouse/alps.c | 32 ++
drivers/input/mouse/synaptics.c | 1 +
drivers/input/tablet/gtco.c | 20 +-
drivers/iommu/iommu.c | 8 +-
drivers/irqchip/irq-meson-gpio.c | 1 +
drivers/lightnvm/pblk-core.c | 18 +-
drivers/md/bcache/alloc.c | 9 +
drivers/md/bcache/bcache.h | 2 -
drivers/md/bcache/io.c | 12 +
drivers/md/bcache/journal.c | 52 ++-
drivers/md/bcache/super.c | 25 +-
drivers/md/bcache/sysfs.c | 4 +-
drivers/md/bcache/util.h | 2 -
drivers/md/bcache/writeback.c | 5 +
drivers/md/dm-bufio.c | 4 +-
drivers/md/dm-zoned-metadata.c | 24 --
drivers/md/dm-zoned.h | 28 +-
drivers/md/raid5.c | 11 +-
drivers/media/common/videobuf2/videobuf2-core.c | 4 +
drivers/media/common/videobuf2/videobuf2-dma-sg.c | 2 +-
drivers/media/dvb-frontends/tua6100.c | 22 +-
drivers/media/i2c/Makefile | 2 +-
drivers/media/i2c/{adv7511.c => adv7511-v4l2.c} | 5 +
drivers/media/i2c/ov7740.c | 6 +-
drivers/media/media-device.c | 10 +-
drivers/media/pci/saa7164/saa7164-core.c | 33 +-
drivers/media/platform/coda/coda-bit.c | 9 +-
drivers/media/platform/coda/coda-common.c | 2 +
drivers/media/platform/davinci/vpss.c | 5 +
drivers/media/platform/marvell-ccic/mcam-core.c | 5 +-
drivers/media/platform/rcar_fdp1.c | 8 +
drivers/media/platform/s5p-mfc/s5p_mfc.c | 3 +-
drivers/media/platform/s5p-mfc/s5p_mfc_pm.c | 5 +
drivers/media/platform/vimc/vimc-capture.c | 5 +-
drivers/media/radio/wl128x/fmdrv_v4l2.c | 3 +
drivers/media/rc/ir-spi.c | 1 +
drivers/media/usb/dvb-usb/dvb-usb-init.c | 7 +-
drivers/media/usb/hdpvr/hdpvr-video.c | 17 +-
drivers/media/usb/uvc/uvc_ctrl.c | 4 +-
drivers/media/v4l2-core/v4l2-ctrls.c | 9 +-
drivers/mmc/host/sdhci-msm.c | 9 +-
drivers/mtd/nand/raw/mtk_nand.c | 24 +-
drivers/mtd/nand/spi/core.c | 2 +-
drivers/net/bonding/bond_main.c | 37 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 5 +-
.../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 4 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 33 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h | 3 +
drivers/net/ethernet/freescale/fec_main.c | 6 +-
drivers/net/ethernet/hisilicon/hns3/hnae3.c | 2 +
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 6 +-
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 3 +-
.../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 6 +-
drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 6 +-
drivers/net/ethernet/intel/igb/igb_main.c | 1 +
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 3 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 1 +
drivers/net/ethernet/marvell/mvmdio.c | 7 +-
drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c | 3 +-
drivers/net/ethernet/qlogic/qed/qed_dev.c | 29 +-
drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 2 +
drivers/net/ethernet/qlogic/qed/qed_rdma.c | 2 +-
drivers/net/ethernet/stmicro/stmmac/common.h | 2 +-
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 5 +
.../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 6 +
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 18 +-
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 20 +-
drivers/net/gtp.c | 36 +-
drivers/net/phy/phy_device.c | 6 +
drivers/net/phy/sfp.c | 6 +-
drivers/net/usb/asix_devices.c | 6 +-
drivers/net/wireless/ath/ath10k/hw.c | 2 +-
drivers/net/wireless/ath/ath10k/mac.c | 4 +
drivers/net/wireless/ath/ath10k/sdio.c | 7 +
drivers/net/wireless/ath/ath10k/txrx.c | 3 +
drivers/net/wireless/ath/ath6kl/wmi.c | 10 +-
drivers/net/wireless/ath/ath9k/hw.c | 32 +-
drivers/net/wireless/ath/dfs_pattern_detector.c | 2 +-
drivers/net/wireless/ath/wil6210/interrupt.c | 65 ++--
drivers/net/wireless/ath/wil6210/txrx.c | 1 +
drivers/net/wireless/ath/wil6210/wmi.c | 13 +-
drivers/net/wireless/intel/iwlwifi/fw/smem.c | 12 +-
drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 3 +
.../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 2 +-
.../net/wireless/intel/iwlwifi/pcie/ctxt-info.c | 2 +-
drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 27 ++
drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 66 ++--
.../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 9 +
drivers/net/wireless/mediatek/mt7601u/dma.c | 54 +--
drivers/net/wireless/mediatek/mt7601u/tx.c | 4 +-
drivers/net/wireless/realtek/rtlwifi/usb.c | 5 +-
drivers/nvdimm/dax_devs.c | 2 +-
drivers/nvdimm/pfn.h | 1 +
drivers/nvdimm/pfn_devs.c | 18 +-
drivers/nvme/host/core.c | 14 +-
drivers/nvme/host/pci.c | 8 +-
drivers/pci/controller/dwc/pcie-qcom.c | 2 +
drivers/pci/controller/pci-hyperv.c | 15 +-
drivers/pci/pci.c | 7 +
drivers/ras/cec.c | 4 +-
drivers/regulator/s2mps11.c | 4 +-
drivers/s390/cio/qdio_main.c | 1 +
drivers/scsi/NCR5380.c | 33 +-
drivers/scsi/NCR5380.h | 2 +-
drivers/scsi/mac_scsi.c | 375 ++++++++++++---------
drivers/scsi/megaraid/megaraid_sas_base.c | 3 +-
drivers/scsi/scsi_lib.c | 6 +-
drivers/staging/media/davinci_vpfe/vpfe_video.c | 3 +
drivers/target/iscsi/iscsi_target_auth.c | 16 +-
drivers/usb/core/hub.c | 7 +-
drivers/vhost/net.c | 2 +-
drivers/xen/balloon.c | 16 +-
drivers/xen/events/events_base.c | 12 +-
drivers/xen/evtchn.c | 2 +-
fs/btrfs/file.c | 5 +
fs/btrfs/tree-log.c | 40 ++-
fs/cifs/connect.c | 2 +-
fs/coda/file.c | 70 +++-
fs/crypto/crypto.c | 15 +-
fs/ecryptfs/crypto.c | 12 +-
fs/fs-writeback.c | 8 +-
fs/nfs/flexfilelayout/flexfilelayoutdev.c | 2 +-
fs/nfs/inode.c | 1 +
fs/nfs/nfs4file.c | 2 +-
fs/nfs/pnfs.c | 4 +-
fs/proc/proc_sysctl.c | 4 +
fs/xfs/libxfs/xfs_ag_resv.c | 2 +-
fs/xfs/libxfs/xfs_ialloc_btree.c | 4 +-
fs/xfs/xfs_attr_list.c | 1 +
fs/xfs/xfs_bmap_util.c | 2 +-
fs/xfs/xfs_bmap_util.h | 2 +
fs/xfs/xfs_file.c | 27 +-
fs/xfs/xfs_fsops.c | 1 +
fs/xfs/xfs_inode.c | 18 +-
fs/xfs/xfs_iops.c | 21 +-
fs/xfs/xfs_mount.h | 2 +-
fs/xfs/xfs_reflink.c | 16 +-
fs/xfs/xfs_super.c | 7 +
fs/xfs/xfs_xattr.c | 3 +
include/asm-generic/bug.h | 6 +-
include/drm/drm_displayid.h | 10 +
include/linux/cpuhotplug.h | 2 +-
include/linux/rcupdate.h | 2 +-
include/net/ip_vs.h | 6 +-
include/rdma/ib_verbs.h | 4 +-
include/trace/events/rxrpc.h | 2 +-
include/uapi/linux/bpf.h | 1 +
include/xen/events.h | 3 +-
kernel/bpf/Makefile | 1 +
kernel/locking/lockdep.c | 18 +-
kernel/padata.c | 12 +
kernel/pid_namespace.c | 2 +-
kernel/sched/core.c | 2 +-
kernel/sched/sched-pelt.h | 2 +-
kernel/time/ntp.c | 4 +-
kernel/time/timer_list.c | 36 +-
lib/reed_solomon/decode_rs.c | 18 +-
lib/scatterlist.c | 9 +-
net/9p/trans_virtio.c | 8 +-
net/9p/trans_xen.c | 8 +-
net/batman-adv/bat_iv_ogm.c | 4 +-
net/batman-adv/hard-interface.c | 3 +
net/batman-adv/translation-table.c | 2 +
net/batman-adv/types.h | 3 +
net/bluetooth/6lowpan.c | 14 +-
net/bluetooth/hci_event.c | 5 +
net/bluetooth/l2cap_core.c | 15 +-
net/bluetooth/smp.c | 13 +
net/key/af_key.c | 8 +-
net/netfilter/ipset/ip_set_hash_gen.h | 2 +-
net/netfilter/ipvs/ip_vs_core.c | 21 +-
net/netfilter/ipvs/ip_vs_ctl.c | 4 -
net/netfilter/ipvs/ip_vs_sync.c | 134 ++++----
net/xdp/xsk_queue.h | 2 +-
net/xfrm/Kconfig | 2 +
net/xfrm/xfrm_user.c | 19 ++
scripts/kconfig/confdata.c | 7 +-
scripts/kconfig/expr.h | 1 +
security/selinux/hooks.c | 11 +-
sound/core/seq/seq_clientmgr.c | 11 +-
sound/pci/hda/patch_realtek.c | 10 +-
sound/soc/codecs/hdac_hdmi.c | 6 +
sound/soc/meson/axg-tdm.h | 2 +-
sound/soc/soc-dapm.c | 18 +-
tools/bpf/bpftool/jit_disasm.c | 11 +-
tools/include/uapi/linux/bpf.h | 1 +
tools/lib/bpf/libbpf.c | 8 +-
tools/perf/arch/arm/util/cs-etm.c | 127 ++++++-
tools/perf/jvmti/libjvmti.c | 4 +-
tools/perf/perf.h | 2 +-
tools/perf/tests/parse-events.c | 27 ++
.../tests/shell/record+probe_libc_inet_pton.sh | 2 +-
tools/perf/ui/browsers/annotate.c | 5 +-
tools/perf/util/annotate.c | 5 +-
tools/perf/util/evsel.c | 8 +-
tools/perf/util/header.c | 2 +-
tools/perf/util/metricgroup.c | 47 ++-
tools/perf/util/stat-shadow.c | 5 +-
tools/power/cpupower/utils/cpufreq-set.c | 2 +
tools/testing/selftests/bpf/test_lwt_seg6local.c | 12 +-
280 files changed, 2533 insertions(+), 1068 deletions(-)Greg Kroah-Hartman
maintainerPATCH 6/271 wil6210: fix potential out-of-bounds read
[ Upstream commit bfabdd6997323adbedccb13a3fed1967fb8cf8f5 ]
Notice that *rc* can evaluate to up to 5, include/linux/netdevice.h:
enum gro_result {
GRO_MERGED,
GRO_MERGED_FREE,
GRO_HELD,
GRO_NORMAL,
GRO_DROP,
GRO_CONSUMED,
};
typedef enum gro_result gro_result_t;
In case *rc* evaluates to 5, we end up having an out-of-bounds read at drivers/net/wireless/ath/wil6210/txrx.c:821:
wil_dbg_txrx(wil, "Rx complete %d bytes => %s\n", len, gro_res_str[rc]);
Fix this by adding element "GRO_CONSUMED" to array gro_res_str.
Addresses-Coverity-ID: 1444666 ("Out-of-bounds read")
--- drivers/net/wireless/ath/wil6210/txrx.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/ath/wil6210/txrx.c +1 -0
@@ -736,6 +736,7 @@ void wil_netif_rx_any(struct sk_buff *skb, struct net_device *ndev) [GRO_HELD] = "GRO_HELD", [GRO_NORMAL] = "GRO_NORMAL", [GRO_DROP] = "GRO_DROP", + [GRO_CONSUMED ] ="GRO_CONSUMED" , }; wil->txrx_ops.get_netif_rx_params (skb, &cid, &security);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 35/271 crypto: talitos - properly handle split ICV.
In reply to Greg Kroah-Hartman[ Upstream commit eae55a586c3c8b50982bad3c3426e9c9dd7a0075 ]
The driver assumes that the ICV is as a single piece in the last element of the scatterlist. This assumption is wrong.
This patch ensures that the ICV is properly handled regardless of the scatterlist layout.
--- drivers/crypto/talitos.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-)
drivers/crypto/talitos.c +15 -11
@@ -1001,7 +1001,6 @@ static void ipsec_esp_encrypt_done(struct device *dev,unsigned int authsize =crypto_aead_authsize (authenc);unsigned int ivsize =crypto_aead_ivsize (authenc);struct talitos_edesc *edesc; -struct scatterlist *sg;void *icvdata; edesc = container_of(desc, struct talitos_edesc, desc);
@@ -1015,9 +1014,8 @@ static void ipsec_esp_encrypt_done(struct device *dev,else icvdata = &edesc->link_tbl[edesc->src_nents + edesc->dst_nents +2 ]; - sg =sg_last (areq->dst, edesc->dst_nents); -memcpy ((char *)sg_virt (sg) + sg->length - authsize, - icvdata, authsize); +sg_pcopy_from_buffer (areq->dst, edesc->dst_nents ? :1 , icvdata, + authsize, areq->assoclen + areq->cryptlen); }dma_unmap_single (dev, edesc->iv_dma, ivsize,DMA_TO_DEVICE );
@@ -1035,7 +1033,6 @@ static void ipsec_esp_decrypt_swauth_done(struct device *dev,struct crypto_aead *authenc =crypto_aead_reqtfm (req);unsigned int authsize =crypto_aead_authsize (authenc);struct talitos_edesc *edesc; -struct scatterlist *sg;char *oicv, *icv;struct talitos_private *priv =dev_get_drvdata (dev);bool is_sec1 =has_ftr_sec1 (priv);
@@ -1045,9 +1042,18 @@ static void ipsec_esp_decrypt_swauth_done(struct device *dev,ipsec_esp_unmap (dev, edesc, req);if (!err) { +char icvdata[SHA512_DIGEST_SIZE ]; +int nents = edesc->dst_nents ? :1 ; +unsigned int len = req->assoclen + req->cryptlen; +/* auth check */ - sg =sg_last (req->dst, edesc->dst_nents ? :1 ); - icv = (char *)sg_virt (sg) + sg->length - authsize; +if (nents >1 ) { +sg_pcopy_to_buffer (req->dst, nents, icvdata, authsize, + len - authsize); + icv = icvdata; + }else { + icv = (char *)sg_virt (req->dst) + len - authsize; + }if (edesc->dma_len) {if (is_sec1)
@@ -1463,7 +1469,6 @@ static int aead_decrypt(struct aead_request *req)struct talitos_ctx *ctx =crypto_aead_ctx (authenc);struct talitos_private *priv =dev_get_drvdata (ctx->dev);struct talitos_edesc *edesc; -struct scatterlist *sg;void *icvdata; req->cryptlen -= authsize;
@@ -1497,9 +1502,8 @@ static int aead_decrypt(struct aead_request *req)else icvdata = &edesc->link_tbl[0 ]; - sg =sg_last (req->src, edesc->src_nents ? :1 ); - -memcpy (icvdata, (char *)sg_virt (sg) + sg->length - authsize, authsize); +sg_pcopy_to_buffer (req->src, edesc->src_nents ? :1 , icvdata, authsize, + req->assoclen + req->cryptlen - authsize);return ipsec_esp (edesc, req, ipsec_esp_decrypt_swauth_done); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 34/271 net: phy: Check against net_device being NULL
In reply to Greg Kroah-Hartman[ Upstream commit 82c76aca81187b3d28a6fb3062f6916450ce955e ]
In general, we don't want MAC drivers calling phy_attach_direct with the net_device being NULL. Add checks against this in all the functions calling it: phy_attach() and phy_connect_direct().
--- drivers/net/phy/phy_device.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/phy/phy_device.c +6 -0
@@ -757,6 +757,9 @@ int phy_connect_direct(struct net_device *dev, struct phy_device *phydev, {int rc; +if (!dev) +return -EINVAL ; + rc =phy_attach_direct (dev, phydev, phydev->dev_flags, interface);if (rc)return rc;
@@ -1098,6 +1101,9 @@ struct phy_device *phy_attach(struct net_device *dev, const char *bus_id,struct device *d;int rc; +if (!dev) +return ERR_PTR (-EINVAL ); +/* Search the list of PHY devices on the mdio bus for the * PHY with the requested name */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 29/271 fscrypt: clean up some BUG_ON()s in block encryption/decryption
In reply to Greg Kroah-Hartman[ Upstream commit eeacfdc68a104967162dfcba60f53f6f5b62a334 ]
Replace some BUG_ON()s with WARN_ON_ONCE() and returning an error code, and move the check for len divisible by FS_CRYPTO_BLOCK_SIZE into fscrypt_crypt_block() so that it's done for both encryption and decryption, not just encryption.
--- fs/crypto/crypto.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
fs/crypto/crypto.c +9 -6
@@ -149,7 +149,10 @@ int fscrypt_do_page_crypto(const struct inode *inode, fscrypt_direction_t rw,struct crypto_skcipher *tfm = ci->ci_ctfm;int res =0 ; -BUG_ON (len ==0 ); +if (WARN_ON_ONCE (len <=0 )) +return -EINVAL ; +if (WARN_ON_ONCE (len %FS_CRYPTO_BLOCK_SIZE !=0 )) +return -EINVAL ;BUILD_BUG_ON (sizeof (iv) !=FS_IV_SIZE );BUILD_BUG_ON (AES_BLOCK_SIZE !=FS_IV_SIZE );
@@ -241,8 +244,6 @@ struct page *fscrypt_encrypt_page(const struct inode *inode,struct page *ciphertext_page = page;int err; -BUG_ON (len %FS_CRYPTO_BLOCK_SIZE !=0 ); -if (inode->i_sb->s_cop->flags &FS_CFLG_OWN_PAGES ) {/* with inplace-encryption we just encrypt the page */ err = fscrypt_do_page_crypto(inode, FS_ENCRYPT, lblk_num, page,
@@ -254,7 +255,8 @@ struct page *fscrypt_encrypt_page(const struct inode *inode,return ciphertext_page; } -BUG_ON (!PageLocked (page)); +if (WARN_ON_ONCE (!PageLocked (page))) +return ERR_PTR (-EINVAL ); ctx =fscrypt_get_ctx (inode, gfp_flags);if (IS_ERR (ctx))
@@ -302,8 +304,9 @@ EXPORT_SYMBOL(fscrypt_encrypt_page);int fscrypt_decrypt_page (const struct inode *inode,struct page *page,unsigned int len,unsigned int offs,u64 lblk_num) { -if (!(inode->i_sb->s_cop->flags &FS_CFLG_OWN_PAGES )) -BUG_ON (!PageLocked (page)); +if (WARN_ON_ONCE (!PageLocked (page) && + !(inode->i_sb->s_cop->flags &FS_CFLG_OWN_PAGES ))) +return -EINVAL ;return fscrypt_do_page_crypto (inode,FS_DECRYPT , lblk_num, page, page, len, offs,GFP_NOFS );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 24/271 qed: Set the doorbell address correctly
In reply to Greg Kroah-Hartman[ Upstream commit 8366d520019f366fabd6c7a13032bdcd837e18d4 ]
In 100g mode the doorbell bar is united for both engines. Set the correct offset in the hwfn so that the doorbell returned for RoCE is in the affined hwfn.
--- drivers/net/ethernet/qlogic/qed/qed_dev.c | 29 ++++++++++++++-------- drivers/net/ethernet/qlogic/qed/qed_rdma.c | 2 +- 2 files changed, 19 insertions(+), 12 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_dev.c +18 -11
@@ -3096,6 +3096,7 @@ static void qed_nvm_info_free(struct qed_hwfn *p_hwfn)static int qed_hw_prepare_single (struct qed_hwfn *p_hwfn,void __iomem *p_regview,void __iomem *p_doorbells, +u64 db_phys_addr,enum qed_pci_personality personality) {int rc =0 ;
@@ -3103,6 +3104,7 @@ static int qed_hw_prepare_single(struct qed_hwfn *p_hwfn,/* Split PCI bars evenly between hwfns */ p_hwfn->regview = p_regview; p_hwfn->doorbells = p_doorbells; + p_hwfn->db_phys_addr = db_phys_addr;if (IS_VF (p_hwfn->cdev))return qed_vf_hw_prepare (p_hwfn);
@@ -3198,7 +3200,9 @@ int qed_hw_prepare(struct qed_dev *cdev,/* Initialize the first hwfn - will learn number of hwfns */ rc =qed_hw_prepare_single (p_hwfn, cdev->regview, - cdev->doorbells, personality); + cdev->doorbells, + cdev->db_phys_addr, + personality);if (rc)return rc;
@@ -3207,22 +3211,25 @@ int qed_hw_prepare(struct qed_dev *cdev,/* Initialize the rest of the hwfns */ if (cdev->num_hwfns >1 ) {void __iomem *p_regview, *p_doorbell; -u8 __iomem *addr; +u64 db_phys_addr; +u32 offset;/* adjust bar offset for second engine */ - addr = cdev->regview + -qed_hw_bar_size (p_hwfn, p_hwfn->p_main_ptt, -BAR_ID_0 ) /2 ; - p_regview = addr; + offset =qed_hw_bar_size (p_hwfn, p_hwfn->p_main_ptt, +BAR_ID_0 ) /2 ; + p_regview = cdev->regview + offset; - addr = cdev->doorbells + -qed_hw_bar_size (p_hwfn, p_hwfn->p_main_ptt, -BAR_ID_1 ) /2 ; - p_doorbell = addr; + offset =qed_hw_bar_size (p_hwfn, p_hwfn->p_main_ptt, +BAR_ID_1 ) /2 ; + + p_doorbell = cdev->doorbells + offset; + + db_phys_addr = cdev->db_phys_addr + offset;/* prepare second hw function */ rc =qed_hw_prepare_single (&cdev->hwfns[1 ], p_regview, - p_doorbell, personality); + p_doorbell, db_phys_addr, + personality);/* in case of error, need to free the previously * initiliazed hwfn 0.
drivers/net/ethernet/qlogic/qed/qed_rdma.c +1 -1
@@ -803,7 +803,7 @@ static int qed_rdma_add_user(void *rdma_cxt, dpi_start_offset + ((out_params->dpi) * p_hwfn->dpi_size)); - out_params->dpi_phys_addr = p_hwfn->cdev->db_phys_addr + + out_params->dpi_phys_addr = p_hwfn->db_phys_addr + dpi_start_offset + ((out_params->dpi) * p_hwfn->dpi_size);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 14/271 batman-adv: fix for leaked TVLV handler.
In reply to Greg Kroah-Hartman[ Upstream commit 17f78dd1bd624a4dd78ed5db3284a63ee807fcc3 ]
A handler for BATADV_TVLV_ROAM was being registered when the translation-table was initialized, but not unregistered when the translation-table was freed. Unregister it.
--- net/batman-adv/translation-table.c | 2 ++ 1 file changed, 2 insertions(+)
net/batman-adv/translation-table.c +2 -0
@@ -3821,6 +3821,8 @@ static void batadv_tt_purge(struct work_struct *work)*/ void batadv_tt_free (struct batadv_priv *bat_priv) { +batadv_tvlv_handler_unregister (bat_priv,BATADV_TVLV_ROAM ,1 ); +batadv_tvlv_container_unregister (bat_priv,BATADV_TVLV_TT ,1 );batadv_tvlv_handler_unregister (bat_priv,BATADV_TVLV_TT ,1 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 15/271 media: dvb: usb: fix use after free in dvb_usb_device_exit
In reply to Greg Kroah-Hartman[ Upstream commit 6cf97230cd5f36b7665099083272595c55d72be7 ]
dvb_usb_device_exit() frees and uses the device name in that order. Fix by storing the name in a buffer before freeing it.
--- drivers/media/usb/dvb-usb/dvb-usb-init.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/media/usb/dvb-usb/dvb-usb-init.c +5 -2
@@ -287,12 +287,15 @@ EXPORT_SYMBOL(dvb_usb_device_init);void dvb_usb_device_exit (struct usb_interface *intf) {struct dvb_usb_device *d =usb_get_intfdata (intf); -const char *name ="generic DVB-USB module" ; +const char *default_name ="generic DVB-USB module" ; +char name[40 ];usb_set_intfdata (intf,NULL );if (d !=NULL && d->desc !=NULL ) { - name = d->desc->name; +strscpy (name, d->desc->name,sizeof (name));dvb_usb_exit (d); + }else { +strscpy (name, default_name,sizeof (name)); }info ("%s successfully deinitialized and disconnected." , name);
Signature · 1 line
2.20.1
Re: [PATCH 4.19 026/271] signal/cifs: Fix cifs_put_tcp_session to call send_sig instead of force_sig
In reply to Greg Kroah-HartmanNote that this patch causes a regression (removing cifs module fails, due to unmount leaking a thread with this change).
We are testing a workaround to cifs.ko which would be needed if this patch were to be backported.
Quoted 49 lines · Greg Kroah-Hartman
[ Upstream commit
72abe3bcf0911d69b46c1e8bdb5612675e0ac42c]The locking in
force_sig_infois not prepared to deal with a task that exits or execs (as sighand may change). The is not a locking problem inforce_sigasforce_sigis only built to handle synchronous exceptions.Further the function
force_sig_infochanges the signal state if the signal is ignored, or blocked or ifSIGNAL_UNKILLABLEwill prevent the delivery of the signal. The signal SIGKILL can not be ignored and can not be blocked andSIGNAL_UNKILLABLEwon't prevent it from being delivered.So using
force_sigrather thansend_sigfor SIGKILL is confusing and pointless.Because it won't impact the sending of the signal and and because using
force_sigis wrong, replaceforce_sigwithsend_sig.Cc Namjae Jeon <[email protected]>Cc Jeff Layton <[email protected]>Cc Steve French <[email protected]>Fixes a5c3e1c725af ("Revert "cifs: No need to send SIGKILL to demux_thread during umount"")Fixes e7ddee9037e7 ("cifs: disable sharing session and tcon and add new TCP sharing code")Signed-off-by "Eric W. Biederman" <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- fs/cifs/connect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/cifs/connect.c +1
-2@@ -2428,7 +2428,7 @@ cifs_put_tcp_session(struct TCP_Server_Info *server, int from_reconnect) task =xchg (&server->tsk,NULL );if (task) -force_sig (SIGKILL , task); +send_sig (SIGKILL , task,1 ); } static struct TCP_Server_Info * --2.20.1
Signature · 3 lines
Thanks, Steve
stable-rc/linux-4.19.y boot: 130 boots: 2 failed, 127 passed with 1 offline (v4.19.60-272-g975cffe32ab5)
stable-rc/linux-4.19.y boot: 130 boots: 2 failed, 127 passed with 1 offline (v4.19.60-272-g975cffe32ab5)
Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-4.19.y/kernel/v4.19.60-272-g975cffe32ab5/
Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.19.y/kernel/v4.19.60-272-g975cffe32ab5/
Tree: stable-rc
Branch: linux-4.19.y
Git Describe: v4.19.60-272-g975cffe32ab5
Git Commit: 975cffe32ab513d7307a360d34c483c3b53840fd
Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
Tested: 73 unique boards, 27 SoC families, 17 builds out of 206
Boot Failures Detected:
arm64:
defconfig:
gcc-8:
meson-gxl-s905x-nexbox-a95x: 1 failed labarc:
hsdk_defconfig:
gcc-8:
hsdk: 1 failed lab
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.19.61 release. There are 271 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 Fri 26 Jul 2019 07:13:35 PM 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.19.61-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.19.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.19.61-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-4.19.y
git commit: 872cde3ebfc93ca6ac127f51bbb54eafe1d8eda5
git describe: v4.19.60-272-g872cde3ebfc9
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-4.19-oe/build/v4.19.60-272-g872cde3ebfc9
No regressions (compared to build v4.19.60)
No fixes (compared to build v4.19.60)
Ran 23544 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
* libgpiod
* 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
* network-basic-tests
* perf
* spectre-meltdown-checker-test
* v4l2-compliance
* ltp-open-posix-tests
* kvm-unit-tests
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-none
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Greg Kroah-Hartman
maintainerPATCH 103/271 media: hdpvr: fix locking and a missing msleep
In reply to Greg Kroah-Hartman[ Upstream commit 6bc5a4a1927556ff9adce1aa95ea408c95453225 ]
This driver has three locking issues:
- The wait_event_interruptible() condition calls hdpvr_get_next_buffer(dev) which uses a mutex, which is not allowed. Rewrite with list_empty_careful() that doesn't need locking.
- In hdpvr_read() the call to hdpvr_stop_streaming() didn't lock io_mutex, but it should have since stop_streaming expects that.
- In hdpvr_device_release() io_mutex was locked when calling flush_work(), but there it shouldn't take that mutex since the work done by flush_work() also wants to lock that mutex.
There are also two other changes (suggested by Keith):
- msecs_to_jiffies(4000); (a NOP) should have been msleep(4000).
- Change v4l2_dbg to v4l2_info to always log if streaming had to be restarted.
--- drivers/media/usb/hdpvr/hdpvr-video.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/media/usb/hdpvr/hdpvr-video.c +11 -6
@@ -439,7 +439,7 @@ static ssize_t hdpvr_read(struct file *file, char __user *buffer, size_t count,/* wait for the first buffer */ if (!(file->f_flags &O_NONBLOCK )) {if (wait_event_interruptible (dev->wait_data, -hdpvr_get_next_buffer (dev))) + !list_empty_careful (&dev->rec_buff_list)))return -ERESTARTSYS ; }
@@ -465,10 +465,17 @@ static ssize_t hdpvr_read(struct file *file, char __user *buffer, size_t count, goto err; }if (!err) { -v4l2_dbg (MSG_INFO , hdpvr_debug, &dev->v4l2_dev, -"timeout: restart streaming\n" ); +v4l2_info (&dev->v4l2_dev, +"timeout: restart streaming\n" ); +mutex_lock (&dev->io_mutex);hdpvr_stop_streaming (dev); -msecs_to_jiffies (4000 ); +mutex_unlock (&dev->io_mutex); +/* +* The FW needs about 4 seconds after streaming +* stopped before it is ready to restart +* streaming. +*/ +msleep (4000 ); err =hdpvr_start_streaming (dev);if (err) { ret = err;
@@ -1133,9 +1140,7 @@ static void hdpvr_device_release(struct video_device *vdev)struct hdpvr_device *dev =video_get_drvdata (vdev);hdpvr_delete (dev); -mutex_lock (&dev->io_mutex);flush_work (&dev->worker); -mutex_unlock (&dev->io_mutex);v4l2_device_unregister (&dev->v4l2_dev);v4l2_ctrl_handler_free (&dev->hdl);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 104/271 net: stmmac: sun8i: force select external PHY when no internal one
In reply to Greg Kroah-Hartman[ Upstream commit 0fec7e72ae1391bb2d7527efb54fe6ae88acabce ]
The PHY selection bit also exists on SoCs without an internal PHY; if it's set to 1 (internal PHY, default value) then the MAC will not make use of any PHY on such SoCs.
This problem appears when adapting for H6, which has no real internal PHY (the "internal PHY" on H6 is not on-die, but on a co-packaged AC200 chip, connected via RMII interface at GPIO bank A).
Force the PHY selection bit to 0 when the SOC doesn't have an internal PHY, to address the problem of a wrong default value.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +5 -0
@@ -893,6 +893,11 @@ static int sun8i_dwmac_set_syscon(struct stmmac_priv *priv)* address. No need to mask it again. */ reg |=1 <<H3_EPHY_ADDR_SHIFT ; + }else { +/* For SoCs without internal PHY the PHY selection bit should be +* set to 0 (external PHY). +*/ + reg &= ~H3_EPHY_SELECT ; }if (!of_property_read_u32 (node,"allwinner,tx-delay-ps" , &val)) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 105/271 rtlwifi: rtl8192cu: fix error handle when usb probe failed
In reply to Greg Kroah-Hartman[ Upstream commit 6c0ed66f1a5b84e2a812c7c2d6571a5621bf3396 ]
rtl_usb_probe() must do error handle rtl_deinit_core() only if rtl_init_core() is done, otherwise goto error_out2.
| usb 1-1: New USB device strings: Mfr=0, Product=0, SerialNumber=0 | rtl_usb: reg 0xf0, usbctrl_vendorreq TimeOut! status:0xffffffb9 value=0x0 | rtl8192cu: Chip version 0x10 | rtl_usb: reg 0xa, usbctrl_vendorreq TimeOut! status:0xffffffb9 value=0x0 | rtl_usb: Too few input end points found | INFO: trying to register non-static key. | the code is fine but needs lockdep annotation. | turning off the locking correctness validator. | CPU: 0 PID: 12 Comm: kworker/0:1 Not tainted 5.1.0-rc4-319354-g9a33b36 #3 | Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS | Google 01/01/2011 | Workqueue: usb_hub_wq hub_event | Call Trace: | __dump_stack lib/dump_stack.c:77 [inline] | dump_stack+0xe8/0x16e lib/dump_stack.c:113 | assign_lock_key kernel/locking/lockdep.c:786 [inline] | register_lock_class+0x11b8/0x1250 kernel/locking/lockdep.c:1095 | __lock_acquire+0xfb/0x37c0 kernel/locking/lockdep.c:3582 | lock_acquire+0x10d/0x2f0 kernel/locking/lockdep.c:4211 | __raw_spin_lock_irqsave include/linux/spinlock_api_smp.h:110 [inline] | _raw_spin_lock_irqsave+0x44/0x60 kernel/locking/spinlock.c:152 | rtl_c2hcmd_launcher+0xd1/0x390 | drivers/net/wireless/realtek/rtlwifi/base.c:2344 | rtl_deinit_core+0x25/0x2d0 drivers/net/wireless/realtek/rtlwifi/base.c:574 | rtl_usb_probe.cold+0x861/0xa70 | drivers/net/wireless/realtek/rtlwifi/usb.c:1093 | usb_probe_interface+0x31d/0x820 drivers/usb/core/driver.c:361 | really_probe+0x2da/0xb10 drivers/base/dd.c:509 | driver_probe_device+0x21d/0x350 drivers/base/dd.c:671 | __device_attach_driver+0x1d8/0x290 drivers/base/dd.c:778 | bus_for_each_drv+0x163/0x1e0 drivers/base/bus.c:454 | __device_attach+0x223/0x3a0 drivers/base/dd.c:844 | bus_probe_device+0x1f1/0x2a0 drivers/base/bus.c:514 | device_add+0xad2/0x16e0 drivers/base/core.c:2106 | usb_set_configuration+0xdf7/0x1740 drivers/usb/core/message.c:2021 | generic_probe+0xa2/0xda drivers/usb/core/generic.c:210 | usb_probe_device+0xc0/0x150 drivers/usb/core/driver.c:266 | really_probe+0x2da/0xb10 drivers/base/dd.c:509 | driver_probe_device+0x21d/0x350 drivers/base/dd.c:671 | __device_attach_driver+0x1d8/0x290 drivers/base/dd.c:778 | bus_for_each_drv+0x163/0x1e0 drivers/base/bus.c:454 | __device_attach+0x223/0x3a0 drivers/base/dd.c:844 | bus_probe_device+0x1f1/0x2a0 drivers/base/bus.c:514 | device_add+0xad2/0x16e0 drivers/base/core.c:2106 | usb_new_device.cold+0x537/0xccf drivers/usb/core/hub.c:2534 | hub_port_connect drivers/usb/core/hub.c:5089 [inline] | hub_port_connect_change drivers/usb/core/hub.c:5204 [inline] | port_event drivers/usb/core/hub.c:5350 [inline] | hub_event+0x138e/0x3b00 drivers/usb/core/hub.c:5432 | process_one_work+0x90f/0x1580 kernel/workqueue.c:2269 | worker_thread+0x9b/0xe20 kernel/workqueue.c:2415 | kthread+0x313/0x420 kernel/kthread.c:253 | ret_from_fork+0x3a/0x50 arch/x86/entry/entry_64.S:352
--- drivers/net/wireless/realtek/rtlwifi/usb.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtlwifi/usb.c +3 -2
@@ -1081,13 +1081,13 @@ int rtl_usb_probe(struct usb_interface *intf, rtlpriv->cfg->ops->read_eeprom_info (hw); err =_rtl_usb_init (hw);if (err) - goto error_out; + goto error_out2;rtl_usb_init_sw (hw);/* Init mac80211 sw */ err =rtl_init_core (hw);if (err) {pr_err ("Can't allocate sw for mac80211\n" ); - goto error_out; + goto error_out2; }if (rtlpriv->cfg->ops->init_sw_vars (hw)) {pr_err ("Can't init_sw_vars\n" );
@@ -1108,6 +1108,7 @@ int rtl_usb_probe(struct usb_interface *intf, error_out:rtl_deinit_core (hw); +error_out2:_rtl_usb_io_handler_release (hw);usb_put_dev (udev);complete (&rtlpriv->firmware_loading_complete);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 106/271 mt7601u: do not schedule rx_tasklet when the device has been disconnected
In reply to Greg Kroah-Hartman[ Upstream commit 4079e8ccabc3b6d1b503f2376123cb515d14921f ]
Do not schedule rx_tasklet when the usb dongle is disconnected. Moreover do not grub rx_lock in mt7601u_kill_rx since usb_poison_urb can run concurrently with urb completion and we can unlink urbs from rx ring in any order.
This patch fixes the common kernel warning reported when
the device is removed.
[ 24.921354] usb 3-14: USB disconnect, device number 7 [ 24.921593] ------------[ cut here ]------------ [ 24.921594] RX urb mismatch [ 24.921675] WARNING: CPU: 4 PID: 163 at drivers/net/wireless/mediatek/mt7601u/dma.c:200 mt7601u_complete_rx+0xcb/0xd0 [mt7601u] [ 24.921769] CPU: 4 PID: 163 Comm: kworker/4:2 Tainted: G OE 4.19.31-041931-generic #201903231635 [ 24.921770] Hardware name: To Be Filled By O.E.M. To Be Filled By O.E.M./Z97 Extreme4, BIOS P1.30 05/23/2014 [ 24.921782] Workqueue: usb_hub_wq hub_event [ 24.921797] RIP: 0010:mt7601u_complete_rx+0xcb/0xd0 [mt7601u] [ 24.921800] RSP: 0018:ffff9bd9cfd03d08 EFLAGS: 00010086 [ 24.921802] RAX: 0000000000000000 RBX: ffff9bd9bf043540 RCX: 0000000000000006 [ 24.921803] RDX: 0000000000000007 RSI: 0000000000000096 RDI: ffff9bd9cfd16420 [ 24.921804] RBP: ffff9bd9cfd03d28 R08: 0000000000000002 R09: 00000000000003a8 [ 24.921805] R10: 0000002f485fca34 R11: 0000000000000000 R12: ffff9bd9bf043c1c [ 24.921806] R13: ffff9bd9c62fa3c0 R14: 0000000000000082 R15: 0000000000000000 [ 24.921807] FS: 0000000000000000(0000) GS:ffff9bd9cfd00000(0000) knlGS:0000000000000000 [ 24.921808] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 24.921808] CR2: 00007fb2648b0000 CR3: 0000000142c0a004 CR4: 00000000001606e0 [ 24.921809] Call Trace: [ 24.921812] <IRQ> [ 24.921819] __usb_hcd_giveback_urb+0x8b/0x140 [ 24.921821] usb_hcd_giveback_urb+0xca/0xe0 [ 24.921828] xhci_giveback_urb_in_irq.isra.42+0x82/0xf0 [ 24.921834] handle_cmd_completion+0xe02/0x10d0 [ 24.921837] xhci_irq+0x274/0x4a0 [ 24.921838] xhci_msi_irq+0x11/0x20 [ 24.921851] __handle_irq_event_percpu+0x44/0x190 [ 24.921856] handle_irq_event_percpu+0x32/0x80 [ 24.921861] handle_irq_event+0x3b/0x5a [ 24.921867] handle_edge_irq+0x80/0x190 [ 24.921874] handle_irq+0x20/0x30 [ 24.921889] do_IRQ+0x4e/0xe0 [ 24.921891] common_interrupt+0xf/0xf [ 24.921892] </IRQ> [ 24.921900] RIP: 0010:usb_hcd_flush_endpoint+0x78/0x180 [ 24.921354] usb 3-14: USB disconnect, device number 7
--- drivers/net/wireless/mediatek/mt7601u/dma.c | 33 +++++++++++---------- 1 file changed, 18 insertions(+), 15 deletions(-)
drivers/net/wireless/mediatek/mt7601u/dma.c +18 -15
@@ -193,10 +193,23 @@ static void mt7601u_complete_rx(struct urb *urb)struct mt7601u_rx_queue *q = &dev->rx_q;unsigned long flags; -spin_lock_irqsave (&dev->rx_lock, flags); +/* do no schedule rx tasklet if urb has been unlinked +* or the device has been removed +*/ +switch (urb->status) { +case -ECONNRESET : +case -ESHUTDOWN : +case -ENOENT : +return ; +default : +dev_err_ratelimited (dev->dev,"rx urb failed: %d\n" , + urb->status); +/* fall through */ +case 0 : +break ; + } -if (mt7601u_urb_has_error (urb)) -dev_err (dev->dev,"Error: RX urb failed:%d\n" , urb->status); +spin_lock_irqsave (&dev->rx_lock, flags);if (WARN_ONCE (q->e[q->end].urb != urb,"RX urb mismatch" )) goto out;
@@ -363,19 +376,9 @@ int mt7601u_dma_enqueue_tx(struct mt7601u_dev *dev, struct sk_buff *skb,static void mt7601u_kill_rx (struct mt7601u_dev *dev) {int i; -unsigned long flags; -spin_lock_irqsave (&dev->rx_lock, flags); - -for (i =0 ; i < dev->rx_q.entries; i++) { -int next = dev->rx_q.end; - -spin_unlock_irqrestore (&dev->rx_lock, flags); -usb_poison_urb (dev->rx_q.e[next].urb); -spin_lock_irqsave (&dev->rx_lock, flags); - } - -spin_unlock_irqrestore (&dev->rx_lock, flags); +for (i =0 ; i < dev->rx_q.entries; i++) +usb_poison_urb (dev->rx_q.e[i].urb); } static int mt7601u_submit_rx_buf(struct mt7601u_dev *dev,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 107/271 x86/build: Add set -e to mkcapflags.sh to delete broken capflags.c
In reply to Greg Kroah-Hartman[ Upstream commit bc53d3d777f81385c1bb08b07bd1c06450ecc2c1 ]
Without 'set -e', shell scripts continue running even after any error occurs. The missed 'set -e' is a typical bug in shell scripting.
For example, when a disk space shortage occurs while this script is running, it actually ends up with generating a truncated capflags.c.
Yet, mkcapflags.sh continues running and exits with 0. So, the build system assumes it has succeeded.
It will not be re-generated in the next invocation of Make since its timestamp is newer than that of any of the source files.
Add 'set -e' so that any error in this script is caught and propagated to the build system.
Since 9c2af1c7377a ("kbuild: add .DELETE_ON_ERROR special target"), make automatically deletes the target on any failure. So, the broken capflags.c will be deleted automatically.
--- arch/x86/kernel/cpu/mkcapflags.sh | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/kernel/cpu/mkcapflags.sh +2 -0
@@ -4,6 +4,8 @@ # Generate the x86_cap/bug_flags[] arrays from include/asm/cpufeatures.h # +set -e + IN=$1 OUT=$2
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 81/271 vhost_net: disable zerocopy by default
In reply to Greg Kroah-Hartman[ Upstream commit 098eadce3c622c07b328d0a43dda379b38cf7c5e ]
Vhost_net was known to suffer from HOL[1] issues which is not easy to fix. Several downstream disable the feature by default. What's more, the datapath was split and datacopy path got the support of batching and XDP support recently which makes it faster than zerocopy part for small packets transmission.
It looks to me that disable zerocopy by default is more appropriate. It cold be enabled by default again in the future if we fix the above issues.
[1] https://patchwork.kernel.org/patch/3787671/
--- drivers/vhost/net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/vhost/net.c +1 -1
@@ -36,7 +36,7 @@#include "vhost.h" -static int experimental_zcopytx =1 ; +static int experimental_zcopytx =0 ;module_param (experimental_zcopytx, int,0444 );MODULE_PARM_DESC (experimental_zcopytx,"Enable Zero Copy TX;" " 1 -Enable; 0 - Disable" );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 108/271 mt7601u: fix possible memory leak when the device is disconnected
In reply to Greg Kroah-Hartman[ Upstream commit 23377c200b2eb48a60d0f228b2a2e75ed6ee6060 ]
When the device is disconnected while passing traffic it is possible to receive out of order urbs causing a memory leak since the skb linked to the current tx urb is not removed. Fix the issue deallocating the skb cleaning up the tx ring. Moreover this patch fixes the following kernel warning
[ 57.480771] usb 1-1: USB disconnect, device number 2 [ 57.483451] ------------[ cut here ]------------ [ 57.483462] TX urb mismatch [ 57.483481] WARNING: CPU: 1 PID: 32 at drivers/net/wireless/mediatek/mt7601u/dma.c:245 mt7601u_complete_tx+0x165/00 [ 57.483483] Modules linked in: [ 57.483496] CPU: 1 PID: 32 Comm: kworker/1:1 Not tainted 5.2.0-rc1+ #72 [ 57.483498] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.12.0-2.fc30 04/01/2014 [ 57.483502] Workqueue: usb_hub_wq hub_event [ 57.483507] RIP: 0010:mt7601u_complete_tx+0x165/0x1e0 [ 57.483510] Code: 8b b5 10 04 00 00 8b 8d 14 04 00 00 eb 8b 80 3d b1 cb e1 00 00 75 9e 48 c7 c7 a4 ea 05 82 c6 05 f [ 57.483513] RSP: 0000:ffffc900000a0d28 EFLAGS: 00010092 [ 57.483516] RAX: 000000000000000f RBX: ffff88802c0a62c0 RCX: ffffc900000a0c2c [ 57.483518] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffffffff810a8371 [ 57.483520] RBP: ffff88803ced6858 R08: 0000000000000000 R09: 0000000000000001 [ 57.483540] R10: 0000000000000002 R11: 0000000000000000 R12: 0000000000000046 [ 57.483542] R13: ffff88802c0a6c88 R14: ffff88803baab540 R15: ffff88803a0cc078 [ 57.483548] FS: 0000000000000000(0000) GS:ffff88803eb00000(0000) knlGS:0000000000000000 [ 57.483550] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 57.483552] CR2: 000055e7f6780100 CR3: 0000000028c86000 CR4: 00000000000006a0 [ 57.483554] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 57.483556] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 57.483559] Call Trace: [ 57.483561] <IRQ> [ 57.483565] __usb_hcd_giveback_urb+0x77/0xe0 [ 57.483570] xhci_giveback_urb_in_irq.isra.0+0x8b/0x140 [ 57.483574] handle_cmd_completion+0xf5b/0x12c0 [ 57.483577] xhci_irq+0x1f6/0x1810 [ 57.483581] ? lockdep_hardirqs_on+0x9e/0x180 [ 57.483584] ? _raw_spin_unlock_irq+0x24/0x30 [ 57.483588] __handle_irq_event_percpu+0x3a/0x260 [ 57.483592] handle_irq_event_percpu+0x1c/0x60 [ 57.483595] handle_irq_event+0x2f/0x4c [ 57.483599] handle_edge_irq+0x7e/0x1a0 [ 57.483603] handle_irq+0x17/0x20 [ 57.483607] do_IRQ+0x54/0x110 [ 57.483610] common_interrupt+0xf/0xf [ 57.483612] </IRQ>
--- drivers/net/wireless/mediatek/mt7601u/dma.c | 21 ++++++++++++++++----- drivers/net/wireless/mediatek/mt7601u/tx.c | 4 ++-- 2 files changed, 18 insertions(+), 7 deletions(-)
drivers/net/wireless/mediatek/mt7601u/dma.c +16 -5
@@ -241,14 +241,25 @@ static void mt7601u_complete_tx(struct urb *urb)struct sk_buff *skb;unsigned long flags; -spin_lock_irqsave (&dev->tx_lock, flags); +switch (urb->status) { +case -ECONNRESET : +case -ESHUTDOWN : +case -ENOENT : +return ; +default : +dev_err_ratelimited (dev->dev,"tx urb failed: %d\n" , + urb->status); +/* fall through */ +case 0 : +break ; + } -if (mt7601u_urb_has_error (urb)) -dev_err (dev->dev,"Error: TX urb failed:%d\n" , urb->status); +spin_lock_irqsave (&dev->tx_lock, flags);if (WARN_ONCE (q->e[q->start].urb != urb,"TX urb mismatch" )) goto out; skb = q->e[q->start].skb; + q->e[q->start].skb =NULL ;trace_mt_tx_dma_done (dev, skb);__skb_queue_tail (&dev->tx_skb_done, skb);
@@ -448,10 +459,10 @@ static void mt7601u_free_tx_queue(struct mt7601u_tx_queue *q) {int i; -WARN_ON (q->used); -for (i =0 ; i < q->entries; i++) {usb_poison_urb (q->e[i].urb); +if (q->e[i].skb) +mt7601u_tx_status (q->dev, q->e[i].skb);usb_free_urb (q->e[i].urb); } }
drivers/net/wireless/mediatek/mt7601u/tx.c +2 -2
@@ -117,9 +117,9 @@ void mt7601u_tx_status(struct mt7601u_dev *dev, struct sk_buff *skb) info->status.rates[0 ].idx =-1 ; info->flags |=IEEE80211_TX_STAT_ACK ; -spin_lock (&dev->mac_lock); +spin_lock_bh (&dev->mac_lock);ieee80211_tx_status (dev->hw, skb); -spin_unlock (&dev->mac_lock); +spin_unlock_bh (&dev->mac_lock); }static int mt7601u_skb_rooms (struct mt7601u_dev *dev,struct sk_buff *skb)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 109/271 ipvs: fix tinfo memory leak in start_sync_thread
In reply to Greg Kroah-Hartman[ Upstream commit 5db7c8b9f9fc2aeec671ae3ca6375752c162e0e7 ]
syzkaller reports for memory leak in start_sync_thread [1]
As Eric points out, kthread may start and stop before the threadfn function is called, so there is no chance the data (tinfo in our case) to be released in thread.
Fix this by releasing tinfo in the controlling code instead.
[1]
BUG: memory leak
unreferenced object 0xffff8881206bf700 (size 32):
comm "syz-executor761", pid 7268, jiffies 4294943441 (age 20.470s) hex dump (first 32 bytes):
00 40 7c 09 81 88 ff ff 80 45 b8 21 81 88 ff ff .@|......E.!.... 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<0000000057619e23>] kmemleak_alloc_recursive include/linux/kmemleak.h:55 [inline] [<0000000057619e23>] slab_post_alloc_hook mm/slab.h:439 [inline] [<0000000057619e23>] slab_alloc mm/slab.c:3326 [inline] [<0000000057619e23>] kmem_cache_alloc_trace+0x13d/0x280 mm/slab.c:3553 [<0000000086ce5479>] kmalloc include/linux/slab.h:547 [inline] [<0000000086ce5479>] start_sync_thread+0x5d2/0xe10 net/netfilter/ipvs/ip_vs_sync.c:1862 [<000000001a9229cc>] do_ip_vs_set_ctl+0x4c5/0x780 net/netfilter/ipvs/ip_vs_ctl.c:2402 [<00000000ece457c8>] nf_sockopt net/netfilter/nf_sockopt.c:106 [inline] [<00000000ece457c8>] nf_setsockopt+0x4c/0x80 net/netfilter/nf_sockopt.c:115 [<00000000942f62d4>] ip_setsockopt net/ipv4/ip_sockglue.c:1258 [inline] [<00000000942f62d4>] ip_setsockopt+0x9b/0xb0 net/ipv4/ip_sockglue.c:1238 [<00000000a56a8ffd>] udp_setsockopt+0x4e/0x90 net/ipv4/udp.c:2616 [<00000000fa895401>] sock_common_setsockopt+0x38/0x50 net/core/sock.c:3130 [<0000000095eef4cf>] __sys_setsockopt+0x98/0x120 net/socket.c:2078 [<000000009747cf88>] __do_sys_setsockopt net/socket.c:2089 [inline] [<000000009747cf88>] __se_sys_setsockopt net/socket.c:2086 [inline] [<000000009747cf88>] __x64_sys_setsockopt+0x26/0x30 net/socket.c:2086 [<00000000ded8ba80>] do_syscall_64+0x76/0x1a0 arch/x86/entry/common.c:301 [<00000000893b4ac8>] entry_SYSCALL_64_after_hwframe+0x44/0xa9
--- include/net/ip_vs.h | 6 +- net/netfilter/ipvs/ip_vs_ctl.c | 4 - net/netfilter/ipvs/ip_vs_sync.c | 134 +++++++++++++++++--------------- 3 files changed, 76 insertions(+), 68 deletions(-)
include/net/ip_vs.h +4 -2
@@ -806,11 +806,12 @@ struct ipvs_master_sync_state {struct ip_vs_sync_buff *sync_buff;unsigned long sync_queue_len;unsigned int sync_queue_delay; -struct task_struct *master_thread;struct delayed_work master_wakeup_work;struct netns_ipvs *ipvs; }; +struct ip_vs_sync_thread_data ; +/* How much time to keep dests in trash */ #define IP_VS_DEST_TRASH_PERIOD (120 * HZ)
@@ -941,7 +942,8 @@ struct netns_ipvs {spinlock_t sync_lock;struct ipvs_master_sync_state *ms;spinlock_t sync_buff_lock; -struct task_struct **backup_threads; +struct ip_vs_sync_thread_data *master_tinfo; +struct ip_vs_sync_thread_data *backup_tinfo;int threads_mask;volatile int sync_state;struct mutex sync_mutex;
net/netfilter/ipvs/ip_vs_ctl.c +0 -4
@@ -2382,9 +2382,7 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len) cfg.syncid = dm->syncid; ret =start_sync_thread (ipvs, &cfg, dm->state); }else { -mutex_lock (&ipvs->sync_mutex); ret =stop_sync_thread (ipvs, dm->state); -mutex_unlock (&ipvs->sync_mutex); } goto out_dec; }
@@ -3492,10 +3490,8 @@ static int ip_vs_genl_del_daemon(struct netns_ipvs *ipvs, struct nlattr **attrs)if (!attrs[IPVS_DAEMON_ATTR_STATE ])return -EINVAL ; -mutex_lock (&ipvs->sync_mutex); ret =stop_sync_thread (ipvs,nla_get_u32 (attrs[IPVS_DAEMON_ATTR_STATE ])); -mutex_unlock (&ipvs->sync_mutex);return ret; }
net/netfilter/ipvs/ip_vs_sync.c +72 -62
269 lines not on this page · raw message
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 110/271 ath10k: add missing error handling
In reply to Greg Kroah-Hartman[ Upstream commit 4b553f3ca4cbde67399aa3a756c37eb92145b8a1 ]
In function ath10k_sdio_mbox_rx_alloc() [sdio.c], ath10k_sdio_mbox_alloc_rx_pkt() is called without handling the error cases. This will make the driver think the allocation for skb is successful and try to access the skb. If we enable failslab, system will easily crash with NULL pointer dereferencing.
Call trace of CONFIG_FAILSLAB:
ath10k_sdio_irq_handler+0x570/0xa88 [ath10k_sdio] process_sdio_pending_irqs+0x4c/0x174 sdio_run_irqs+0x3c/0x64 sdio_irq_work+0x1c/0x28
--- drivers/net/wireless/ath/ath10k/sdio.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/ath/ath10k/sdio.c +4 -0
@@ -613,6 +613,10 @@ static int ath10k_sdio_mbox_rx_alloc(struct ath10k *ar, full_len, last_in_bundle, last_in_bundle); +if (ret) { +ath10k_warn (ar,"alloc_rx_pkt error %d\n" , ret); + goto err; + } } ar_sdio->n_rx_pkts = i;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 111/271 ath10k: fix PCIE device wake up failed
In reply to Greg Kroah-Hartman[ Upstream commit 011d4111c8c602ea829fa4917af1818eb0500a90 ]
Observed PCIE device wake up failed after ~120 iterations of soft-reboot test. The error message is
"ath10k_pci 0000:01:00.0: failed to wake up device : -110"
The call trace as below:ath10k_pci_probe -> ath10k_pci_force_wake -> ath10k_pci_wake_wait -> ath10k_pci_is_awake
Once trigger the device to wake up, we will continuously check the RTC state until it returns RTC_STATE_V_ON or timeout.
But for QCA99x0 chips, we use wrong value for RTC_STATE_V_ON. Occasionally, we get 0x7 on the fist read, we thought as a failure case, but actually is the right value, also verified with the spec. So fix the issue by changing RTC_STATE_V_ON from 0x5 to 0x7, passed ~2000 iterations.
Tested HW: QCA9984
--- drivers/net/wireless/ath/ath10k/hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/hw.c +1 -1
@@ -168,7 +168,7 @@ const struct ath10k_hw_values qca6174_values = { };const struct ath10k_hw_values qca99x0_values = { - .rtc_state_val_on =5 , + .rtc_state_val_on =7 , .ce_count =12 , .msi_assign_ce_max =12 , .num_target_ce_config_wlan =10 ,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 112/271 perf tools: Increase MAX_NR_CPUS and MAX_CACHES
In reply to Greg Kroah-Hartman[ Upstream commit 9f94c7f947e919c343b30f080285af53d0fa9902 ]
Attempting to profile 1024 or more CPUs with perf causes two errors:
perf record -a
[ perf record: Woken up X times to write data ]
way too many cpu caches..
[ perf record: Captured and wrote X MB perf.data (X samples) ]
perf report -C 1024
Error: failed to set cpu bitmap
Requested CPU 1024 too large. Consider raising MAX_NR_CPUS
Increasing MAX_NR_CPUS from 1024 to 2048 and redefining MAX_CACHES as MAX_NR_CPUS * 4 returns normal functionality to perf:
perf record -a
[ perf record: Woken up X times to write data ]
[ perf record: Captured and wrote X MB perf.data (X samples) ]
perf report -C 1024
...
--- tools/perf/perf.h | 2 +- tools/perf/util/header.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
tools/perf/perf.h +1 -1
@@ -26,7 +26,7 @@ static inline unsigned long long rdclock(void) }#ifndef MAX_NR_CPUS -#define MAX_NR_CPUS 1024 +#define MAX_NR_CPUS 2048#endif extern const char *input_name;
tools/perf/util/header.c +1 -1
@@ -1173,7 +1173,7 @@ static int build_caches(struct cpu_cache_level caches[], u32 size, u32 *cntp)return 0 ; } -#define MAX_CACHES 2000 +#define MAX_CACHES (MAX_NR_CPUS * 4)static int write_cache (struct feat_fd *ff,struct perf_evlist *evlist__maybe_unused )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 113/271 ASoC: Intel: hdac_hdmi: Set ops to NULL on remove
In reply to Greg Kroah-Hartman[ Upstream commit 0f6ff78540bd1b4df1e0f17806b0ce2e1dff0d78 ]
When we unload Skylake driver we may end up calling hdac_component_master_unbind(), it uses acomp->audio_ops, which we set in hdmi_codec_probe(), so we need to set it to NULL in hdmi_codec_remove(), otherwise we will dereference no longer existing pointer.
--- sound/soc/codecs/hdac_hdmi.c | 6 ++++++ 1 file changed, 6 insertions(+)
sound/soc/codecs/hdac_hdmi.c +6 -0
@@ -1854,6 +1854,12 @@ static void hdmi_codec_remove(struct snd_soc_component *component) {struct hdac_hdmi_priv *hdmi =snd_soc_component_get_drvdata (component);struct hdac_device *hdev = hdmi->hdev; +int ret; + + ret =snd_hdac_acomp_register_notifier (hdev->bus,NULL ); +if (ret <0 ) +dev_err (&hdev->dev,"notifier unregister failed: err: %d\n" , + ret);pm_runtime_disable (&hdev->dev); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 114/271 libata: dont request sense data on !ZAC ATA devices
In reply to Greg Kroah-Hartman[ Upstream commit ca156e006add67e4beea7896be395160735e09b0 ]
ZAC support added sense data requesting on error for both ZAC and ATA devices. This seems to cause erratic error handling behaviors on some SSDs where the device reports sense data availability and then delivers the wrong content making EH take the wrong actions. The failure mode was sporadic on a LITE-ON ssd and couldn't be reliably reproduced.
There is no value in requesting sense data from non-ZAC ATA devices while there's a significant risk of introducing EH misbehaviors which are difficult to reproduce and fix. Let's do the sense data dancing only for ZAC devices.
--- drivers/ata/libata-eh.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/ata/libata-eh.c +5 -3
@@ -1490,7 +1490,7 @@ static int ata_eh_read_log_10h(struct ata_device *dev, tf->hob_lbah = buf[10 ]; tf->nsect = buf[12 ]; tf->hob_nsect = buf[13 ]; -if (ata_id_has_ncq_autosense (dev->id)) +if (dev->class ==ATA_DEV_ZAC &&ata_id_has_ncq_autosense (dev->id)) tf->auxiliary = buf[14 ] <<16 | buf[15 ] <<8 | buf[16 ];return 0 ;
@@ -1737,7 +1737,8 @@ void ata_eh_analyze_ncq_error(struct ata_link *link)memcpy (&qc->result_tf, &tf,sizeof (tf)); qc->result_tf.flags =ATA_TFLAG_ISADDR |ATA_TFLAG_LBA |ATA_TFLAG_LBA48 ; qc->err_mask |=AC_ERR_DEV |AC_ERR_NCQ ; -if ((qc->result_tf.command &ATA_SENSE ) || qc->result_tf.auxiliary) { +if (dev->class ==ATA_DEV_ZAC && + ((qc->result_tf.command &ATA_SENSE ) || qc->result_tf.auxiliary)) {char sense_key, asc, ascq; sense_key = (qc->result_tf.auxiliary >>16 ) &0xff ;
@@ -1791,10 +1792,11 @@ static unsigned int ata_eh_analyze_tf(struct ata_queued_cmd *qc, }switch (qc->dev->class) { -case ATA_DEV_ATA :case ATA_DEV_ZAC :if (stat &ATA_SENSE )ata_eh_request_sense (qc, qc->scsicmd); +/* fall through */ +case ATA_DEV_ATA :if (err &ATA_ICRC ) qc->err_mask |=AC_ERR_ATA_BUS ;if (err & (ATA_UNC |ATA_AMNF ))
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 117/271 rslib: Fix decoding of shortened codes
In reply to Greg Kroah-Hartman[ Upstream commit 2034a42d1747fc1e1eeef2c6f1789c4d0762cb9c ]
The decoding of shortenend codes is broken. It only works as expected if there are no erasures.
When decoding with erasures, Lambda (the error and erasure locator polynomial) is initialized from the given erasure positions. The pad parameter is not accounted for by the initialisation code, and hence Lambda is initialized from incorrect erasure positions.
The fix is to adjust the erasure positions by the supplied pad.
--- lib/reed_solomon/decode_rs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
lib/reed_solomon/decode_rs.c +2 -2
@@ -99,9 +99,9 @@if (no_eras >0 ) {/* Init lambda to be the erasure locator polynomial */ lambda[1 ] = alpha_to[rs_modnn (rs, - prim * (nn -1 - eras_pos[0 ]))]; + prim * (nn -1 - (eras_pos[0 ] + pad)))];for (i =1 ; i < no_eras; i++) { - u =rs_modnn (rs, prim * (nn -1 - eras_pos[i])); + u =rs_modnn (rs, prim * (nn -1 - (eras_pos[i] + pad)));for (j = i +1 ; j >0 ; j--) { tmp = index_of[lambda[j -1 ]];if (tmp != nn) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 116/271 xsk: Properly terminate assignment in xskq_produce_flush_desc
In reply to Greg Kroah-Hartman[ Upstream commit f7019b7b0ad14bde732b8953161994edfc384953 ]
Clang warns:
In file included from net/xdp/xsk_queue.c:10:net/xdp/xsk_queue.h:292:2: warning: expression result unused [-Wunused-value]
WRITE_ONCE(q->ring->producer, q->prod_tail);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/compiler.h:284:6: note: expanded from macro 'WRITE_ONCE'
__u.__val; \
~~~ ^~~~~1 warning generated.
The q->prod_tail assignment has a comma at the end, not a semi-colon. Fix that so clang no longer warns and everything works as expected.
--- net/xdp/xsk_queue.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/xdp/xsk_queue.h +1 -1
@@ -239,7 +239,7 @@ static inline void xskq_produce_flush_desc(struct xsk_queue *q)/* Order producer and data */ smp_wmb (); - q->prod_tail = q->prod_head, + q->prod_tail = q->prod_head;WRITE_ONCE (q->ring->producer, q->prod_tail); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 82/271 ipoib: correcly show a VF hardware address
In reply to Greg Kroah-Hartman[ Upstream commit 64d701c608fea362881e823b666327f5d28d7ffd ]
in the case of IPoIB with SRIOV enabled hardware
ip link show command incorrecly prints
0 instead of a VF hardware address.
Before:
11: ib1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 2044 qdisc pfifo_fast state UP mode DEFAULT group default qlen 256
link/infiniband
80:00:00:66:fe:80:00:00:00:00:00:00:24:8a:07:03:00:a4:3e:7c brd 00:ff:ff:ff:ff:12:40:1b:ff:ff:00:00:00:00:00:00:ff:ff:ff:ff
vf 0 MAC 00:00:00:00:00:00, spoof checking off, link-state disable,
trust off, query_rss off
...
After:
11: ib1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 2044 qdisc pfifo_fast state UP mode DEFAULT group default qlen 256
link/infiniband
80:00:00:66:fe:80:00:00:00:00:00:00:24:8a:07:03:00:a4:3e:7c brd 00:ff:ff:ff:ff:12:40:1b:ff:ff:00:00:00:00:00:00:ff:ff:ff:ff
vf 0 link/infiniband
80:00:00:66:fe:80:00:00:00:00:00:00:24:8a:07:03:00:a4:3e:7c brd 00:ff:ff:ff:ff:12:40:1b:ff:ff:00:00:00:00:00:00:ff:ff:ff:ff, spoof checking off, link-state disable, trust off, query_rss off
v1->v2: just copy an address without modifing ifla_vf_mac v2->v3: update the changelog
--- drivers/infiniband/ulp/ipoib/ipoib_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/ulp/ipoib/ipoib_main.c +1 -0
@@ -1997,6 +1997,7 @@ static int ipoib_get_vf_config(struct net_device *dev, int vf,return err; ivf->vf = vf; +memcpy (ivf->mac, dev->dev_addr, dev->addr_len);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 118/271 rslib: Fix handling of of caller provided syndrome
In reply to Greg Kroah-Hartman[ Upstream commit ef4d6a8556b637ad27c8c2a2cff1dda3da38e9a9 ]
Check if the syndrome provided by the caller is zero, and act accordingly.
--- lib/reed_solomon/decode_rs.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
lib/reed_solomon/decode_rs.c +12 -2
@@ -42,8 +42,18 @@BUG_ON (pad <0 || pad >= nn);/* Does the caller provide the syndrome ? */ -if (s !=NULL ) - goto decode; +if (s !=NULL ) { +for (i =0 ; i < nroots; i++) { +/* The syndrome is in index form, +* so nn represents zero +*/ +if (s[i] != nn) + goto decode; + } + +/* syndrome is zero, no errors to correct */ +return 0 ; + }/* form the syndromes; i.e., evaluate data(x) at roots of * g(x) */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 119/271 ixgbe: Check DDM existence in transceiver before access
In reply to Greg Kroah-Hartman[ Upstream commit 655c91414579d7bb115a4f7898ee726fc18e0984 ]
Some transceivers may comply with SFF-8472 but not implement the Digital Diagnostic Monitoring (DDM) interface described in it. The existence of such area is specified by bit 6 of byte 92, set to 1 if implemented.
Currently, due to not checking this bit ixgbe fails trying to read SFP module's eeprom with the follow message:
ethtool -m enP51p1s0f0
Cannot get Module EEPROM data: Input/output error
Because it fails to read the additional 256 bytes in which it was 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 present in other Passive DACs in from other manufacturers.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 3 ++- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c +2 -1
@@ -3223,7 +3223,8 @@ static int ixgbe_get_module_info(struct net_device *dev, page_swap = true; } -if (sff8472_rev ==IXGBE_SFF_SFF_8472_UNSUP || page_swap) { +if (sff8472_rev ==IXGBE_SFF_SFF_8472_UNSUP || page_swap || + !(addr_mode &IXGBE_SFF_DDM_IMPLEMENTED )) {/* We have a SFP, but it does not support SFF-8472 */ modinfo->type =ETH_MODULE_SFF_8079 ; modinfo->eeprom_len =ETH_MODULE_SFF_8079_LEN ;
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h +1 -0
@@ -45,6 +45,7 @@#define IXGBE_SFF_SOFT_RS_SELECT_10G 0x8#define IXGBE_SFF_SOFT_RS_SELECT_1G 0x0#define IXGBE_SFF_ADDRESSING_MODE 0x4 +#define IXGBE_SFF_DDM_IMPLEMENTED 0x40#define IXGBE_SFF_QSFP_DA_ACTIVE_CABLE 0x1#define IXGBE_SFF_QSFP_DA_PASSIVE_CABLE 0x8#define IXGBE_SFF_QSFP_CONNECTOR_NOT_SEPARABLE 0x23
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 120/271 crypto: serpent - mark __serpent_setkey_sbox noinline
In reply to Greg Kroah-Hartman[ Upstream commit 473971187d6727609951858c63bf12b0307ef015 ]
The same bug that gcc hit in the past is apparently now showing up with clang, which decides to inline __serpent_setkey_sbox:
crypto/serpent_generic.c:268:5: error: stack frame size of 2112 bytes in function '__serpent_setkey' [-Werror,-Wframe-larger-than=]
Marking it 'noinline' reduces the stack usage from 2112 bytes to 192 and 96 bytes, respectively, and seems to generate more useful object code.
--- crypto/serpent_generic.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
crypto/serpent_generic.c +7 -1
@@ -229,7 +229,13 @@ x4 ^= x2; \ }) -static void __serpent_setkey_sbox (u32 r0,u32 r1,u32 r2,u32 r3,u32 r4,u32 *k) +/* +* both gcc and clang have misoptimized this function in the past, +* producing horrible object code from spilling temporary variables +* on the stack. Forcing this part out of line avoids that. +*/ +static noinline void __serpent_setkey_sbox(u32 r0, u32 r1, u32 r2, +u32 r3,u32 r4,u32 *k) { k +=100 ;S3 (r3, r4, r0, r1, r2);store_and_load_keys (r1, r2, r4, r3,28 ,24 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 83/271 x86/cacheinfo: Fix a -Wtype-limits warning
In reply to Greg Kroah-Hartman[ Upstream commit 1b7aebf0487613033aff26420e32fa2076d52846 ]
cpuinfo_x86.x86_model is an unsigned type, so comparing against zero will generate a compilation warning:
arch/x86/kernel/cpu/cacheinfo.c: In function 'cacheinfo_amd_init_llc_id':
arch/x86/kernel/cpu/cacheinfo.c:662:19: warning: comparison is always true \
due to limited range of data type [-Wtype-limits]
Remove the unnecessary lower bound check.
[ bp: Massage. ]
--- arch/x86/kernel/cpu/cacheinfo.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/x86/kernel/cpu/cacheinfo.c +1 -2
@@ -651,8 +651,7 @@ void cacheinfo_amd_init_llc_id(struct cpuinfo_x86 *c, int cpu, u8 node_id)if (c->x86 <0x17 ) {/* LLC is at the node level. */ per_cpu (cpu_llc_id, cpu) = node_id; - }else if (c->x86 ==0x17 && - c->x86_model >=0 && c->x86_model <=0x1F ) { + }else if (c->x86 ==0x17 && c->x86_model <=0x1F ) {/* * LLC is at the core complex level. * Core complex ID is ApicId[3] for these processors.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 84/271 blk-iolatency: only account submitted bios
In reply to Greg Kroah-Hartman[ Upstream commit a3fb01ba5af066521f3f3421839e501bb2c71805 ]
As is, iolatency recognizes done_bio and cleanup as ending paths. If a request is marked REQ_NOWAIT and fails to get a request, the bio is cleaned up via rq_qos_cleanup() and ended in bio_wouldblock_error(). This results in underflowing the inflight counter. Fix this by only accounting bios that were actually submitted.
--- block/blk-iolatency.c | 4 ++++ 1 file changed, 4 insertions(+)
block/blk-iolatency.c +4 -0
@@ -565,6 +565,10 @@ static void blkcg_iolatency_done_bio(struct rq_qos *rqos, struct bio *bio)if (!blkg)return ; +/* We didn't actually submit this bio, don't account it. */ +if (bio->bi_status ==BLK_STS_AGAIN ) +return ; + iolat =blkg_to_lat (bio->bi_blkg);if (!iolat)return ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 85/271 ACPICA: Clear status of GPEs on first direct enable
In reply to Greg Kroah-Hartman[ Upstream commit 44758bafa53602f2581a6857bb20b55d4d8ad5b2 ]
ACPI GPEs (other than the EC one) can be enabled in two situations. First, the GPEs with existing _Lxx and _Exx methods are enabled implicitly by ACPICA during system initialization. Second, the GPEs without these methods (like GPEs listed by _PRW objects for wakeup devices) need to be enabled directly by the code that is going to use them (e.g. ACPI power management or device drivers).
In the former case, if the status of a given GPE is set to start with, its handler method (either _Lxx or _Exx) needs to be invoked to take care of the events (possibly) signaled before the GPE was enabled. In the latter case, however, the first caller of acpi_enable_gpe() for a given GPE should not be expected to care about any events that might be signaled through it earlier. In that case, it is better to clear the status of the GPE before enabling it, to prevent stale events from triggering unwanted actions (like spurious system resume, for example).
For this reason, modify acpi_ev_add_gpe_reference() to take an additional boolean argument indicating whether or not the GPE status needs to be cleared when its reference counter changes from zero to one and make acpi_enable_gpe() pass TRUE to it through that new argument.
--- drivers/acpi/acpica/acevents.h | 3 ++- drivers/acpi/acpica/evgpe.c | 8 +++++++- drivers/acpi/acpica/evgpeblk.c | 2 +- drivers/acpi/acpica/evxface.c | 2 +- drivers/acpi/acpica/evxfgpe.c | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-)
drivers/acpi/acpica/acevents.h +2 -1
@@ -69,7 +69,8 @@ acpi_status acpi_ev_mask_gpe(struct acpi_gpe_event_info *gpe_event_info, u8 is_masked);acpi_status -acpi_ev_add_gpe_reference (struct acpi_gpe_event_info *gpe_event_info); +acpi_ev_add_gpe_reference (struct acpi_gpe_event_info *gpe_event_info, +u8 clear_on_enable);acpi_status acpi_ev_remove_gpe_reference (struct acpi_gpe_event_info *gpe_event_info);
drivers/acpi/acpica/evgpe.c +7 -1
@@ -146,6 +146,7 @@ acpi_ev_mask_gpe(struct acpi_gpe_event_info *gpe_event_info, u8 is_masked)* FUNCTION: acpi_ev_add_gpe_reference * * PARAMETERS: gpe_event_info - Add a reference to this GPE +* clear_on_enable - Clear GPE status before enabling it * * RETURN: Status *
@@ -155,7 +156,8 @@ acpi_ev_mask_gpe(struct acpi_gpe_event_info *gpe_event_info, u8 is_masked)******************************************************************************/ acpi_status -acpi_ev_add_gpe_reference (struct acpi_gpe_event_info *gpe_event_info) +acpi_ev_add_gpe_reference (struct acpi_gpe_event_info *gpe_event_info, +u8 clear_on_enable) {acpi_status status =AE_OK ;
@@ -170,6 +172,10 @@ acpi_ev_add_gpe_reference(struct acpi_gpe_event_info *gpe_event_info)/* Enable on first reference */ +if (clear_on_enable) { + (void )acpi_hw_clear_gpe (gpe_event_info); + } + status =acpi_ev_update_gpe_enable_mask (gpe_event_info);if (ACPI_SUCCESS (status)) { status =acpi_ev_enable_gpe (gpe_event_info);
drivers/acpi/acpica/evgpeblk.c +1 -1
@@ -453,7 +453,7 @@ acpi_ev_initialize_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,continue ; } - status =acpi_ev_add_gpe_reference (gpe_event_info); + status =acpi_ev_add_gpe_reference (gpe_event_info, FALSE);if (ACPI_FAILURE (status)) { ACPI_EXCEPTION((AE_INFO, status, "Could not enable GPE 0x%02X",
drivers/acpi/acpica/evxface.c +1 -1
@@ -971,7 +971,7 @@ acpi_remove_gpe_handler(acpi_handle gpe_device, ACPI_GPE_DISPATCH_METHOD) || (ACPI_GPE_DISPATCH_TYPE(handler->original_flags) == ACPI_GPE_DISPATCH_NOTIFY)) && handler->originally_enabled) { - (void )acpi_ev_add_gpe_reference (gpe_event_info); + (void )acpi_ev_add_gpe_reference (gpe_event_info, FALSE);if (ACPI_GPE_IS_POLLING_NEEDED (gpe_event_info)) {/* Poll edge triggered GPEs to handle existing events */
drivers/acpi/acpica/evxfgpe.c +1 -1
@@ -108,7 +108,7 @@ acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number)if (gpe_event_info) {if (ACPI_GPE_DISPATCH_TYPE (gpe_event_info->flags) !=ACPI_GPE_DISPATCH_NONE ) { - status =acpi_ev_add_gpe_reference (gpe_event_info); + status =acpi_ev_add_gpe_reference (gpe_event_info, TRUE);if (ACPI_SUCCESS (status) &&ACPI_GPE_IS_POLLING_NEEDED (gpe_event_info)) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 87/271 nvme: fix possible io failures when removing multipathed ns
In reply to Greg Kroah-Hartman[ Upstream commit 2181e455612a8db2761eabbf126640552a451e96 ]
When a shared namespace is removed, we call blk_cleanup_queue() when the device can still be accessed as the current path and this can result in submission to a dying queue. Hence, direct_make_request() called by our mpath device may fail (propagating the failure to userspace). Instead, we want to failover this I/O to a different path if one exists. Thus, before we cleanup the request queue, we make sure that the device is cleared from the current path nor it can be selected again as such.
Fix this by:
- clear the ns from the head->list and synchronize rcu to make sure there is no concurrent path search that restores it as the current path
- clear the mpath current path in order to trigger a subsequent path search and sync srcu to wait for any ongoing request submissions
- safely continue to namespace removal and blk_cleanup_queue
--- drivers/nvme/host/core.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/nvme/host/core.c +8 -6
@@ -3168,6 +3168,14 @@ static void nvme_ns_remove(struct nvme_ns *ns)return ;nvme_fault_inject_fini (ns); + +mutex_lock (&ns->ctrl->subsys->lock); +list_del_rcu (&ns->siblings); +mutex_unlock (&ns->ctrl->subsys->lock); +synchronize_rcu ();/* guarantee not available in head->list */ +nvme_mpath_clear_current_path (ns); +synchronize_srcu (&ns->head->srcu);/* wait for concurrent submissions */ +if (ns->disk && ns->disk->flags &GENHD_FL_UP ) {sysfs_remove_group (&disk_to_dev (ns->disk)->kobj, &nvme_ns_id_attr_group);
@@ -3179,16 +3187,10 @@ static void nvme_ns_remove(struct nvme_ns *ns)blk_integrity_unregister (ns->disk); } -mutex_lock (&ns->ctrl->subsys->lock); -list_del_rcu (&ns->siblings); -nvme_mpath_clear_current_path (ns); -mutex_unlock (&ns->ctrl->subsys->lock); -down_write (&ns->ctrl->namespaces_rwsem);list_del_init (&ns->list);up_write (&ns->ctrl->namespaces_rwsem); -synchronize_srcu (&ns->head->srcu);nvme_mpath_check_last_path (ns);nvme_put_ns (ns); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 86/271 EDAC/sysfs: Fix memory leak when creating a csrow object
In reply to Greg Kroah-Hartman[ Upstream commit 585fb3d93d32dbe89e718b85009f9c322cc554cd ]
In edac_create_csrow_object(), the reference to the object is not released when adding the device to the device hierarchy fails (device_add()). This may result in a memory leak.
--- drivers/edac/edac_mc_sysfs.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/edac/edac_mc_sysfs.c +7 -1
@@ -404,6 +404,8 @@ static inline int nr_pages_per_csrow(struct csrow_info *csrow)static int edac_create_csrow_object (struct mem_ctl_info *mci,struct csrow_info *csrow,int index) { +int err; + csrow->dev.type = &csrow_attr_type; csrow->dev.bus = mci->bus; csrow->dev.groups = csrow_dev_groups;
@@ -416,7 +418,11 @@ static int edac_create_csrow_object(struct mem_ctl_info *mci,edac_dbg (0 ,"creating (virtual) csrow node %s\n" ,dev_name (&csrow->dev)); -return device_add (&csrow->dev); + err =device_add (&csrow->dev); +if (err) +put_device (&csrow->dev); + +return err; }/* Create a CSROW object under specifed edac_mc_device */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 122/271 wil6210: drop old event after wmi_call timeout
In reply to Greg Kroah-Hartman[ Upstream commit 1a276003111c0404f6bfeffe924c5a21f482428b ]
This change fixes a rare race condition of handling WMI events after wmi_call expires.
wmi_recv_cmd immediately handles an event when reply_buf is defined and a wmi_call is waiting for the event.
However, in case the wmi_call has already timed-out, there will be no waiting/running wmi_call and the event will be queued in WMI queue and will be handled later in wmi_event_handle.
Meanwhile, a new similar wmi_call for the same command and event may be issued. In this case, when handling the queued event we got WARN_ON printed.
Fixing this case as a valid timeout and drop the unexpected event.
--- drivers/net/wireless/ath/wil6210/wmi.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/wil6210/wmi.c +12 -1
@@ -2816,7 +2816,18 @@ static void wmi_event_handle(struct wil6210_priv *wil,/* check if someone waits for this event */ if (wil->reply_id && wil->reply_id == id && wil->reply_mid == mid) { -WARN_ON (wil->reply_buf); +if (wil->reply_buf) { +/* event received while wmi_call is waiting +* with a buffer. Such event should be handled +* in wmi_recv_cmd function. Handling the event +* here means a previous wmi_call was timeout. +* Drop the event and do not handle it. +*/ +wil_err (wil, +"Old event (%d, %s) while wmi_call is waiting. Drop it and Continue waiting\n" , + id,eventid2name (id)); +return ; + }wmi_evt_call_handler (vif, id, evt_data, len -sizeof (*wmi));
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 131/271 ath10k: destroy sdio workqueue while remove sdio module
In reply to Greg Kroah-Hartman[ Upstream commit 3ed39f8e747a7aafeec07bb244f2c3a1bdca5730 ]
The workqueue need to flush and destory while remove sdio module, otherwise it will have thread which is not destory after remove sdio modules.
Tested with QCA6174 SDIO with firmware
WLAN.RMH.4.4.1-00007-QCARMSWP-1.
--- drivers/net/wireless/ath/ath10k/sdio.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/ath/ath10k/sdio.c +3 -0
@@ -2073,6 +2073,9 @@ static void ath10k_sdio_remove(struct sdio_func *func)cancel_work_sync (&ar_sdio->wr_async_work);ath10k_core_unregister (ar);ath10k_core_destroy (ar); + +flush_workqueue (ar_sdio->workqueue); +destroy_workqueue (ar_sdio->workqueue); }static const struct sdio_device_id ath10k_sdio_devices[] = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 78/271 perf/x86/intel/uncore: Handle invalid event coding for free-running counter
In reply to Greg Kroah-Hartman[ Upstream commit 543ac280b3576c0009e8c0fcd4d6bfc9978d7bd0 ]
Counting with invalid event coding for free-running counter may cause OOPs, e.g. uncore_iio_free_running_0/event=1/.
Current code only validate the event with free-running event format, event=0xff,umask=0xXY. Non-free-running event format never be checked for the PMU with free-running counters.
Add generic hw_config() to check and reject the invalid event coding for free-running PMU.
--- arch/x86/events/intel/uncore.h | 10 ++++++++++ arch/x86/events/intel/uncore_snbep.c | 1 + 2 files changed, 11 insertions(+)
arch/x86/events/intel/uncore.h +10 -0
@@ -402,6 +402,16 @@ static inline bool is_freerunning_event(struct perf_event *event) (((cfg >>8 ) &0xff ) >=UNCORE_FREERUNNING_UMASK_START ); } +/* Check and reject invalid config */ +static inline int uncore_freerunning_hw_config (struct intel_uncore_box *box, +struct perf_event *event) +{ +if (is_freerunning_event (event)) +return 0 ; + +return -EINVAL ; +} +static inline void uncore_disable_box (struct intel_uncore_box *box) {if (box->pmu->type->ops->disable_box)
arch/x86/events/intel/uncore_snbep.c +1 -0
@@ -3585,6 +3585,7 @@ static struct uncore_event_desc skx_uncore_iio_freerunning_events[] = {static struct intel_uncore_ops skx_uncore_iio_freerunning_ops = { .read_counter = uncore_msr_read_counter, + .hw_config = uncore_freerunning_hw_config, };static struct attribute *skx_uncore_iio_freerunning_formats_attr[] = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 134/271 iwlwifi: mvm: Drop large non sta frames
In reply to Greg Kroah-Hartman[ Upstream commit ac70499ee97231a418dc1a4d6c9dc102e8f64631 ]
In some buggy scenarios we could possible attempt to transmit frames larger than maximum MSDU size. Since our devices don't know how to handle this, it may result in asserts, hangs etc.
This can happen, for example, when we receive a large multicast frame and try to transmit it back to the air in AP mode.
Since in a legal scenario this should never happen, drop such frames and warn about it.
--- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/intel/iwlwifi/mvm/tx.c +3 -0
@@ -641,6 +641,9 @@ int iwl_mvm_tx_skb_non_sta(struct iwl_mvm *mvm, struct sk_buff *skb)memcpy (&info, skb->cb,sizeof (info)); +if (WARN_ON_ONCE (skb->len >IEEE80211_MAX_DATA_LEN + hdrlen)) +return -1 ; +if (WARN_ON_ONCE (info.flags &IEEE80211_TX_CTL_AMPDU ))return -1 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 135/271 bpf: fix uapi bpf_prog_info fields alignment
In reply to Greg Kroah-Hartman[ Upstream commit 0472301a28f6cf53a6bc5783e48a2d0bbff4682f ]
Merge commit 1c8c5a9d38f60 ("Mergegit://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next") undid the fix from commit 36f9814a494 ("bpf: fix uapi hole for 32 bit compat applications") by taking the gpl_compatible 1-bit field definition from commit b85fab0e67b162 ("bpf: Add gpl_compatible flag to struct bpf_prog_info") as is. That breaks architectures with 16-bit alignment like m68k. Add 31-bit pad after gpl_compatible to restore alignment of following fields.
Thanks to Dmitry V. Levin his analysis of this bug history.
--- include/uapi/linux/bpf.h | 1 + tools/include/uapi/linux/bpf.h | 1 + 2 files changed, 2 insertions(+)
include/uapi/linux/bpf.h +1 -0
@@ -2486,6 +2486,7 @@ struct bpf_prog_info {char name[BPF_OBJ_NAME_LEN ];__u32 ifindex; __u32 gpl_compatible:1; + __u32 :31 ;/* alignment pad */ __u64 netns_dev;__u64 netns_ino;__u32 nr_jited_ksyms;
tools/include/uapi/linux/bpf.h +1 -0
@@ -2484,6 +2484,7 @@ struct bpf_prog_info {char name[BPF_OBJ_NAME_LEN ];__u32 ifindex; __u32 gpl_compatible:1; + __u32 :31 ;/* alignment pad */ __u64 netns_dev;__u64 netns_ino;__u32 nr_jited_ksyms;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 136/271 perf stat: Make metric event lookup more robust
In reply to Greg Kroah-Hartman[ Upstream commit 145c407c808352acd625be793396fd4f33c794f8 ]
After setting up metric groups through the event parser, the metricgroup code looks them up again in the event list.
Make sure we only look up events that haven't been used by some other metric. The data structures currently cannot handle more than one metric per event. This avoids problems with multiple events partially overlapping.
--- tools/perf/util/stat-shadow.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tools/perf/util/stat-shadow.c +3 -2
@@ -303,7 +303,7 @@ static struct perf_evsel *perf_stat__find_event(struct perf_evlist *evsel_list,struct perf_evsel *c2; evlist__for_each_entry (evsel_list, c2) { -if (!strcasecmp (c2->name, name)) +if (!strcasecmp (c2->name, name) && !c2->collect_stat)return c2; }return NULL ;
@@ -342,7 +342,8 @@ void perf_stat__collect_metric_expr(struct perf_evlist *evsel_list)if (leader) {/* Search in group */ for_each_group_member (oc, leader) { -if (!strcasecmp (oc->name, metric_names[i])) { +if (!strcasecmp (oc->name, metric_names[i]) && + !oc->collect_stat) { found = true;break ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 139/271 net: usb: asix: init MAC address buffers
In reply to Greg Kroah-Hartman[ Upstream commit 78226f6eaac80bf30256a33a4926c194ceefdf36 ]
This is for fixing bug KMSAN: uninit-value in ax88772_bind
Tested by
https://groups.google.com/d/msg/syzkaller-bugs/aFQurGotng4/eB_HlNhhCwAJ
syzbot found the following crash on:
HEAD commit: f75e4cfe kmsan: use kmsan_handle_urb() in urb.c git tree: kmsan console output: https://syzkaller.appspot.com/x/log.txt?x=136d720ea00000
kernel config:
https://syzkaller.appspot.com/x/.config?x=602468164ccdc30a
dashboard link:
https://syzkaller.appspot.com/bug?extid=8a3fc6674bbc3978ed4e
compiler: clang version 9.0.0 (/home/glider/llvm/clang06d00afa61eef8f7f501ebdb4e8612ea43ec2d78)
syz repro:
https://syzkaller.appspot.com/x/repro.syz?x=12788316a00000
C reproducer: https://syzkaller.appspot.com/x/repro.c?x=120359aaa00000
==================================================================
BUG: KMSAN: uninit-value in is_valid_ether_addr include/linux/etherdevice.h:200 [inline] BUG: KMSAN: uninit-value in asix_set_netdev_dev_addr drivers/net/usb/asix_devices.c:73 [inline] BUG: KMSAN: uninit-value in ax88772_bind+0x93d/0x11e0 drivers/net/usb/asix_devices.c:724 CPU: 0 PID: 3348 Comm: kworker/0:2 Not tainted 5.1.0+ #1 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Workqueue: usb_hub_wq hub_event Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x191/0x1f0 lib/dump_stack.c:113 kmsan_report+0x130/0x2a0 mm/kmsan/kmsan.c:622 __msan_warning+0x75/0xe0 mm/kmsan/kmsan_instr.c:310 is_valid_ether_addr include/linux/etherdevice.h:200 [inline] asix_set_netdev_dev_addr drivers/net/usb/asix_devices.c:73 [inline] ax88772_bind+0x93d/0x11e0 drivers/net/usb/asix_devices.c:724 usbnet_probe+0x10f5/0x3940 drivers/net/usb/usbnet.c:1728 usb_probe_interface+0xd66/0x1320 drivers/usb/core/driver.c:361 really_probe+0xdae/0x1d80 drivers/base/dd.c:513 driver_probe_device+0x1b3/0x4f0 drivers/base/dd.c:671 __device_attach_driver+0x5b8/0x790 drivers/base/dd.c:778 bus_for_each_drv+0x28e/0x3b0 drivers/base/bus.c:454 __device_attach+0x454/0x730 drivers/base/dd.c:844 device_initial_probe+0x4a/0x60 drivers/base/dd.c:891 bus_probe_device+0x137/0x390 drivers/base/bus.c:514 device_add+0x288d/0x30e0 drivers/base/core.c:2106 usb_set_configuration+0x30dc/0x3750 drivers/usb/core/message.c:2027 generic_probe+0xe7/0x280 drivers/usb/core/generic.c:210 usb_probe_device+0x14c/0x200 drivers/usb/core/driver.c:266 really_probe+0xdae/0x1d80 drivers/base/dd.c:513 driver_probe_device+0x1b3/0x4f0 drivers/base/dd.c:671 __device_attach_driver+0x5b8/0x790 drivers/base/dd.c:778 bus_for_each_drv+0x28e/0x3b0 drivers/base/bus.c:454 __device_attach+0x454/0x730 drivers/base/dd.c:844 device_initial_probe+0x4a/0x60 drivers/base/dd.c:891 bus_probe_device+0x137/0x390 drivers/base/bus.c:514 device_add+0x288d/0x30e0 drivers/base/core.c:2106 usb_new_device+0x23e5/0x2ff0 drivers/usb/core/hub.c:2534 hub_port_connect drivers/usb/core/hub.c:5089 [inline] hub_port_connect_change drivers/usb/core/hub.c:5204 [inline] port_event drivers/usb/core/hub.c:5350 [inline] hub_event+0x48d1/0x7290 drivers/usb/core/hub.c:5432 process_one_work+0x1572/0x1f00 kernel/workqueue.c:2269 process_scheduled_works kernel/workqueue.c:2331 [inline] worker_thread+0x189c/0x2460 kernel/workqueue.c:2417 kthread+0x4b5/0x4f0 kernel/kthread.c:254 ret_from_fork+0x35/0x40 arch/x86/entry/entry_64.S:355
--- drivers/net/usb/asix_devices.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/usb/asix_devices.c +3 -3
@@ -238,7 +238,7 @@ static void asix_phy_reset(struct usbnet *dev, unsigned int reset_bits)static int ax88172_bind (struct usbnet *dev,struct usb_interface *intf) {int ret =0 ; -u8 buf[ETH_ALEN ]; +u8 buf[ETH_ALEN ] = {0 };int i;unsigned long gpio_bits = dev->driver_info->data;
@@ -689,7 +689,7 @@ static int asix_resume(struct usb_interface *intf)static int ax88772_bind (struct usbnet *dev,struct usb_interface *intf) {int ret, i; -u8 buf[ETH_ALEN ], chipcode =0 ; +u8 buf[ETH_ALEN ] = {0 }, chipcode =0 ;u32 phyid;struct asix_common_private *priv;
@@ -1073,7 +1073,7 @@ static const struct net_device_ops ax88178_netdev_ops = {static int ax88178_bind (struct usbnet *dev,struct usb_interface *intf) {int ret; -u8 buf[ETH_ALEN ]; +u8 buf[ETH_ALEN ] = {0 };usbnet_get_endpoints (dev,intf);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 140/271 rxrpc: Fix oops in tracepoint
In reply to Greg Kroah-Hartman[ Upstream commit 99f0eae653b2db64917d0b58099eb51e300b311d ]
If the rxrpc_eproto tracepoint is enabled, an oops will be cause by the trace line that rxrpc_extract_header() tries to emit when a protocol error occurs (typically because the packet is short) because the call argument is NULL.
Fix this by using ?: to assume 0 as the debug_id if call is NULL.
This can then be induced by:
echo -e '\0\0\0\0\0\0\0\0' | ncat -4u --send-only <addr> 20001
where addr has the following program running on it:
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include <linux/rxrpc.h>
int main(void)
{
struct sockaddr_rxrpc srx;
int fd;
memset(&srx, 0, sizeof(srx));
srx.srx_family = AF_RXRPC;
srx.srx_service = 0;
srx.transport_type = AF_INET;
srx.transport_len = sizeof(srx.transport.sin);
srx.transport.sin.sin_family = AF_INET;
srx.transport.sin.sin_port = htons(0x4e21);
fd = socket(AF_RXRPC, SOCK_DGRAM, AF_INET6);
bind(fd, (struct sockaddr *)&srx, sizeof(srx));
sleep(20);
return 0;
}It results in the following oops.
BUG: kernel NULL pointer dereference, address: 0000000000000340 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page ... RIP: 0010:trace_event_raw_event_rxrpc_rx_eproto+0x47/0xac ... Call Trace: <IRQ> rxrpc_extract_header+0x86/0x171 ? rcu_read_lock_sched_held+0x5d/0x63 ? rxrpc_new_skb+0xd4/0x109 rxrpc_input_packet+0xef/0x14fc ? rxrpc_input_data+0x986/0x986 udp_queue_rcv_one_skb+0xbf/0x3d0 udp_unicast_rcv_skb.isra.8+0x64/0x71 ip_protocol_deliver_rcu+0xe4/0x1b4 ip_local_deliver+0xf0/0x154 __netif_receive_skb_one_core+0x50/0x6c netif_receive_skb_internal+0x26b/0x2e9 napi_gro_receive+0xf8/0x1da rtl8169_poll+0x303/0x4c4 net_rx_action+0x10e/0x333 __do_softirq+0x1a5/0x38f irq_exit+0x54/0xc4 do_IRQ+0xda/0xf8 common_interrupt+0xf/0xf </IRQ> ... ? cpuidle_enter_state+0x23c/0x34d cpuidle_enter+0x2a/0x36 do_idle+0x163/0x1ea cpu_startup_entry+0x1d/0x1f start_secondary+0x157/0x172 secondary_startup_64+0xa4/0xb0
--- include/trace/events/rxrpc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/trace/events/rxrpc.h +1 -1
@@ -1381,7 +1381,7 @@ TRACE_EVENT(rxrpc_rx_eproto, ), TP_fast_assign( - __entry->call = call->debug_id; + __entry->call = call ? call->debug_id : 0; __entry->serial = serial; __entry->why = why; ),
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 141/271 bpf, libbpf, smatch: Fix potential NULL pointer dereference
In reply to Greg Kroah-Hartman[ Upstream commit 33bae185f74d49a0d7b1bfaafb8e959efce0f243 ]
Based on the following report from Smatch, fix the potential NULL pointer dereference check:
tools/lib/bpf/libbpf.c:3493
bpf_prog_load_xattr() warn: variable dereferenced before check 'attr' (see line 3483)
3479 int bpf_prog_load_xattr(const struct bpf_prog_load_attr *attr,
3480 struct bpf_object **pobj, int *prog_fd)
3481 {
3482 struct bpf_object_open_attr open_attr = {
3483 .file = attr->file,
3484 .prog_type = attr->prog_type,
^^^^^^3485 };
At the head of function, it directly access 'attr' without checking if it's NULL pointer. This patch moves the values assignment after validating 'attr' and 'attr->file'.
--- tools/lib/bpf/libbpf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/lib/bpf/libbpf.c +4 -4
@@ -2293,10 +2293,7 @@ int bpf_prog_load(const char *file, enum bpf_prog_type type,int bpf_prog_load_xattr (const struct bpf_prog_load_attr *attr,struct bpf_object **pobj,int *prog_fd) { -struct bpf_object_open_attr open_attr = { - .file = attr->file, - .prog_type = attr->prog_type, - }; +struct bpf_object_open_attr open_attr = {};struct bpf_program *prog, *first_prog =NULL ;enum bpf_attach_type expected_attach_type;enum bpf_prog_type prog_type;
@@ -2309,6 +2306,9 @@ int bpf_prog_load_xattr(const struct bpf_prog_load_attr *attr,if (!attr->file)return -EINVAL ; + open_attr.file = attr->file; + open_attr.prog_type = attr->prog_type; + obj =bpf_object__open_xattr (&open_attr);if (IS_ERR_OR_NULL (obj))return -ENOENT ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 123/271 EDAC: Fix global-out-of-bounds write when setting edac_mc_poll_msec
In reply to Greg Kroah-Hartman[ Upstream commit d8655e7630dafa88bc37f101640e39c736399771 ]
Commit 9da21b1509d8 ("EDAC: Poll timeout cannot be zero, p2") assumes edac_mc_poll_msec to be unsigned long, but the type of the variable still remained as int. Setting edac_mc_poll_msec can trigger out-of-bounds write.
Reproducer:
# echo 1001 > /sys/module/edac_core/parameters/edac_mc_poll_msec
KASAN report:
BUG: KASAN: global-out-of-bounds in edac_set_poll_msec+0x140/0x150
Write of size 8 at addr ffffffffb91b2d00 by task bash/1996
CPU: 1 PID: 1996 Comm: bash Not tainted 5.2.0-rc6+ #23
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.12.0-2.fc30 04/01/2014
Call Trace:
dump_stack+0xca/0x13e
print_address_description.cold+0x5/0x246
__kasan_report.cold+0x75/0x9a
? edac_set_poll_msec+0x140/0x150
kasan_report+0xe/0x20
edac_set_poll_msec+0x140/0x150
? dimmdev_location_show+0x30/0x30
? vfs_lock_file+0xe0/0xe0
? _raw_spin_lock+0x87/0xe0
param_attr_store+0x1b5/0x310
? param_array_set+0x4f0/0x4f0
module_attr_store+0x58/0x80
? module_attr_show+0x80/0x80
sysfs_kf_write+0x13d/0x1a0
kernfs_fop_write+0x2bc/0x460
? sysfs_kf_bin_read+0x270/0x270
? kernfs_notify+0x1f0/0x1f0
__vfs_write+0x81/0x100
vfs_write+0x1e1/0x560
ksys_write+0x126/0x250
? __ia32_sys_read+0xb0/0xb0
? do_syscall_64+0x1f/0x390
do_syscall_64+0xc1/0x390
entry_SYSCALL_64_after_hwframe+0x49/0xbe
RIP: 0033:0x7fa7caa5e970
Code: 73 01 c3 48 8b 0d 28 d5 2b 00 f7 d8 64 89 01 48 83 c8 ff c3 66 0f 1f 44 00 00 83 3d 99 2d 2c 00 00 75 10 b8 01 00 00 00 04
RSP: 002b:00007fff6acfdfe8 EFLAGS: 00000246 ORIG_RAX: 0000000000000001
RAX: ffffffffffffffda RBX: 0000000000000005 RCX: 00007fa7caa5e970
RDX: 0000000000000005 RSI: 0000000000e95c08 RDI: 0000000000000001
RBP: 0000000000e95c08 R08: 00007fa7cad1e760 R09: 00007fa7cb36a700
R10: 0000000000000073 R11: 0000000000000246 R12: 0000000000000005
R13: 0000000000000001 R14: 00007fa7cad1d600 R15: 0000000000000005
The buggy address belongs to the variable:
edac_mc_poll_msec+0x0/0x40
Memory state around the buggy address:
ffffffffb91b2c00: 00 00 00 00 fa fa fa fa 00 00 00 00 fa fa fa fa
ffffffffb91b2c80: 00 00 00 00 fa fa fa fa 00 00 00 00 fa fa fa fa
>ffffffffb91b2d00: 04 fa fa fa fa fa fa fa 04 fa fa fa fa fa fa fa
^
ffffffffb91b2d80: 04 fa fa fa fa fa fa fa 00 00 00 00 00 00 00 00
ffffffffb91b2e00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00Fix it by changing the type of edac_mc_poll_msec to unsigned int. The reason why this patch adopts unsigned int rather than unsigned long is msecs_to_jiffies() assumes arg to be unsigned int. We can avoid integer conversion bugs and unsigned int will be large enough for edac_mc_poll_msec.
--- drivers/edac/edac_mc_sysfs.c | 16 ++++++++-------- drivers/edac/edac_module.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-)
drivers/edac/edac_mc_sysfs.c +8 -8
@@ -26,7 +26,7 @@static int edac_mc_log_ue =1 ;static int edac_mc_log_ce =1 ;static int edac_mc_panic_on_ue; -static int edac_mc_poll_msec =1000 ; +static unsigned int edac_mc_poll_msec =1000 ;/* Getter functions for above */ int edac_mc_get_log_ue (void )
@@ -45,30 +45,30 @@ int edac_mc_get_panic_on_ue(void) }/* this is temporary */ -int edac_mc_get_poll_msec (void ) +unsigned int edac_mc_get_poll_msec (void ) {return edac_mc_poll_msec; }static int edac_set_poll_msec (const char *val,const struct kernel_param *kp) { -unsigned long l; +unsigned int i;int ret;if (!val)return -EINVAL ; - ret =kstrtoul (val,0 , &l); + ret =kstrtouint (val,0 , &i);if (ret)return ret; -if (l <1000 ) +if (i <1000 )return -EINVAL ; - *((unsigned long *)kp->arg) = l; + *((unsigned int *)kp->arg) = i;/* notify edac_mc engine to reset the poll period */ -edac_mc_reset_delay_period (l); +edac_mc_reset_delay_period (i);return 0 ; }
@@ -82,7 +82,7 @@ MODULE_PARM_DESC(edac_mc_log_ue,module_param (edac_mc_log_ce, int,0644 );MODULE_PARM_DESC (edac_mc_log_ce,"Log correctable error to console: 0=off 1=on" ); -module_param_call (edac_mc_poll_msec, edac_set_poll_msec, param_get_int, +module_param_call (edac_mc_poll_msec, edac_set_poll_msec, param_get_uint, &edac_mc_poll_msec,0644 );MODULE_PARM_DESC (edac_mc_poll_msec,"Polling period in milliseconds" );
drivers/edac/edac_module.h +1 -1
@@ -36,7 +36,7 @@ extern int edac_mc_get_log_ue(void);extern int edac_mc_get_log_ce (void );extern int edac_mc_get_panic_on_ue (void );extern int edac_get_poll_msec (void ); -extern int edac_mc_get_poll_msec (void ); +extern unsigned int edac_mc_get_poll_msec (void );unsigned edac_dimm_info_location (struct dimm_info *dimm,char *buf,unsigned len);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 142/271 selftests: bpf: fix inlines in test_lwt_seg6local
In reply to Greg Kroah-Hartman[ Upstream commit 11aca65ec4db09527d3e9b6b41a0615b7da4386b ]
Selftests are reporting this failure in test_lwt_seg6local.sh:
+ ip netns exec ns2 ip -6 route add fb00::6 encap bpf in obj test_lwt_seg6local.o sec encap_srh dev veth2 Error fetching program/map!
Failed to parse eBPF program: Operation not permitted
The problem is __attribute__((always_inline)) alone is not enough to prevent clang from inserting those functions in .text. In that case, .text is not marked as relocateable.
See the output of objdump -h test_lwt_seg6local.o:
Idx Name Size VMA LMA File off Algn 0 .text 00003530 0000000000000000 0000000000000000 00000040 2**3
CONTENTS, ALLOC, LOAD, READONLY, CODE
This causes the iproute bpf loader to fail in bpf_fetch_prog_sec:bpf_has_call_data returns true but bpf_fetch_prog_relo fails as there's no relocateable .text section in the file.
To fix this, convert to 'static __always_inline'.
v2: Use 'static __always_inline' instead of 'static inline
__attribute__((always_inline))'
--- tools/testing/selftests/bpf/test_lwt_seg6local.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
tools/testing/selftests/bpf/test_lwt_seg6local.c +6 -6
@@ -61,7 +61,7 @@ struct sr6_tlv_t {unsigned char value[0 ]; }BPF_PACKET_HEADER ; -__attribute__((always_inline))struct ip6_srh_t *get_srh (struct __sk_buff *skb) +static __always_inline struct ip6_srh_t *get_srh(struct __sk_buff *skb) {void *cursor, *data_end;struct ip6_srh_t *srh;
@@ -95,7 +95,7 @@ __attribute__((always_inline)) struct ip6_srh_t *get_srh(struct __sk_buff *skb)return srh; } -__attribute__((always_inline)) +static __always_inline int update_tlv_pad(struct __sk_buff *skb, uint32_t new_pad,uint32_t old_pad,uint32_t pad_off) {
@@ -125,7 +125,7 @@ int update_tlv_pad(struct __sk_buff *skb, uint32_t new_pad,return 0 ; } -__attribute__((always_inline)) +static __always_inline int is_valid_tlv_boundary(struct __sk_buff *skb, struct ip6_srh_t *srh,uint32_t *tlv_off,uint32_t *pad_size,uint32_t *pad_off)
@@ -184,7 +184,7 @@ int is_valid_tlv_boundary(struct __sk_buff *skb, struct ip6_srh_t *srh,return 0 ; } -__attribute__((always_inline)) +static __always_inline int add_tlv(struct __sk_buff *skb, struct ip6_srh_t *srh, uint32_t tlv_off,struct sr6_tlv_t *itlv,uint8_t tlv_size) {
@@ -228,7 +228,7 @@ int add_tlv(struct __sk_buff *skb, struct ip6_srh_t *srh, uint32_t tlv_off,return update_tlv_pad (skb, new_pad, pad_size, pad_off); } -__attribute__((always_inline)) +static __always_inline int delete_tlv(struct __sk_buff *skb, struct ip6_srh_t *srh,uint32_t tlv_off) {
@@ -266,7 +266,7 @@ int delete_tlv(struct __sk_buff *skb, struct ip6_srh_t *srh,return update_tlv_pad (skb, new_pad, pad_size, pad_off); } -__attribute__((always_inline)) +static __always_inline int has_egr_tlv(struct __sk_buff *skb, struct ip6_srh_t *srh) { int tlv_offset = sizeof(struct ip6_t) + sizeof(struct ip6_srh_t) +
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 144/271 gpiolib: Fix references to gpiod_[gs]et_*value_cansleep() variants
In reply to Greg Kroah-Hartman[ Upstream commit 3285170f28a850638794cdfe712eb6d93e51e706 ]
Commit 372e722ea4dd4ca1 ("gpiolib: use descriptors internally") renamed the functions to use a "gpiod" prefix, and commit 79a9becda8940deb ("gpiolib: export descriptor-based GPIO interface") introduced the "raw" variants, but both changes forgot to update the comments.
Readd a similar reference to gpiod_set_value(), which was accidentally removed by commit 1e77fc82110ac36f ("gpio: Add missing open drain/source handling to gpiod_set_value_cansleep()").
--- drivers/gpio/gpiolib.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpio/gpiolib.c +4 -3
@@ -2877,7 +2877,7 @@ int gpiod_get_array_value_complex(bool raw, bool can_sleep,int gpiod_get_raw_value (const struct gpio_desc *desc) {VALIDATE_DESC (desc); -/* Should be using gpio_get_value_cansleep() */ +/* Should be using gpiod_get_raw_value_cansleep() */ WARN_ON (desc->gdev->chip->can_sleep);return gpiod_get_raw_value_commit (desc); }
@@ -2898,7 +2898,7 @@ int gpiod_get_value(const struct gpio_desc *desc)int value;VALIDATE_DESC (desc); -/* Should be using gpio_get_value_cansleep() */ +/* Should be using gpiod_get_value_cansleep() */ WARN_ON (desc->gdev->chip->can_sleep); value =gpiod_get_raw_value_commit (desc);
@@ -3123,7 +3123,7 @@ int gpiod_set_array_value_complex(bool raw, bool can_sleep,void gpiod_set_raw_value (struct gpio_desc *desc,int value) {VALIDATE_DESC_VOID (desc); -/* Should be using gpiod_set_value_cansleep() */ +/* Should be using gpiod_set_raw_value_cansleep() */ WARN_ON (desc->gdev->chip->can_sleep);gpiod_set_raw_value_commit (desc, value); }
@@ -3164,6 +3164,7 @@ static void gpiod_set_value_nocheck(struct gpio_desc *desc, int value)void gpiod_set_value (struct gpio_desc *desc,int value) {VALIDATE_DESC_VOID (desc); +/* Should be using gpiod_set_value_cansleep() */ WARN_ON (desc->gdev->chip->can_sleep);gpiod_set_value_nocheck (desc, value); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 145/271 tools: bpftool: Fix json dump crash on powerpc
In reply to Greg Kroah-Hartman[ Upstream commit aa52bcbe0e72fac36b1862db08b9c09c4caefae3 ]
Michael reported crash with by bpf program in json mode on powerpc:
# bpftool prog -p dump jited id 14
[{
"name": "0xd00000000a9aa760",
"insns": [{
"pc": "0x0",
"operation": "nop",
"operands": [null
]
},{
"pc": "0x4",
"operation": "nop",
"operands": [null
]
},{
"pc": "0x8",
"operation": "mflr",
Segmentation fault (core dumped)The code is assuming char pointers in format, which is not always true at least for powerpc. Fixing this by dumping the whole string into buffer based on its format.
Please note that libopcodes code does not check return values from fprintf callback, but as per Jakub suggestion returning -1 on allocation failure so we do the best effort to propagate the error.
--- tools/bpf/bpftool/jit_disasm.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
tools/bpf/bpftool/jit_disasm.c +7 -4
@@ -10,6 +10,8 @@* Licensed under the GNU General Public License, version 2.0 (GPLv2) */ +#define _GNU_SOURCE +#include <stdio.h> #include <stdarg.h> #include <stdint.h> #include <stdio.h>
@@ -51,11 +53,13 @@ static int fprintf_json(void *out, const char *fmt, ...)char *s;va_start (ap, fmt); +if (vasprintf (&s, fmt, ap) <0 ) +return -1 ; +va_end (ap); +if (!oper_count) {int i; - s = va_arg(ap, char *); -/* Strip trailing spaces */ i =strlen (s) -1 ;while (s[i] ==' ' )
@@ -68,11 +72,10 @@ static int fprintf_json(void *out, const char *fmt, ...) }else if (!strcmp (fmt,"," )) {/* Skip */ }else { - s = va_arg(ap, char *);jsonw_string (json_wtr, s); oper_count++; } -va_end (ap); +free (s);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 146/271 Bluetooth: hci_bcsp: Fix memory leak in rx_skb
In reply to Greg Kroah-Hartman[ Upstream commit 4ce9146e0370fcd573f0372d9b4e5a211112567c ]
Syzkaller found that it is possible to provoke a memory leak by never freeing rx_skb in struct bcsp_struct.
Fix by freeing in bcsp_close()
--- drivers/bluetooth/hci_bcsp.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/bluetooth/hci_bcsp.c +5 -0
@@ -759,6 +759,11 @@ static int bcsp_close(struct hci_uart *hu)skb_queue_purge (&bcsp->rel);skb_queue_purge (&bcsp->unrel); +if (bcsp->rx_skb) { +kfree_skb (bcsp->rx_skb); + bcsp->rx_skb =NULL ; + } +kfree (bcsp);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 147/271 Bluetooth: Add new 13d3:3491 QCA_ROME device
In reply to Greg Kroah-Hartman[ Upstream commit 44d34af2e4cfd0c5357182f8b43f3e0a1fe30a2e ]
Without the QCA ROME setup routine this adapter fails to establish a SCO connection.
T: Bus=01 Lev=01 Prnt=01 Port=08 Cnt=01 Dev#= 2 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=13d3 ProdID=3491 Rev=00.01 C: #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA I: If#=0x0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb I: If#=0x1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
--- drivers/bluetooth/btusb.c | 1 + 1 file changed, 1 insertion(+)
drivers/bluetooth/btusb.c +1 -0
@@ -277,6 +277,7 @@ static const struct usb_device_id blacklist_table[] = { { USB_DEVICE(0x04ca, 0x3015), .driver_info = BTUSB_QCA_ROME }, { USB_DEVICE(0x04ca, 0x3016), .driver_info = BTUSB_QCA_ROME }, { USB_DEVICE(0x04ca, 0x301a), .driver_info = BTUSB_QCA_ROME }, + { USB_DEVICE(0x13d3, 0x3491), .driver_info = BTUSB_QCA_ROME }, { USB_DEVICE(0x13d3, 0x3496), .driver_info = BTUSB_QCA_ROME },/* Broadcom BCM2035 */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 149/271 Bluetooth: 6lowpan: search for destination address in all peers
In reply to Greg Kroah-Hartman[ Upstream commit b188b03270b7f8568fc714101ce82fbf5e811c5a ]
Handle overlooked case where the target address is assigned to a peer and neither route nor gateway exist.
For one peer, no checks are performed to see if it is meant to receive packets for a given address.
As soon as there is a second peer however, checks are performed to deal with routes and gateways for handling complex setups with multiple hops to a target address.
This logic assumed that no route and no gateway imply that the destination address can not be reached, which is false in case of a direct peer.
--- net/bluetooth/6lowpan.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
net/bluetooth/6lowpan.c +10 -4
@@ -187,10 +187,16 @@ static inline struct lowpan_peer *peer_lookup_dst(struct lowpan_btle_dev *dev, }if (!rt) { - nexthop = &lowpan_cb (skb)->gw; - -if (ipv6_addr_any (nexthop)) -return NULL ; +if (ipv6_addr_any (&lowpan_cb (skb)->gw)) { +/* There is neither route nor gateway, +* probably the destination is a direct peer. +*/ + nexthop = daddr; + }else { +/* There is a known gateway +*/ + nexthop = &lowpan_cb (skb)->gw; + } }else { nexthop =rt6_nexthop (rt, daddr);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 150/271 perf tests: Fix record+probe_libc_inet_pton.sh for powerpc64
In reply to Greg Kroah-Hartman[ Upstream commit bff5a556c149804de29347a88a884d25e4e4e3a2 ]
'probe libc's inet_pton & backtrace it with ping' testcase sometimes fails on powerpc because distro ping binary does not have symbol information and thus it prints "[unknown]" function name in the backtrace.
Accept "[unknown]" as valid function name for powerpc as well.
# perf test -v "probe libc's inet_pton & backtrace it with ping"
Before:
59: probe libc's inet_pton & backtrace it with ping :
--- start ---
test child forked, pid 79695
ping 79718 [077] 96483.787025: probe_libc:inet_pton: (7fff83a754c8) 7fff83a754c8 __GI___inet_pton+0x8 (/usr/lib64/power9/libc-2.28.so) 7fff83a2b7a0 gaih_inet.constprop.7+0x1020 (/usr/lib64/power9/libc-2.28.so)
7fff83a2c170 getaddrinfo+0x160 (/usr/lib64/power9/libc-2.28.so) 1171830f4 [unknown] (/usr/bin/ping)
FAIL: expected backtrace entry ".*\+0x[[:xdigit:]]+[[:space:]]\(.*/bin/ping.*\)$"
got "1171830f4 [unknown] (/usr/bin/ping)"
test child finished with -1
---- end ----
probe libc's inet_pton & backtrace it with ping: FAILED!
After:
59: probe libc's inet_pton & backtrace it with ping :
--- start ---
test child forked, pid 79085
ping 79108 [045] 96400.214177: probe_libc:inet_pton: (7fffbb9654c8) 7fffbb9654c8 __GI___inet_pton+0x8 (/usr/lib64/power9/libc-2.28.so) 7fffbb91b7a0 gaih_inet.constprop.7+0x1020 (/usr/lib64/power9/libc-2.28.so)
7fffbb91c170 getaddrinfo+0x160 (/usr/lib64/power9/libc-2.28.so) 132e830f4 [unknown] (/usr/bin/ping)
test child finished with 0
---- end ----
probe libc's inet_pton & backtrace it with ping: Ok
--- tools/perf/tests/shell/record+probe_libc_inet_pton.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/tests/shell/record+probe_libc_inet_pton.sh +1 -1
@@ -43,7 +43,7 @@ trace_libc_inet_pton_backtrace() { eventattr='max-stack=4' echo "gaih_inet.*\+0x[[:xdigit:]]+[[:space:]]\($libc\)$" >> $expected echo "getaddrinfo\+0x[[:xdigit:]]+[[:space:]]\($libc\)$" >> $expected - echo ".*\+0x[[:xdigit:]]+[[:space:]]\(.*/bin/ping.*\)$" >> $expected + echo ".*(\+0x[[:xdigit:]]+|\[unknown\])[[:space:]]\(.*/bin/ping.*\)$" >> $expected ;; *) eventattr='max-stack=3'
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 124/271 bcache: check CACHE_SET_IO_DISABLE in allocator code
In reply to Greg Kroah-Hartman[ Upstream commit e775339e1ae1205b47d94881db124c11385e597c ]
If CACHE_SET_IO_DISABLE of a cache set flag is set by too many I/O errors, currently allocator routines can still continue allocate space which may introduce inconsistent metadata state.
This patch checkes CACHE_SET_IO_DISABLE bit in following allocator routines,
- bch_bucket_alloc()
- __bch_bucket_alloc_set()
Once CACHE_SET_IO_DISABLE is set on cache set, the allocator routines may reject allocation request earlier to avoid potential inconsistent metadata.
--- drivers/md/bcache/alloc.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/md/bcache/alloc.c +9 -0
@@ -393,6 +393,11 @@ long bch_bucket_alloc(struct cache *ca, unsigned int reserve, bool wait)struct bucket *b;long r; + +/* No allocation if CACHE_SET_IO_DISABLE bit is set */ +if (unlikely (test_bit (CACHE_SET_IO_DISABLE , &ca->set->flags))) +return -1 ; +/* fastpath */ if (fifo_pop (&ca->free[RESERVE_NONE ], r) ||fifo_pop (&ca->free[reserve], r))
@@ -484,6 +489,10 @@ int __bch_bucket_alloc_set(struct cache_set *c, unsigned int reserve, {int i; +/* No allocation if CACHE_SET_IO_DISABLE bit is set */ +if (unlikely (test_bit (CACHE_SET_IO_DISABLE , &c->flags))) +return -1 ; +lockdep_assert_held (&c->bucket_lock);BUG_ON (!n || n > c->caches_loaded || n >8 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 151/271 Bluetooth: Check state in l2cap_disconnect_rsp
In reply to Greg Kroah-Hartman[ Upstream commit 28261da8a26f4915aa257d12d506c6ba179d961f ]
Because of both sides doing L2CAP disconnection at the same time, it was possible to receive L2CAP Disconnection Response with CID that was already freed. That caused problems if CID was already reused and L2CAP Connection Request with same CID was sent out. Before this patch kernel deleted channel context regardless of the state of the channel.
Example where leftover Disconnection Response (frame #402) causes local device to delete L2CAP channel which was not yet connected. This in turn confuses remote device's stack because same CID is re-used without properly disconnecting.
Btmon capture before patch:
** snip **
Quoted 1 line
ACL Data RX: Handle 43 flags
0x02dlen 8 #394 [hci1] 10.748949
Channel: 65 len 4 [PSM 3 mode 0] {chan 2}
RFCOMM: Disconnect (DISC) (0x43)
Address: 0x03 cr 1 dlci 0x00
Control: 0x53 poll/final 1
Length: 0
FCS: 0xfd
< ACL Data TX: Handle 43 flags 0x00 dlen 8 #395 [hci1] 10.749062
Channel: 65 len 4 [PSM 3 mode 0] {chan 2}
RFCOMM: Unnumbered Ack (UA) (0x63)
Address: 0x03 cr 1 dlci 0x00
Control: 0x73 poll/final 1
Length: 0
FCS: 0xd7< ACL Data TX: Handle 43 flags 0x00 dlen 12 #396 [hci1] 10.749073
L2CAP: Disconnection Request (0x06) ident 17 len 4
Destination CID: 65
Source CID: 65
Quoted 1 line
HCI Event: Number of Completed Packets (
0x13) plen 5 #397 [hci1] 10.752391
Num handles: 1
Handle: 43
Count: 1
Quoted 1 line
HCI Event: Number of Completed Packets (
0x13) plen 5 #398 [hci1] 10.753394
Num handles: 1
Handle: 43
Count: 1
Quoted 1 line
ACL Data RX: Handle 43 flags
0x02dlen 12 #399 [hci1] 10.756499
L2CAP: Disconnection Request (0x06) ident 26 len 4
Destination CID: 65
Source CID: 65
< ACL Data TX: Handle 43 flags 0x00 dlen 12 #400 [hci1] 10.756548
L2CAP: Disconnection Response (0x07) ident 26 len 4
Destination CID: 65
Source CID: 65
< ACL Data TX: Handle 43 flags 0x00 dlen 12 #401 [hci1] 10.757459
L2CAP: Connection Request (0x02) ident 18 len 4
PSM: 1 (0x0001)
Source CID: 65Quoted 1 line
ACL Data RX: Handle 43 flags
0x02dlen 12 #402 [hci1] 10.759148
L2CAP: Disconnection Response (0x07) ident 17 len 4
Destination CID: 65
Source CID: 65
= bluetoothd: 00:1E:AB:4C:56:54: error updating services: Input/o.. 10.759447
Quoted 1 line
HCI Event: Number of Completed Packets (
0x13) plen 5 #403 [hci1] 10.759386
Num handles: 1
Handle: 43
Count: 1
Quoted 1 line
ACL Data RX: Handle 43 flags
0x02dlen 12 #404 [hci1] 10.760397
L2CAP: Connection Request (0x02) ident 27 len 4
PSM: 3 (0x0003)
Source CID: 65
< ACL Data TX: Handle 43 flags 0x00 dlen 16 #405 [hci1] 10.760441
L2CAP: Connection Response (0x03) ident 27 len 8
Destination CID: 65
Source CID: 65
Result: Connection successful (0x0000)
Status: No further information available (0x0000)< ACL Data TX: Handle 43 flags 0x00 dlen 27 #406 [hci1] 10.760449
L2CAP: Configure Request (0x04) ident 19 len 19
Destination CID: 65
Flags: 0x0000
Option: Maximum Transmission Unit (0x01) [mandatory]
MTU: 1013
Option: Retransmission and Flow Control (0x04) [mandatory]
Mode: Basic (0x00)
TX window size: 0
Max transmit: 0
Retransmission timeout: 0
Monitor timeout: 0
Maximum PDU size: 0
Quoted 1 line
HCI Event: Number of Completed Packets (
0x13) plen 5 #407 [hci1] 10.761399
Num handles: 1
Handle: 43
Count: 1
Quoted 1 line
ACL Data RX: Handle 43 flags
0x02dlen 16 #408 [hci1] 10.762942
L2CAP: Connection Response (0x03) ident 18 len 8
Destination CID: 66
Source CID: 65
Result: Connection successful (0x0000)
Status: No further information available (0x0000)*snip*
Similar case after the patch:
*snip*
Quoted 1 line
ACL Data RX: Handle 43 flags
0x02dlen 8 #22702 [hci0] 1664.411056
Channel: 65 len 4 [PSM 3 mode 0] {chan 3}
RFCOMM: Disconnect (DISC) (0x43)
Address: 0x03 cr 1 dlci 0x00
Control: 0x53 poll/final 1
Length: 0
FCS: 0xfd
< ACL Data TX: Handle 43 flags 0x00 dlen 8 #22703 [hci0] 1664.411136
Channel: 65 len 4 [PSM 3 mode 0] {chan 3}
RFCOMM: Unnumbered Ack (UA) (0x63)
Address: 0x03 cr 1 dlci 0x00
Control: 0x73 poll/final 1
Length: 0
FCS: 0xd7< ACL Data TX: Handle 43 flags 0x00 dlen 12 #22704 [hci0] 1664.411143
L2CAP: Disconnection Request (0x06) ident 11 len 4
Destination CID: 65
Source CID: 65
Quoted 1 line
HCI Event: Number of Completed Pac.. (
0x13) plen 5 #22705 [hci0] 1664.414009
Num handles: 1
Handle: 43
Count: 1
Quoted 1 line
HCI Event: Number of Completed Pac.. (
0x13) plen 5 #22706 [hci0] 1664.415007
Num handles: 1
Handle: 43
Count: 1
Quoted 1 line
ACL Data RX: Handle 43 flags
0x02dlen 12 #22707 [hci0] 1664.418674
L2CAP: Disconnection Request (0x06) ident 17 len 4
Destination CID: 65
Source CID: 65
< ACL Data TX: Handle 43 flags 0x00 dlen 12 #22708 [hci0] 1664.418762
L2CAP: Disconnection Response (0x07) ident 17 len 4
Destination CID: 65
Source CID: 65
< ACL Data TX: Handle 43 flags 0x00 dlen 12 #22709 [hci0] 1664.421073
L2CAP: Connection Request (0x02) ident 12 len 4
PSM: 1 (0x0001)
Source CID: 65Quoted 1 line
ACL Data RX: Handle 43 flags
0x02dlen 12 #22710 [hci0] 1664.421371
L2CAP: Disconnection Response (0x07) ident 11 len 4
Destination CID: 65
Source CID: 65
Quoted 1 line
HCI Event: Number of Completed Pac.. (
0x13) plen 5 #22711 [hci0] 1664.424082
Num handles: 1
Handle: 43
Count: 1
Quoted 1 line
HCI Event: Number of Completed Pac.. (
0x13) plen 5 #22712 [hci0] 1664.425040
Num handles: 1
Handle: 43
Count: 1
Quoted 1 line
ACL Data RX: Handle 43 flags
0x02dlen 12 #22713 [hci0] 1664.426103
L2CAP: Connection Request (0x02) ident 18 len 4
PSM: 3 (0x0003)
Source CID: 65
< ACL Data TX: Handle 43 flags 0x00 dlen 16 #22714 [hci0] 1664.426186
L2CAP: Connection Response (0x03) ident 18 len 8
Destination CID: 66
Source CID: 65
Result: Connection successful (0x0000)
Status: No further information available (0x0000)< ACL Data TX: Handle 43 flags 0x00 dlen 27 #22715 [hci0] 1664.426196
L2CAP: Configure Request (0x04) ident 13 len 19
Destination CID: 65
Flags: 0x0000
Option: Maximum Transmission Unit (0x01) [mandatory]
MTU: 1013
Option: Retransmission and Flow Control (0x04) [mandatory]
Mode: Basic (0x00)
TX window size: 0
Max transmit: 0
Retransmission timeout: 0
Monitor timeout: 0
Maximum PDU size: 0
Quoted 1 line
ACL Data RX: Handle 43 flags
0x02dlen 16 #22716 [hci0] 1664.428804
L2CAP: Connection Response (0x03) ident 12 len 8
Destination CID: 66
Source CID: 65
Result: Connection successful (0x0000)
Status: No further information available (0x0000)*snip*
Fix is to check that channel is in state BT_DISCONN before deleting the channel.
This bug was found while fuzzing Bluez's OBEX implementation using Synopsys Defensics.
--- net/bluetooth/l2cap_core.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/bluetooth/l2cap_core.c +6 -0
@@ -4384,6 +4384,12 @@ static inline int l2cap_disconnect_rsp(struct l2cap_conn *conn,l2cap_chan_lock (chan); +if (chan->state !=BT_DISCONN ) { +l2cap_chan_unlock (chan); +mutex_unlock (&conn->chan_lock); +return 0 ; + } +l2cap_chan_hold (chan);l2cap_chan_del (chan,0 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 152/271 gtp: add missing gtp_encap_disable_sock() in gtp_encap_enable()
In reply to Greg Kroah-Hartman[ Upstream commit e30155fd23c9c141cbe7d99b786e10a83a328837 ]
If an invalid role is sent from user space, gtp_encap_enable() will fail. Then, it should call gtp_encap_disable_sock() but current code doesn't. It makes memory leak.
--- drivers/net/gtp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/gtp.c +6 -1
@@ -847,8 +847,13 @@ static int gtp_encap_enable(struct gtp_dev *gtp, struct nlattr *data[])if (data[IFLA_GTP_ROLE ]) { role =nla_get_u32 (data[IFLA_GTP_ROLE ]); -if (role >GTP_ROLE_SGSN ) +if (role >GTP_ROLE_SGSN ) { +if (sk0) +gtp_encap_disable_sock (sk0); +if (sk1u) +gtp_encap_disable_sock (sk1u);return -EINVAL ; + } } gtp->sk0 = sk0;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 153/271 Bluetooth: validate BLE connection interval updates
In reply to Greg Kroah-Hartman[ Upstream commit c49a8682fc5d298d44e8d911f4fa14690ea9485e ]
Problem: The Linux Bluetooth stack yields complete control over the BLE connection interval to the remote device.
The Linux Bluetooth stack provides access to the BLE connection interval min and max values through /sys/kernel/debug/bluetooth/hci0/ conn_min_interval and /sys/kernel/debug/bluetooth/hci0/conn_max_interval. These values are used for initial BLE connections, but the remote device has the ability to request a connection parameter update. In the event that the remote side requests to change the connection interval, the Linux kernel currently only validates that the desired value is within the acceptable range in the Bluetooth specification (6 - 3200, corresponding to 7.5ms - 4000ms). There is currently no validation that the desired value requested by the remote device is within the min/max limits specified in the conn_min_interval/conn_max_interval configurations. This essentially leads to Linux yielding complete control over the connection interval to the remote device.
The proposed patch adds a verification step to the connection parameter update mechanism, ensuring that the desired value is within the min/max bounds of the current connection. If the desired value is outside of the current connection min/max values, then the connection parameter update request is rejected and the negative response is returned to the remote device. Recall that the initial connection is established using the local conn_min_interval/conn_max_interval values, so this allows the Linux administrator to retain control over the BLE connection interval.
The one downside that I see is that the current default Linux values for conn_min_interval and conn_max_interval typically correspond to 30ms and 50ms respectively. If this change were accepted, then it is feasible that some devices would no longer be able to negotiate to their desired connection interval values. This might be remedied by setting the default Linux conn_min_interval and conn_max_interval values to the widest supported range (6 - 3200 / 7.5ms - 4000ms). This could lead to the same behavior as the current implementation, where the remote device could request to change the connection interval value to any value that is permitted by the Bluetooth specification, and Linux would accept the desired value.
--- net/bluetooth/hci_event.c | 5 +++++ net/bluetooth/l2cap_core.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-)
net/bluetooth/hci_event.c +5 -0
@@ -5545,6 +5545,11 @@ static void hci_le_remote_conn_param_req_evt(struct hci_dev *hdev,return send_conn_param_neg_reply (hdev, handle,HCI_ERROR_UNKNOWN_CONN_ID ); +if (min < hcon->le_conn_min_interval || + max > hcon->le_conn_max_interval) +return send_conn_param_neg_reply (hdev, handle, +HCI_ERROR_INVALID_LL_PARAMS ); +if (hci_check_conn_params (min, max, latency, timeout))return send_conn_param_neg_reply (hdev, handle,HCI_ERROR_INVALID_LL_PARAMS );
net/bluetooth/l2cap_core.c +8 -1
@@ -5287,7 +5287,14 @@ static inline int l2cap_conn_param_update_req(struct l2cap_conn *conn,memset (&rsp,0 ,sizeof (rsp)); - err =hci_check_conn_params (min, max, latency, to_multiplier); +if (min < hcon->le_conn_min_interval || + max > hcon->le_conn_max_interval) { +BT_DBG ("requested connection interval exceeds current bounds." ); + err = -EINVAL ; + }else { + err =hci_check_conn_params (min, max, latency, to_multiplier); + } +if (err) rsp.result =cpu_to_le16 (L2CAP_CONN_PARAM_REJECTED );else
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 155/271 gtp: fix Illegal context switch in RCU read-side critical section.
In reply to Greg Kroah-Hartman[ Upstream commit 3f167e1921865b379a9becf03828e7202c7b4917 ]
ipv4_pdp_add() is called in RCU read-side critical section. So GFP_KERNEL should not be used in the function.
This patch make ipv4_pdp_add() to use GFP_ATOMIC instead of GFP_KERNEL.
Test commands:
gtp-link add gtp1 &
gtp-tunnel add gtp1 v1 100 200 1.1.1.1 2.2.2.2
Splat looks like:
[ 130.618881] =============================
[ 130.626382] WARNING: suspicious RCU usage
[ 130.626994] 5.2.0-rc6+ #50 Not tainted
[ 130.627622] -----------------------------
[ 130.628223] ./include/linux/rcupdate.h:266 Illegal context switch in RCU read-side critical section!
[ 130.629684]
[ 130.629684] other info that might help us debug this:
[ 130.629684]
[ 130.631022]
[ 130.631022] rcu_scheduler_active = 2, debug_locks = 1
[ 130.632136] 4 locks held by gtp-tunnel/1025:
[ 130.632925] #0: 000000002b93c8b7 (cb_lock){++++}, at: genl_rcv+0x15/0x40
[ 130.634159] #1: 00000000f17bc999 (genl_mutex){+.+.}, at: genl_rcv_msg+0xfb/0x130
[ 130.635487] #2: 00000000c644ed8e (rtnl_mutex){+.+.}, at: gtp_genl_new_pdp+0x18c/0x1150 [gtp]
[ 130.636936] #3: 0000000007a1cde7 (rcu_read_lock){....}, at: gtp_genl_new_pdp+0x187/0x1150 [gtp]
[ 130.638348]
[ 130.638348] stack backtrace:
[ 130.639062] CPU: 1 PID: 1025 Comm: gtp-tunnel Not tainted 5.2.0-rc6+ #50
[ 130.641318] Call Trace:
[ 130.641707] dump_stack+0x7c/0xbb
[ 130.642252] ___might_sleep+0x2c0/0x3b0
[ 130.642862] kmem_cache_alloc_trace+0x1cd/0x2b0
[ 130.643591] gtp_genl_new_pdp+0x6c5/0x1150 [gtp]
[ 130.644371] genl_family_rcv_msg+0x63a/0x1030
[ 130.645074] ? mutex_lock_io_nested+0x1090/0x1090
[ 130.645845] ? genl_unregister_family+0x630/0x630
[ 130.646592] ? debug_show_all_locks+0x2d0/0x2d0
[ 130.647293] ? check_flags.part.40+0x440/0x440
[ 130.648099] genl_rcv_msg+0xa3/0x130[ ... ]
--- drivers/net/gtp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/gtp.c +1 -1
@@ -958,7 +958,7 @@ static int ipv4_pdp_add(struct gtp_dev *gtp, struct sock *sk, } - pctx =kmalloc (sizeof (struct pdp_ctx ),GFP_KERNEL ); + pctx =kmalloc (sizeof (*pctx),GFP_ATOMIC );if (pctx ==NULL )return -ENOMEM ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 156/271 gtp: fix use-after-free in gtp_encap_destroy()
In reply to Greg Kroah-Hartman[ Upstream commit 1788b8569f5de27da09087fa3f6580d2aa04cc75 ]
gtp_encap_destroy() is called twice.
1. When interface is deleted.
2. When udp socket is destroyed.
either gtp->sk0 or gtp->sk1u could be freed by sock_put() in gtp_encap_destroy(). so, when gtp_encap_destroy() is called again, it would uses freed sk pointer.
patch makes gtp_encap_destroy() to set either gtp->sk0 or gtp->sk1u to null. in addition, both gtp->sk0 and gtp->sk1u pointer are protected by rtnl_lock. so, rtnl_lock() is added.
Test command:
gtp-link add gtp1 &
killall gtp-link
ip link del gtp1
Splat looks like:
[ 83.182767] BUG: KASAN: use-after-free in __lock_acquire+0x3a20/0x46a0 [ 83.184128] Read of size 8 at addr ffff8880cc7d5360 by task ip/1008 [ 83.185567] CPU: 1 PID: 1008 Comm: ip Not tainted 5.2.0-rc6+ #50 [ 83.188469] Call Trace: [ ... ] [ 83.200126] lock_acquire+0x141/0x380 [ 83.200575] ? lock_sock_nested+0x3a/0xf0 [ 83.201069] _raw_spin_lock_bh+0x38/0x70 [ 83.201551] ? lock_sock_nested+0x3a/0xf0 [ 83.202044] lock_sock_nested+0x3a/0xf0 [ 83.202520] gtp_encap_destroy+0x18/0xe0 [gtp] [ 83.203065] gtp_encap_disable.isra.14+0x13/0x50 [gtp] [ 83.203687] gtp_dellink+0x56/0x170 [gtp] [ 83.204190] rtnl_delete_link+0xb4/0x100 [ ... ] [ 83.236513] Allocated by task 976: [ 83.236925] save_stack+0x19/0x80 [ 83.237332] __kasan_kmalloc.constprop.3+0xa0/0xd0 [ 83.237894] kmem_cache_alloc+0xd8/0x280 [ 83.238360] sk_prot_alloc.isra.42+0x50/0x200 [ 83.238874] sk_alloc+0x32/0x940 [ 83.239264] inet_create+0x283/0xc20 [ 83.239684] __sock_create+0x2dd/0x540 [ 83.240136] __sys_socket+0xca/0x1a0 [ 83.240550] __x64_sys_socket+0x6f/0xb0 [ 83.240998] do_syscall_64+0x9c/0x450 [ 83.241466] entry_SYSCALL_64_after_hwframe+0x49/0xbe [ 83.242061] [ 83.242249] Freed by task 0: [ 83.242616] save_stack+0x19/0x80 [ 83.243013] __kasan_slab_free+0x111/0x150 [ 83.243498] kmem_cache_free+0x89/0x250 [ 83.244444] __sk_destruct+0x38f/0x5a0 [ 83.245366] rcu_core+0x7e9/0x1c20 [ 83.245766] __do_softirq+0x213/0x8fa
--- drivers/net/gtp.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/net/gtp.c +15 -2
@@ -289,13 +289,17 @@ static int gtp1u_udp_encap_recv(struct gtp_dev *gtp, struct sk_buff *skb)return gtp_rx (pctx, skb, hdrlen, gtp->role); } -static void gtp_encap_destroy (struct sock *sk) +static void __gtp_encap_destroy (struct sock *sk) {struct gtp_dev *gtp;lock_sock (sk); gtp = sk->sk_user_data;if (gtp) { +if (gtp->sk0 == sk) + gtp->sk0 =NULL ; +else + gtp->sk1u =NULL ;udp_sk (sk)->encap_type =0 ;rcu_assign_sk_user_data (sk,NULL );sock_put (sk);
@@ -303,12 +307,19 @@ static void gtp_encap_destroy(struct sock *sk)release_sock (sk); } +static void gtp_encap_destroy (struct sock *sk) +{ +rtnl_lock (); +__gtp_encap_destroy (sk); +rtnl_unlock (); +} +static void gtp_encap_disable_sock (struct sock *sk) {if (!sk)return ; -gtp_encap_destroy (sk); +__gtp_encap_destroy (sk); }static void gtp_encap_disable (struct gtp_dev *gtp)
@@ -1047,6 +1058,7 @@ static int gtp_genl_new_pdp(struct sk_buff *skb, struct genl_info *info)return -EINVAL ; } +rtnl_lock ();rcu_read_lock (); gtp =gtp_find_dev (sock_net (skb->sk), info->attrs);
@@ -1071,6 +1083,7 @@ static int gtp_genl_new_pdp(struct sk_buff *skb, struct genl_info *info) out_unlock:rcu_read_unlock (); +rtnl_unlock ();return err; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 157/271 gtp: fix use-after-free in gtp_newlink()
In reply to Greg Kroah-Hartman[ Upstream commit a2bed90704c68d3763bf24decb1b781a45395de8 ]
Current gtp_newlink() could be called after unregister_pernet_subsys(). gtp_newlink() uses gtp_net but it can be destroyed by unregister_pernet_subsys().
So unregister_pernet_subsys() should be called after rtnl_link_unregister().
Test commands:
#SHELL 1
while :
do
for i in {1..5}
do
./gtp-link add gtp$i &
done
killall gtp-linkdone
#SHELL 2
while :
do
modprobe -rv gtp
done
Splat looks like:
[ 753.176631] BUG: KASAN: use-after-free in gtp_newlink+0x9b4/0xa5c [gtp] [ 753.177722] Read of size 8 at addr ffff8880d48f2458 by task gtp-link/7126 [ 753.179082] CPU: 0 PID: 7126 Comm: gtp-link Tainted: G W 5.2.0-rc6+ #50 [ 753.185801] Call Trace: [ 753.186264] dump_stack+0x7c/0xbb [ 753.186863] ? gtp_newlink+0x9b4/0xa5c [gtp] [ 753.187583] print_address_description+0xc7/0x240 [ 753.188382] ? gtp_newlink+0x9b4/0xa5c [gtp] [ 753.189097] ? gtp_newlink+0x9b4/0xa5c [gtp] [ 753.189846] __kasan_report+0x12a/0x16f [ 753.190542] ? gtp_newlink+0x9b4/0xa5c [gtp] [ 753.191298] kasan_report+0xe/0x20 [ 753.191893] gtp_newlink+0x9b4/0xa5c [gtp] [ 753.192580] ? __netlink_ns_capable+0xc3/0xf0 [ 753.193370] __rtnl_newlink+0xb9f/0x11b0 [ ... ] [ 753.241201] Allocated by task 7186: [ 753.241844] save_stack+0x19/0x80 [ 753.242399] __kasan_kmalloc.constprop.3+0xa0/0xd0 [ 753.243192] __kmalloc+0x13e/0x300 [ 753.243764] ops_init+0xd6/0x350 [ 753.244314] register_pernet_operations+0x249/0x6f0 [ ... ] [ 753.251770] Freed by task 7178: [ 753.252288] save_stack+0x19/0x80 [ 753.252833] __kasan_slab_free+0x111/0x150 [ 753.253962] kfree+0xc7/0x280 [ 753.254509] ops_free_list.part.11+0x1c4/0x2d0 [ 753.255241] unregister_pernet_operations+0x262/0x390 [ ... ] [ 753.285883] list_add corruption. next->prev should be prev (ffff8880d48f2458), but was ffff8880d497d878. (next. [ 753.287241] ------------[ cut here ]------------ [ 753.287794] kernel BUG at lib/list_debug.c:25! [ 753.288364] invalid opcode: 0000 [#1] SMP DEBUG_PAGEALLOC KASAN PTI [ 753.289099] CPU: 0 PID: 7126 Comm: gtp-link Tainted: G B W 5.2.0-rc6+ #50 [ 753.291036] RIP: 0010:__list_add_valid+0x74/0xd0 [ 753.291589] Code: 48 39 da 75 27 48 39 f5 74 36 48 39 dd 74 31 48 83 c4 08 b8 01 00 00 00 5b 5d c3 48 89 d9 48b [ 753.293779] RSP: 0018:ffff8880cae8f398 EFLAGS: 00010286 [ 753.294401] RAX: 0000000000000075 RBX: ffff8880d497d878 RCX: 0000000000000000 [ 753.296260] RDX: 0000000000000075 RSI: 0000000000000008 RDI: ffffed10195d1e69 [ 753.297070] RBP: ffff8880cd250ae0 R08: ffffed101b4bff21 R09: ffffed101b4bff21 [ 753.297899] R10: 0000000000000001 R11: ffffed101b4bff20 R12: ffff8880d497d878 [ 753.298703] R13: 0000000000000000 R14: ffff8880cd250ae0 R15: ffff8880d48f2458 [ 753.299564] FS: 00007f5f79805740(0000) GS:ffff8880da400000(0000) knlGS:0000000000000000 [ 753.300533] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 753.301231] CR2: 00007fe8c7ef4f10 CR3: 00000000b71a6006 CR4: 00000000000606f0 [ 753.302183] Call Trace: [ 753.302530] gtp_newlink+0x5f6/0xa5c [gtp] [ 753.303037] ? __netlink_ns_capable+0xc3/0xf0 [ 753.303576] __rtnl_newlink+0xb9f/0x11b0 [ 753.304092] ? rtnl_link_unregister+0x230/0x230
--- drivers/net/gtp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/gtp.c +1 -1
@@ -1385,9 +1385,9 @@ late_initcall(gtp_init); static void __exit gtp_fini(void) { -unregister_pernet_subsys (>p_net_ops);genl_unregister_family (>p_genl_family);rtnl_link_unregister (>p_link_ops); +unregister_pernet_subsys (>p_net_ops);pr_info ("GTP module unloaded\n" ); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 158/271 net: mvmdio: defer probe of orion-mdio if a clock is not ready
In reply to Greg Kroah-Hartman[ Upstream commit 433a06d7d74e677c40b1148c70c48677ff62fb6b ]
Defer probing of the orion-mdio interface when getting a clock returns EPROBE_DEFER. This avoids locking up the Armada 8k SoC when mdio is used before all clocks have been enabled.
--- drivers/net/ethernet/marvell/mvmdio.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ethernet/marvell/mvmdio.c +5 -0
@@ -321,6 +321,10 @@ static int orion_mdio_probe(struct platform_device *pdev)for (i =0 ; i <ARRAY_SIZE (dev->clk); i++) { dev->clk[i] =of_clk_get (pdev->dev.of_node, i); +if (PTR_ERR (dev->clk[i]) == -EPROBE_DEFER ) { + ret = -EPROBE_DEFER ; + goto out_clk; + }if (IS_ERR (dev->clk[i]))break ;clk_prepare_enable (dev->clk[i]);
@@ -362,6 +366,7 @@ static int orion_mdio_probe(struct platform_device *pdev)if (dev->err_interrupt >0 )writel (0 , dev->regs +MVMDIO_ERR_INT_MASK ); +out_clk:for (i =0 ; i <ARRAY_SIZE (dev->clk); i++) {if (IS_ERR (dev->clk[i]))break ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 159/271 iavf: fix dereference of null rx_buffer pointer
In reply to Greg Kroah-Hartman[ Upstream commit 9fe06a51287b2d41baef7ece94df34b5abf19b90 ]
A recent commit efa14c3985828d ("iavf: allow null RX descriptors") added a null pointer sanity check on rx_buffer, however, rx_buffer is being dereferenced before that check, which implies a null pointer dereference bug can potentially occur. Fix this by only dereferencing rx_buffer until after the null pointer check.
Addresses-Coverity: ("Dereference before null check")
--- drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/i40evf/i40e_txrx.c +4 -2
@@ -1291,7 +1291,7 @@ static struct sk_buff *i40e_construct_skb(struct i40e_ring *rx_ring,struct i40e_rx_buffer *rx_buffer, unsigned int size) { - void *va = page_address(rx_buffer->page) + rx_buffer->page_offset; + void *va;#if (PAGE_SIZE <8192 )unsigned int truesize =i40e_rx_pg_size (rx_ring) /2 ;#else
@@ -1301,6 +1301,7 @@ static struct sk_buff *i40e_construct_skb(struct i40e_ring *rx_ring,struct sk_buff *skb;/* prefetch first cache line of first page */ + va =page_address (rx_buffer->page) + rx_buffer->page_offset;prefetch (va);#if L1_CACHE_BYTES <128 prefetch (va +L1_CACHE_BYTES );
@@ -1355,7 +1356,7 @@ static struct sk_buff *i40e_build_skb(struct i40e_ring *rx_ring,struct i40e_rx_buffer *rx_buffer, unsigned int size) { - void *va = page_address(rx_buffer->page) + rx_buffer->page_offset; + void *va;#if (PAGE_SIZE <8192 )unsigned int truesize =i40e_rx_pg_size (rx_ring) /2 ;#else
@@ -1365,6 +1366,7 @@ static struct sk_buff *i40e_build_skb(struct i40e_ring *rx_ring,struct sk_buff *skb;/* prefetch first cache line of first page */ + va =page_address (rx_buffer->page) + rx_buffer->page_offset;prefetch (va);#if L1_CACHE_BYTES <128 prefetch (va +L1_CACHE_BYTES );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 160/271 floppy: fix div-by-zero in setup_format_params
In reply to Greg Kroah-Hartman[ Upstream commit f3554aeb991214cbfafd17d55e2bfddb50282e32 ]
This fixes a divide by zero error in the setup_format_params function of the floppy driver.
Two consecutive ioctls can trigger the bug: The first one should set the drive geometry with such .sect and .rate values for the F_SECT_PER_TRACK to become zero. Next, the floppy format operation should be called.
A floppy disk is not required to be inserted. An unprivileged user could trigger the bug if the device is accessible.
The patch checks F_SECT_PER_TRACK for a non-zero value in the set_geometry function. The proper check should involve a reasonable upper limit for the .sect and .rate fields, but it could change the UAPI.
The patch also checks F_SECT_PER_TRACK in the setup_format_params, and cancels the formatting operation in case of zero.
The bug was found by syzkaller.
--- drivers/block/floppy.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/block/floppy.c +5 -0
@@ -2119,6 +2119,9 @@ static void setup_format_params(int track) raw_cmd->kernel_data = floppy_track_buffer; raw_cmd->length =4 *F_SECT_PER_TRACK ; +if (!F_SECT_PER_TRACK ) +return ; +/* allow for about 30ms for data transport per track */ head_shift = (F_SECT_PER_TRACK +5 ) /6 ;
@@ -3243,6 +3246,8 @@ static int set_geometry(unsigned int cmd, struct floppy_struct *g,/* sanity checking for parameters. */ if (g->sect <=0 || g->head <=0 || +/* check for zero in F_SECT_PER_TRACK */ + (unsigned char )((g->sect <<2 ) >>FD_SIZECODE (g)) ==0 || g->track <=0 || g->track >UDP ->tracks >>STRETCH (g) ||/* check if reserved bits are set */ (g->stretch & ~(FD_STRETCH |FD_SWAPSIDES |FD_SECTBASEMASK )) !=0 )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 125/271 bcache: check CACHE_SET_IO_DISABLE bit in bch_journal()
In reply to Greg Kroah-Hartman[ Upstream commit 383ff2183ad16a8842d1fbd9dd3e1cbd66813e64 ]
When too many I/O errors happen on cache set and CACHE_SET_IO_DISABLE bit is set, bch_journal() may continue to work because the journaling bkey might be still in write set yet. The caller of bch_journal() may believe the journal still work but the truth is in-memory journal write set won't be written into cache device any more. This behavior may introduce potential inconsistent metadata status.
This patch checks CACHE_SET_IO_DISABLE bit at the head of bch_journal(), if the bit is set, bch_journal() returns NULL immediately to notice caller to know journal does not work.
--- drivers/md/bcache/journal.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/md/bcache/journal.c +4 -0
@@ -810,6 +810,10 @@ atomic_t *bch_journal(struct cache_set *c,struct journal_write *w;atomic_t *ret; +/* No journaling if CACHE_SET_IO_DISABLE set already */ +if (unlikely (test_bit (CACHE_SET_IO_DISABLE , &c->flags))) +return NULL ; +if (!CACHE_SYNC (&c->sb))return NULL ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 161/271 floppy: fix out-of-bounds read in next_valid_format
In reply to Greg Kroah-Hartman[ Upstream commit 5635f897ed83fd539df78e98ba69ee91592f9bb8 ]
This fixes a global out-of-bounds read access in the next_valid_format function of the floppy driver.
The values from autodetect field of the struct floppy_drive_params are used as indices for the floppy_type array in the next_valid_format function 'floppy_type[DP->autodetect[probed_format]].sect'.
To trigger the bug, one could use a value out of range and set the drive parameters with the FDSETDRVPRM ioctl. A floppy disk is not required to be inserted.
CAP_SYS_ADMIN is required to call FDSETDRVPRM.
The patch adds the check for values of the autodetect field to be in the '0 <= x < ARRAY_SIZE(floppy_type)' range of the floppy_type array indices.
The bug was found by syzkaller.
--- drivers/block/floppy.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/block/floppy.c +18 -0
@@ -3391,6 +3391,20 @@ static int fd_getgeo(struct block_device *bdev, struct hd_geometry *geo)return 0 ; } +static bool valid_floppy_drive_params (const short autodetect[8 ]) +{ +size_t floppy_type_size =ARRAY_SIZE (floppy_type); +size_t i =0 ; + +for (i =0 ; i <8 ; ++i) { +if (autodetect[i] <0 || + autodetect[i] >= floppy_type_size) +return false; + } + +return true; +} +static int fd_locked_ioctl (struct block_device *bdev,fmode_t mode,unsigned int cmd,unsigned long param) {
@@ -3517,6 +3531,8 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode, unsigned intSUPBOUND (size,strlen ((const char *)outparam) +1 );break ;case FDSETDRVPRM : +if (!valid_floppy_drive_params (inparam.dp.autodetect)) +return -EINVAL ; *UDP = inparam.dp;break ;case FDGETDRVPRM :
@@ -3714,6 +3730,8 @@ static int compat_setdrvprm(int drive,return -EPERM ;if (copy_from_user (&v, arg,sizeof (struct compat_floppy_drive_params )))return -EFAULT ; +if (!valid_floppy_drive_params (v.autodetect)) +return -EINVAL ;mutex_lock (&floppy_mutex);UDP ->cmos = v.cmos;UDP ->max_dtr = v.max_dtr;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 162/271 floppy: fix invalid pointer dereference in drive_name
In reply to Greg Kroah-Hartman[ Upstream commit 9b04609b784027968348796a18f601aed9db3789 ]
This fixes the invalid pointer dereference in the drive_name function of the floppy driver.
The native_format field of the struct floppy_drive_params is used as floppy_type array index in the drive_name function. Thus, the field should be checked the same way as the autodetect field.
To trigger the bug, one could use a value out of range and set the drive parameters with the FDSETDRVPRM ioctl. Next, FDGETDRVTYP ioctl should be used to call the drive_name. A floppy disk is not required to be inserted.
CAP_SYS_ADMIN is required to call FDSETDRVPRM.
The patch adds the check for a value of the native_format field to be in the '0 <= x < ARRAY_SIZE(floppy_type)' range of the floppy_type array indices.
The bug was found by syzkaller.
--- drivers/block/floppy.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/block/floppy.c +8 -3
@@ -3391,7 +3391,8 @@ static int fd_getgeo(struct block_device *bdev, struct hd_geometry *geo)return 0 ; } -static bool valid_floppy_drive_params (const short autodetect[8 ]) +static bool valid_floppy_drive_params (const short autodetect[8 ], +int native_format) {size_t floppy_type_size =ARRAY_SIZE (floppy_type);size_t i =0 ;
@@ -3402,6 +3403,9 @@ static bool valid_floppy_drive_params(const short autodetect[8])return false; } +if (native_format <0 || native_format >= floppy_type_size) +return false; +return true; }
@@ -3531,7 +3535,8 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode, unsigned intSUPBOUND (size,strlen ((const char *)outparam) +1 );break ;case FDSETDRVPRM : -if (!valid_floppy_drive_params (inparam.dp.autodetect)) +if (!valid_floppy_drive_params (inparam.dp.autodetect, + inparam.dp.native_format))return -EINVAL ; *UDP = inparam.dp;break ;
@@ -3730,7 +3735,7 @@ static int compat_setdrvprm(int drive,return -EPERM ;if (copy_from_user (&v, arg,sizeof (struct compat_floppy_drive_params )))return -EFAULT ; -if (!valid_floppy_drive_params (v.autodetect)) +if (!valid_floppy_drive_params (v.autodetect, v.native_format))return -EINVAL ;mutex_lock (&floppy_mutex);UDP ->cmos = v.cmos;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 163/271 floppy: fix out-of-bounds read in copy_buffer
In reply to Greg Kroah-Hartman[ Upstream commit da99466ac243f15fbba65bd261bfc75ffa1532b6 ]
This fixes a global out-of-bounds read access in the copy_buffer function of the floppy driver.
The FDDEFPRM ioctl allows one to set the geometry of a disk. The sect and head fields (unsigned int) of the floppy_drive structure are used to compute the max_sector (int) in the make_raw_rw_request function. It is possible to overflow the max_sector. Next, max_sector is passed to the copy_buffer function and used in one of the memcpy calls.
An unprivileged user could trigger the bug if the device is accessible, but requires a floppy disk to be inserted.
The patch adds the check for the .sect * .head multiplication for not overflowing in the set_geometry function.
The bug was found by syzkaller.
--- drivers/block/floppy.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/block/floppy.c +4 -2
@@ -3244,8 +3244,10 @@ static int set_geometry(unsigned int cmd, struct floppy_struct *g,int cnt;/* sanity checking for parameters. */ - if (g->sect <= 0 || - g->head <= 0 || + if ((int)g->sect <= 0 || + (int)g->head <= 0 || + /* check for overflow in max_sector */ + (int)(g->sect * g->head) <= 0 || /* check for zero in F_SECT_PER_TRACK */ (unsigned char)((g->sect << 2) >> FD_SIZECODE(g)) == 0 || g->track <= 0 || g->track > UDP->tracks >> STRETCH(g) ||
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 164/271 xen: let alloc_xenballooned_pages() fail if not enough memory free
In reply to Greg Kroah-HartmanFrom: Juergen Gross <[email protected]>
commit a1078e821b605813b63bf6bca414a85f804d5c66 upstream.
Instead of trying to allocate pages with GFP_USER in add_ballooned_pages() check the available free memory via si_mem_available(). GFP_USER is far less limiting memory exhaustion than the test via si_mem_available().
This will avoid dom0 running out of memory due to excessive foreign page mappings especially on ARM and on x86 in PVH mode, as those don't have a pre-ballooned area which can be used for foreign mappings.
As the normal ballooning suffers from the same problem don't balloon down more than si_mem_available() pages in one iteration. At the same time limit the default maximum number of retries.
This is part of XSA-300.
--- drivers/xen/balloon.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
drivers/xen/balloon.c +13 -3
@@ -527,8 +527,15 @@ static void balloon_process(struct work_ state =reserve_additional_memory (); } -if (credit <0 ) - state =decrease_reservation (-credit,GFP_BALLOON ); +if (credit <0 ) { +long n_pages; + + n_pages =min (-credit,si_mem_available ()); + state =decrease_reservation (n_pages,GFP_BALLOON ); +if (state ==BP_DONE && n_pages != -credit && + n_pages < totalreserve_pages) + state =BP_EAGAIN ; + } state =update_schedule (state);
@@ -567,6 +574,9 @@ static int add_ballooned_pages(int nr_pa } } +if (si_mem_available () < nr_pages) +return -ENOMEM ; + st =decrease_reservation (nr_pages,GFP_USER );if (st !=BP_DONE )return -ENOMEM ;
@@ -696,7 +706,7 @@ static int __init balloon_init(void) balloon_stats.schedule_delay =1 ; balloon_stats.max_schedule_delay =32 ; balloon_stats.retry_count =1 ; - balloon_stats.max_retry_count =RETRY_UNLIMITED ; + balloon_stats.max_retry_count =4 ;#ifdef CONFIG_XEN_BALLOON_MEMORY_HOTPLUG set_online_page_callback (&xen_online_page);
Greg Kroah-Hartman
maintainerPATCH 165/271 scsi: NCR5380: Reduce goto statements in NCR5380_select()
In reply to Greg Kroah-HartmanFrom: Finn Thain <[email protected]>
commit 6a162836997c10bbefb7c7ca772201cc45c0e4a6 upstream.
Replace a 'goto' statement with a simple 'return' where possible. This improves readability. No functional change.
--- drivers/scsi/NCR5380.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
drivers/scsi/NCR5380.c +12 -9
@@ -984,7 +984,7 @@ static struct scsi_cmnd *NCR5380_select(if (!hostdata->selecting) {/* Command was aborted */ NCR5380_write (MODE_REG ,MR_BASE ); - goto out; +return NULL ; }if (err <0 ) {NCR5380_write (MODE_REG ,MR_BASE );
@@ -1033,7 +1033,7 @@ static struct scsi_cmnd *NCR5380_select(if (!hostdata->selecting) {NCR5380_write (MODE_REG ,MR_BASE );NCR5380_write (INITIATOR_COMMAND_REG ,ICR_BASE ); - goto out; +return NULL ; }dsprintk (NDEBUG_ARBITRATION , instance,"won arbitration\n" );
@@ -1116,13 +1116,16 @@ static struct scsi_cmnd *NCR5380_select(spin_lock_irq (&hostdata->lock);NCR5380_write (INITIATOR_COMMAND_REG ,ICR_BASE );NCR5380_write (SELECT_ENABLE_REG , hostdata->id_mask); +/* Can't touch cmd if it has been reclaimed by the scsi ML */ -if (hostdata->selecting) { - cmd->result =DID_BAD_TARGET <<16 ; -complete_cmd (instance, cmd); -dsprintk (NDEBUG_SELECTION , instance,"target did not respond within 250ms\n" ); - cmd =NULL ; - } +if (!hostdata->selecting) +return NULL ; + + cmd->result =DID_BAD_TARGET <<16 ; +complete_cmd (instance, cmd); +dsprintk (NDEBUG_SELECTION , instance, +"target did not respond within 250ms\n" ); + cmd =NULL ; goto out; }
@@ -1155,7 +1158,7 @@ static struct scsi_cmnd *NCR5380_select( }if (!hostdata->selecting) {do_abort (instance); - goto out; +return NULL ; } dsprintk(NDEBUG_SELECTION, instance, "target %d selected, going into MESSAGE OUT phase.\n",
Greg Kroah-Hartman
maintainerPATCH 126/271 bcache: acquire bch_register_lock later in cached_dev_free()
In reply to Greg Kroah-Hartman[ Upstream commit 80265d8dfd77792e133793cef44a21323aac2908 ]
When enable lockdep engine, a lockdep warning can be observed when reboot or shutdown system,
[ 3142.764557][ T1] bcache: bcache_reboot() Stopping all devices:
[ 3142.776265][ T2649]
[ 3142.777159][ T2649] ======================================================
[ 3142.780039][ T2649] WARNING: possible circular locking dependency detected
[ 3142.782869][ T2649] 5.2.0-rc4-lp151.20-default+ #1 Tainted: G W
[ 3142.785684][ T2649] ------------------------------------------------------
[ 3142.788479][ T2649] kworker/3:67/2649 is trying to acquire lock:
[ 3142.790738][ T2649] 00000000aaf02291 ((wq_completion)bcache_writeback_wq){+.+.}, at: flush_workqueue+0x87/0x4c0
[ 3142.794678][ T2649]
[ 3142.794678][ T2649] but task is already holding lock:
[ 3142.797402][ T2649] 000000004fcf89c5 (&bch_register_lock){+.+.}, at: cached_dev_free+0x17/0x120 [bcache]
[ 3142.801462][ T2649]
[ 3142.801462][ T2649] which lock already depends on the new lock.
[ 3142.801462][ T2649]
[ 3142.805277][ T2649]
[ 3142.805277][ T2649] the existing dependency chain (in reverse order) is:
[ 3142.808902][ T2649]
[ 3142.808902][ T2649] -> #2 (&bch_register_lock){+.+.}:
[ 3142.812396][ T2649] __mutex_lock+0x7a/0x9d0
[ 3142.814184][ T2649] cached_dev_free+0x17/0x120 [bcache]
[ 3142.816415][ T2649] process_one_work+0x2a4/0x640
[ 3142.818413][ T2649] worker_thread+0x39/0x3f0
[ 3142.820276][ T2649] kthread+0x125/0x140
[ 3142.822061][ T2649] ret_from_fork+0x3a/0x50
[ 3142.823965][ T2649]
[ 3142.823965][ T2649] -> #1 ((work_completion)(&cl->work)#2){+.+.}:
[ 3142.827244][ T2649] process_one_work+0x277/0x640
[ 3142.829160][ T2649] worker_thread+0x39/0x3f0
[ 3142.830958][ T2649] kthread+0x125/0x140
[ 3142.832674][ T2649] ret_from_fork+0x3a/0x50
[ 3142.834915][ T2649]
[ 3142.834915][ T2649] -> #0 ((wq_completion)bcache_writeback_wq){+.+.}:
[ 3142.838121][ T2649] lock_acquire+0xb4/0x1c0
[ 3142.840025][ T2649] flush_workqueue+0xae/0x4c0
[ 3142.842035][ T2649] drain_workqueue+0xa9/0x180
[ 3142.844042][ T2649] destroy_workqueue+0x17/0x250
[ 3142.846142][ T2649] cached_dev_free+0x52/0x120 [bcache]
[ 3142.848530][ T2649] process_one_work+0x2a4/0x640
[ 3142.850663][ T2649] worker_thread+0x39/0x3f0
[ 3142.852464][ T2649] kthread+0x125/0x140
[ 3142.854106][ T2649] ret_from_fork+0x3a/0x50
[ 3142.855880][ T2649]
[ 3142.855880][ T2649] other info that might help us debug this:
[ 3142.855880][ T2649]
[ 3142.859663][ T2649] Chain exists of:
[ 3142.859663][ T2649] (wq_completion)bcache_writeback_wq --> (work_completion)(&cl->work)#2 --> &bch_register_lock
[ 3142.859663][ T2649]
[ 3142.865424][ T2649] Possible unsafe locking scenario:
[ 3142.865424][ T2649]
[ 3142.868022][ T2649] CPU0 CPU1
[ 3142.869885][ T2649] ---- ----
[ 3142.871751][ T2649] lock(&bch_register_lock);
[ 3142.873379][ T2649] lock((work_completion)(&cl->work)#2);
[ 3142.876399][ T2649] lock(&bch_register_lock);
[ 3142.879727][ T2649] lock((wq_completion)bcache_writeback_wq);
[ 3142.882064][ T2649]
[ 3142.882064][ T2649] *** DEADLOCK ***
[ 3142.882064][ T2649]
[ 3142.885060][ T2649] 3 locks held by kworker/3:67/2649:
[ 3142.887245][ T2649] #0: 00000000e774cdd0 ((wq_completion)events){+.+.}, at: process_one_work+0x21e/0x640
[ 3142.890815][ T2649] #1: 00000000f7df89da ((work_completion)(&cl->work)#2){+.+.}, at: process_one_work+0x21e/0x640
[ 3142.894884][ T2649] #2: 000000004fcf89c5 (&bch_register_lock){+.+.}, at: cached_dev_free+0x17/0x120 [bcache]
[ 3142.898797][ T2649]
[ 3142.898797][ T2649] stack backtrace:
[ 3142.900961][ T2649] CPU: 3 PID: 2649 Comm: kworker/3:67 Tainted: G W 5.2.0-rc4-lp151.20-default+ #1
[ 3142.904789][ T2649] Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 04/13/2018
[ 3142.909168][ T2649] Workqueue: events cached_dev_free [bcache]
[ 3142.911422][ T2649] Call Trace:
[ 3142.912656][ T2649] dump_stack+0x85/0xcb
[ 3142.914181][ T2649] print_circular_bug+0x19a/0x1f0
[ 3142.916193][ T2649] __lock_acquire+0x16cd/0x1850
[ 3142.917936][ T2649] ? __lock_acquire+0x6a8/0x1850
[ 3142.919704][ T2649] ? lock_acquire+0xb4/0x1c0
[ 3142.921335][ T2649] ? find_held_lock+0x34/0xa0
[ 3142.923052][ T2649] lock_acquire+0xb4/0x1c0
[ 3142.924635][ T2649] ? flush_workqueue+0x87/0x4c0
[ 3142.926375][ T2649] flush_workqueue+0xae/0x4c0
[ 3142.928047][ T2649] ? flush_workqueue+0x87/0x4c0
[ 3142.929824][ T2649] ? drain_workqueue+0xa9/0x180
[ 3142.931686][ T2649] drain_workqueue+0xa9/0x180
[ 3142.933534][ T2649] destroy_workqueue+0x17/0x250
[ 3142.935787][ T2649] cached_dev_free+0x52/0x120 [bcache]
[ 3142.937795][ T2649] process_one_work+0x2a4/0x640
[ 3142.939803][ T2649] worker_thread+0x39/0x3f0
[ 3142.941487][ T2649] ? process_one_work+0x640/0x640
[ 3142.943389][ T2649] kthread+0x125/0x140
[ 3142.944894][ T2649] ? kthread_create_worker_on_cpu+0x70/0x70
[ 3142.947744][ T2649] ret_from_fork+0x3a/0x50
[ 3142.970358][ T2649] bcache: bcache_device_free() bcache0 stoppedHere is how the deadlock happens.
1) bcache_reboot() calls bcache_device_stop(), then inside bcache_device_stop() BCACHE_DEV_CLOSING bit is set on d->flags. Then closure_queue(&d->cl) is called to invoke cached_dev_flush().
2) In cached_dev_flush(), cached_dev_free() is called by continu_at().
3) In cached_dev_free(), when stopping the writeback kthread of the cached device by kthread_stop(), dc->writeback_thread will be waken up to quite the kthread while-loop, then cached_dev_put() is called in bch_writeback_thread().
4) Calling cached_dev_put() in writeback kthread may drop dc->count to 0, then dc->detach kworker is scheduled, which is initialized as cached_dev_detach_finish().
5) Inside cached_dev_detach_finish(), the last line of code is to call closure_put(&dc->disk.cl), which drops the last reference counter of closrure dc->disk.cl, then the callback cached_dev_flush() gets called.
Now cached_dev_flush() is called for second time in the code path, the first time is in step 2). And again bch_register_lock will be acquired again, and a A-A lock (lockdep terminology) is happening.
The root cause of the above A-A lock is in cached_dev_free(), mutex bch_register_lock is held before stopping writeback kthread and other kworkers. Fortunately now we have variable 'bcache_is_reboot', which may prevent device registration or unregistration during reboot/shutdown time, so it is unncessary to hold bch_register_lock such early now.
This is how this patch fixes the reboot/shutdown time A-A lock issue:
After moving mutex_lock(&bch_register_lock) to a later location where before atomic_read(&dc->running) in cached_dev_free(), such A-A lock problem can be solved without any reboot time registration race.
--- drivers/md/bcache/super.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/md/bcache/super.c +2 -2
@@ -1180,8 +1180,6 @@ static void cached_dev_free(struct closure *cl) { struct cached_dev *dc = container_of(cl, struct cached_dev, disk.cl); -mutex_lock (&bch_register_lock); -if (test_and_clear_bit (BCACHE_DEV_WB_RUNNING , &dc->disk.flags))cancel_writeback_rate_update_dwork (dc);
@@ -1192,6 +1190,8 @@ static void cached_dev_free(struct closure *cl)if (!IS_ERR_OR_NULL (dc->status_update_thread))kthread_stop (dc->status_update_thread); +mutex_lock (&bch_register_lock); +if (atomic_read (&dc->running))bd_unlink_disk_holder (dc->bdev, dc->disk.disk);bcache_device_free (&dc->disk);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 128/271 bcache: fix potential deadlock in cached_def_free()
In reply to Greg Kroah-Hartman[ Upstream commit 7e865eba00a3df2dc8c4746173a8ca1c1c7f042e ]
When enable lockdep and reboot system with a writeback mode bcache device, the following potential deadlock warning is reported by lockdep engine.
[ 101.536569][ T401] kworker/2:2/401 is trying to acquire lock:
[ 101.538575][ T401] 00000000bbf6e6c7 ((wq_completion)bcache_writeback_wq){+.+.}, at: flush_workqueue+0x87/0x4c0
[ 101.542054][ T401]
[ 101.542054][ T401] but task is already holding lock:
[ 101.544587][ T401] 00000000f5f305b3 ((work_completion)(&cl->work)#2){+.+.}, at: process_one_work+0x21e/0x640
[ 101.548386][ T401]
[ 101.548386][ T401] which lock already depends on the new lock.
[ 101.548386][ T401]
[ 101.551874][ T401]
[ 101.551874][ T401] the existing dependency chain (in reverse order) is:
[ 101.555000][ T401]
[ 101.555000][ T401] -> #1 ((work_completion)(&cl->work)#2){+.+.}:
[ 101.557860][ T401] process_one_work+0x277/0x640
[ 101.559661][ T401] worker_thread+0x39/0x3f0
[ 101.561340][ T401] kthread+0x125/0x140
[ 101.562963][ T401] ret_from_fork+0x3a/0x50
[ 101.564718][ T401]
[ 101.564718][ T401] -> #0 ((wq_completion)bcache_writeback_wq){+.+.}:
[ 101.567701][ T401] lock_acquire+0xb4/0x1c0
[ 101.569651][ T401] flush_workqueue+0xae/0x4c0
[ 101.571494][ T401] drain_workqueue+0xa9/0x180
[ 101.573234][ T401] destroy_workqueue+0x17/0x250
[ 101.575109][ T401] cached_dev_free+0x44/0x120 [bcache]
[ 101.577304][ T401] process_one_work+0x2a4/0x640
[ 101.579357][ T401] worker_thread+0x39/0x3f0
[ 101.581055][ T401] kthread+0x125/0x140
[ 101.582709][ T401] ret_from_fork+0x3a/0x50
[ 101.584592][ T401]
[ 101.584592][ T401] other info that might help us debug this:
[ 101.584592][ T401]
[ 101.588355][ T401] Possible unsafe locking scenario:
[ 101.588355][ T401]
[ 101.590974][ T401] CPU0 CPU1
[ 101.592889][ T401] ---- ----
[ 101.594743][ T401] lock((work_completion)(&cl->work)#2);
[ 101.596785][ T401] lock((wq_completion)bcache_writeback_wq);
[ 101.600072][ T401] lock((work_completion)(&cl->work)#2);
[ 101.602971][ T401] lock((wq_completion)bcache_writeback_wq);
[ 101.605255][ T401]
[ 101.605255][ T401] *** DEADLOCK ***
[ 101.605255][ T401]
[ 101.608310][ T401] 2 locks held by kworker/2:2/401:
[ 101.610208][ T401] #0: 00000000cf2c7d17 ((wq_completion)events){+.+.}, at: process_one_work+0x21e/0x640
[ 101.613709][ T401] #1: 00000000f5f305b3 ((work_completion)(&cl->work)#2){+.+.}, at: process_one_work+0x21e/0x640
[ 101.617480][ T401]
[ 101.617480][ T401] stack backtrace:
[ 101.619539][ T401] CPU: 2 PID: 401 Comm: kworker/2:2 Tainted: G W 5.2.0-rc4-lp151.20-default+ #1
[ 101.623225][ T401] Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 04/13/2018
[ 101.627210][ T401] Workqueue: events cached_dev_free [bcache]
[ 101.629239][ T401] Call Trace:
[ 101.630360][ T401] dump_stack+0x85/0xcb
[ 101.631777][ T401] print_circular_bug+0x19a/0x1f0
[ 101.633485][ T401] __lock_acquire+0x16cd/0x1850
[ 101.635184][ T401] ? __lock_acquire+0x6a8/0x1850
[ 101.636863][ T401] ? lock_acquire+0xb4/0x1c0
[ 101.638421][ T401] ? find_held_lock+0x34/0xa0
[ 101.640015][ T401] lock_acquire+0xb4/0x1c0
[ 101.641513][ T401] ? flush_workqueue+0x87/0x4c0
[ 101.643248][ T401] flush_workqueue+0xae/0x4c0
[ 101.644832][ T401] ? flush_workqueue+0x87/0x4c0
[ 101.646476][ T401] ? drain_workqueue+0xa9/0x180
[ 101.648303][ T401] drain_workqueue+0xa9/0x180
[ 101.649867][ T401] destroy_workqueue+0x17/0x250
[ 101.651503][ T401] cached_dev_free+0x44/0x120 [bcache]
[ 101.653328][ T401] process_one_work+0x2a4/0x640
[ 101.655029][ T401] worker_thread+0x39/0x3f0
[ 101.656693][ T401] ? process_one_work+0x640/0x640
[ 101.658501][ T401] kthread+0x125/0x140
[ 101.660012][ T401] ? kthread_create_worker_on_cpu+0x70/0x70
[ 101.661985][ T401] ret_from_fork+0x3a/0x50
[ 101.691318][ T401] bcache: bcache_device_free() bcache0 stoppedHere is how the above potential deadlock may happen in reboot/shutdown code path,
1) bcache_reboot() is called firstly in the reboot/shutdown code path, then in bcache_reboot(), bcache_device_stop() is called.
2) bcache_device_stop() sets BCACHE_DEV_CLOSING on d->falgs, then call closure_queue(&d->cl) to invoke cached_dev_flush(). And in turn cached_dev_flush() calls cached_dev_free() via closure_at()
3) In cached_dev_free(), after stopped writebach kthread dc->writeback_thread, the kwork dc->writeback_write_wq is stopping by destroy_workqueue().
4) Inside destroy_workqueue(), drain_workqueue() is called. Inside drain_workqueue(), flush_workqueue() is called. Then wq->lockdep_map is acquired by lock_map_acquire() in flush_workqueue(). After the lock acquired the rest part of flush_workqueue() just wait for the workqueue to complete.
5) Now we look back at writeback thread routine bch_writeback_thread(), in the main while-loop, write_dirty() is called via continue_at() in read_dirty_submit(), which is called via continue_at() in while-loop level called function read_dirty(). Inside write_dirty() it may be re-called on workqueeu dc->writeback_write_wq via continue_at(). It means when the writeback kthread is stopped in cached_dev_free() there might be still one kworker queued on dc->writeback_write_wq to execute write_dirty() again.
6) Now this kworker is scheduled on dc->writeback_write_wq to run by process_one_work() (which is called by worker_thread()). Before calling the kwork routine, wq->lockdep_map is acquired.
7) But wq->lockdep_map is acquired already in step 4), so a A-A lock (lockdep terminology) scenario happens.
Indeed on multiple cores syatem, the above deadlock is very rare to happen, just as the code comments in process_one_work() says,
2263 * AFAICT there is no possible deadlock scenario between the
2264 * flush_work() and complete() primitives (except for
single-threaded
2265 * workqueues), so hiding them isn't a problem.
But it is still good to fix such lockdep warning, even no one running bcache on single core system.
The fix is simple. This patch solves the above potential deadlock by,
- Do not destroy workqueue dc->writeback_write_wq in cached_dev_free().
- Flush and destroy dc->writeback_write_wq in writebach kthread routine bch_writeback_thread(), where after quit the thread main while-loop and before cached_dev_put() is called.
By this fix, dc->writeback_write_wq will be stopped and destroy before the writeback kthread stopped, so the chance for a A-A locking on wq->lockdep_map is disappeared, such A-A deadlock won't happen any more.
--- drivers/md/bcache/super.c | 2 -- drivers/md/bcache/writeback.c | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/md/bcache/super.c +0 -2
@@ -1185,8 +1185,6 @@ static void cached_dev_free(struct closure *cl)if (!IS_ERR_OR_NULL (dc->writeback_thread))kthread_stop (dc->writeback_thread); -if (dc->writeback_write_wq) -destroy_workqueue (dc->writeback_write_wq);if (!IS_ERR_OR_NULL (dc->status_update_thread))kthread_stop (dc->status_update_thread);
drivers/md/bcache/writeback.c +4 -0
@@ -708,6 +708,10 @@ static int bch_writeback_thread(void *arg) } } +if (dc->writeback_write_wq) { +flush_workqueue (dc->writeback_write_wq); +destroy_workqueue (dc->writeback_write_wq); + }cached_dev_put (dc);wait_for_kthread_stop ();
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 129/271 net: hns3: fix a -Wformat-nonliteral compile warning
In reply to Greg Kroah-Hartman[ Upstream commit 18d219b783da61a6cc77581f55fc4af2fa16bc36 ]
When setting -Wformat=2, there is a compiler warning like this:
hclge_main.c:xxx:x: warning: format not a string literal and no format arguments [-Wformat-nonliteral]
strs[i].desc);
^~~~
This patch adds missing format parameter "%s" to snprintf() to fix it.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +1 -2
@@ -663,8 +663,7 @@ static u8 *hclge_comm_get_strings(u32 stringset,return buff;for (i =0 ; i < size; i++) { -snprintf (buff,ETH_GSTRING_LEN , - strs[i].desc); +snprintf (buff,ETH_GSTRING_LEN ,"%s" , strs[i].desc); buff = buff +ETH_GSTRING_LEN ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 130/271 net: hns3: add some error checking in hclge_tm module
In reply to Greg Kroah-Hartman[ Upstream commit 04f25edb48c441fc278ecc154c270f16966cbb90 ]
When hdev->tx_sch_mode is HCLGE_FLAG_VNET_BASE_SCH_MODE, the hclge_tm_schd_mode_vnet_base_cfg calls hclge_tm_pri_schd_mode_cfg with vport->vport_id as pri_id, which is used as index for hdev->tm_info.tc_info, it will cause out of bound access issue if vport_id is equal to or larger than HNAE3_MAX_TC.
Also hardware only support maximum speed of HCLGE_ETHER_MAX_RATE.
So this patch adds two checks for above cases.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c +5 -1
@@ -54,7 +54,8 @@ static int hclge_shaper_para_calc(u32 ir, u8 shaper_level,u32 tick;/* Calc tick */ -if (shaper_level >=HCLGE_SHAPER_LVL_CNT ) +if (shaper_level >=HCLGE_SHAPER_LVL_CNT || + ir >HCLGE_ETHER_MAX_RATE )return -EINVAL ; tick = tick_array[shaper_level];
@@ -1057,6 +1058,9 @@ static int hclge_tm_schd_mode_vnet_base_cfg(struct hclge_vport *vport)int ret;u8 i; +if (vport->vport_id >=HNAE3_MAX_TC ) +return -EINVAL ; + ret =hclge_tm_pri_schd_mode_cfg (hdev, vport->vport_id);if (ret)return ret;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 121/271 crypto: asymmetric_keys - select CRYPTO_HASH where needed
In reply to Greg Kroah-Hartman[ Upstream commit 90acc0653d2bee203174e66d519fbaaa513502de ]
Build testing with some core crypto options disabled revealed a few modules that are missing CRYPTO_HASH:
crypto/asymmetric_keys/x509_public_key.o: In function `x509_get_sig_params':
x509_public_key.c:(.text+0x4c7): undefined reference to crypto_alloc_shash' x509_public_key.c:(.text+0x5e5): undefined reference to crypto_shash_digest' crypto/asymmetric_keys/pkcs7_verify.o: In function `pkcs7_digest.isra.0':
pkcs7_verify.c:(.text+0xab): undefined reference to crypto_alloc_shash' pkcs7_verify.c:(.text+0x1b2): undefined reference to crypto_shash_digest' pkcs7_verify.c:(.text+0x3c1): undefined reference to crypto_shash_update' pkcs7_verify.c:(.text+0x411): undefined reference to crypto_shash_finup'
This normally doesn't show up in randconfig tests because there is a large number of other options that select CRYPTO_HASH.
--- crypto/asymmetric_keys/Kconfig | 3 +++ 1 file changed, 3 insertions(+)
crypto/asymmetric_keys/Kconfig +3 -0
@@ -15,6 +15,7 @@ config ASYMMETRIC_PUBLIC_KEY_SUBTYPE select MPILIB select CRYPTO_HASH_INFO select CRYPTO_AKCIPHER + select CRYPTO_HASH help This option provides support for asymmetric public key type handling. If signature generation and/or verification are to be used,
@@ -34,6 +35,7 @@ config X509_CERTIFICATE_PARSER config PKCS7_MESSAGE_PARSER tristate "PKCS#7 message parser" depends on X509_CERTIFICATE_PARSER + select CRYPTO_HASH select ASN1 select OID_REGISTRY help
@@ -56,6 +58,7 @@ config SIGNED_PE_FILE_VERIFICATION bool "Support for PE file signature verification" depends on PKCS7_MESSAGE_PARSER=y depends on SYSTEM_DATA_VERIFICATION + select CRYPTO_HASH select ASN1 select OID_REGISTRY help
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 167/271 Revert "scsi: ncr5380: Increase register polling limit"
In reply to Greg Kroah-HartmanFrom: Finn Thain <[email protected]>
commit 25fcf94a2fa89dd3e73e965ebb0b38a2a4f72aa4 upstream.
This reverts commit 4822827a69d7cd3bc5a07b7637484ebd2cf88db6.
The purpose of that commit was to suppress a timeout warning message which appeared to be caused by target latency. But suppressing the warning is undesirable as the warning may indicate a messed up transfer count.
Another problem with that commit is that 15 ms is too long to keep interrupts disabled as interrupt latency can cause system clock drift and other problems.
--- drivers/scsi/NCR5380.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/NCR5380.h +1 -1
@@ -235,7 +235,7 @@ struct NCR5380_cmd {#define NCR5380_PIO_CHUNK_SIZE 256/* Time limit (ms) to poll registers when IRQs are disabled, e.g. during PDMA */ -#define NCR5380_REG_POLL_TIME 15 +#define NCR5380_REG_POLL_TIME 10static inline struct scsi_cmnd *NCR5380_to_scmd (struct NCR5380_cmd *ncmd_ptr) {
Greg Kroah-Hartman
maintainerPATCH 177/271 crypto: crypto4xx - fix AES CTR blocksize value
In reply to Greg Kroah-HartmanFrom: Christian Lamparter <[email protected]>
commit bfa2ba7d9e6b20aca82b99e6842fe18842ae3a0f upstream.
This patch fixes a issue with crypto4xx's ctr(aes) that was discovered by libcapi's kcapi-enc-test.sh test.
The some of the ctr(aes) encryptions test were failing on the non-power-of-two test:
kcapi-enc - Error: encryption failed with error 0
kcapi-enc - Error: decryption failed with error 0
[FAILED: 32-bit - 5.1.0-rc1+] 15 bytes: STDIN / STDOUT enc test (128 bits):
original file (1d100e..cc96184c) and generated file (e3b0c442..1b7852b855) [FAILED: 32-bit - 5.1.0-rc1+] 15 bytes: STDIN / STDOUT enc test (128 bits) (openssl generated CT): original file (e3b0..5) and generated file (3..8e) [PASSED: 32-bit - 5.1.0-rc1+] 15 bytes: STDIN / STDOUT enc test (128 bits) (openssl generated PT)
[FAILED: 32-bit - 5.1.0-rc1+] 15 bytes: STDIN / STDOUT enc test (password):
original file (1d1..84c) and generated file (e3b..852b855)
But the 16, 32, 512, 65536 tests always worked.
Thankfully, this isn't a hidden hardware problem like previously, instead this turned out to be a copy and paste issue.
With this patch, all the tests are passing with and kcapi-enc-test.sh gives crypto4xx's a clean bill of health:
"Number of failures: 0" :).
--- drivers/crypto/amcc/crypto4xx_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/crypto/amcc/crypto4xx_core.c +2 -2
@@ -1186,7 +1186,7 @@ static struct crypto4xx_alg_common crypt .cra_flags = CRYPTO_ALG_NEED_FALLBACK |CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY, - .cra_blocksize = AES_BLOCK_SIZE, + .cra_blocksize = 1, .cra_ctxsize = sizeof(struct crypto4xx_ctx), .cra_module = THIS_MODULE, },
@@ -1206,7 +1206,7 @@ static struct crypto4xx_alg_common crypt .cra_priority = CRYPTO4XX_CRYPTO_PRIORITY, .cra_flags =CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY, - .cra_blocksize = AES_BLOCK_SIZE, + .cra_blocksize = 1, .cra_ctxsize = sizeof(struct crypto4xx_ctx), .cra_module = THIS_MODULE, },
Greg Kroah-Hartman
maintainerPATCH 178/271 crypto: crypto4xx - fix blocksize for cfb and ofb
In reply to Greg Kroah-HartmanFrom: Christian Lamparter <[email protected]>
commit 70c4997f34b6c6888b3ac157adec49e01d0df2d5 upstream.
While the hardware consider them to be blockciphers, the reference implementation defines them as streamciphers.
Do the right thing and set the blocksize to 1. This was found by CONFIG_CRYPTO_MANAGER_EXTRA_TESTS.
This fixes the following issues:
skcipher: blocksize for ofb-aes-ppc4xx (16) doesn't match generic impl (1)
skcipher: blocksize for cfb-aes-ppc4xx (16) doesn't match generic impl (1)
--- drivers/crypto/amcc/crypto4xx_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/crypto/amcc/crypto4xx_core.c +2 -2
@@ -1226,7 +1226,7 @@ static struct crypto4xx_alg_common crypt .cra_priority = CRYPTO4XX_CRYPTO_PRIORITY, .cra_flags =CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY, - .cra_blocksize = AES_BLOCK_SIZE, + .cra_blocksize = 1, .cra_ctxsize = sizeof(struct crypto4xx_ctx), .cra_module = THIS_MODULE, },
@@ -1245,7 +1245,7 @@ static struct crypto4xx_alg_common crypt .cra_priority = CRYPTO4XX_CRYPTO_PRIORITY, .cra_flags =CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY, - .cra_blocksize = AES_BLOCK_SIZE, + .cra_blocksize = 1, .cra_ctxsize = sizeof(struct crypto4xx_ctx), .cra_module = THIS_MODULE, },
Greg Kroah-Hartman
maintainerPATCH 179/271 crypto: crypto4xx - block ciphers should only accept complete blocks
In reply to Greg Kroah-HartmanFrom: Christian Lamparter <[email protected]>
commit 0f7a81374060828280fcfdfbaa162cb559017f9f upstream.
The hardware automatically zero pads incomplete block ciphers blocks without raising any errors. This is a screw-up. This was noticed by CONFIG_CRYPTO_MANAGER_EXTRA_TESTS tests that sent a incomplete blocks and expect them to fail.
This fixes:
cbc-aes-ppc4xx encryption unexpectedly succeeded on test vector "random: len=2409 klen=32"; expected_error=-22, cfg="random:may_sleep use_digest src_divs=[96.90%@+2295, 2.34%@+4066, 0.32%@alignmask+12, 0.34%@+4087, 0.9%@alignmask+1787, 0.1%@+3767] iv_offset=6"
ecb-aes-ppc4xx encryption unexpectedly succeeded on test vector "random: len=1011 klen=32"; expected_error=-22, cfg="random:may_sleep use_digest src_divs=[100.0%@alignmask+20] dst_divs=[3.12%@+3001, 96.88%@+4070]"
--- drivers/crypto/amcc/crypto4xx_alg.c | 36 ++++++++++++++++++++++++----------- drivers/crypto/amcc/crypto4xx_core.c | 16 +++++++-------- drivers/crypto/amcc/crypto4xx_core.h | 10 +++++---- 3 files changed, 39 insertions(+), 23 deletions(-)
drivers/crypto/amcc/crypto4xx_alg.c +25 -11
@@ -76,12 +76,16 @@ static void set_dynamic_sa_command_1(str }static inline int crypto4xx_crypt (struct skcipher_request *req, -const unsigned int ivlen,bool decrypt) +const unsigned int ivlen,bool decrypt, +bool check_blocksize) {struct crypto_skcipher *cipher =crypto_skcipher_reqtfm (req);struct crypto4xx_ctx *ctx =crypto_skcipher_ctx (cipher);__le32 iv[AES_IV_SIZE ]; +if (check_blocksize && !IS_ALIGNED (req->cryptlen,AES_BLOCK_SIZE )) +return -EINVAL ; +if (ivlen)crypto4xx_memcpy_to_le32 (iv, req->iv, ivlen);
@@ -90,24 +94,34 @@ static inline int crypto4xx_crypt(struct ctx->sa_len, 0, NULL); } -int crypto4xx_encrypt_noiv (struct skcipher_request *req) +int crypto4xx_encrypt_noiv_block (struct skcipher_request *req) +{ +return crypto4xx_crypt (req,0 , false, true); +} + +int crypto4xx_encrypt_iv_stream (struct skcipher_request *req) +{ +return crypto4xx_crypt (req,AES_IV_SIZE , false, false); +} + +int crypto4xx_decrypt_noiv_block (struct skcipher_request *req) { -return crypto4xx_crypt (req,0 , false); +return crypto4xx_crypt (req,0 , true, true); } -int crypto4xx_encrypt_iv (struct skcipher_request *req) +int crypto4xx_decrypt_iv_stream (struct skcipher_request *req) { -return crypto4xx_crypt (req,AES_IV_SIZE , false); +return crypto4xx_crypt (req,AES_IV_SIZE , true, false); } -int crypto4xx_decrypt_noiv (struct skcipher_request *req) +int crypto4xx_encrypt_iv_block (struct skcipher_request *req) { -return crypto4xx_crypt (req,0 , true); +return crypto4xx_crypt (req,AES_IV_SIZE , false, true); } -int crypto4xx_decrypt_iv (struct skcipher_request *req) +int crypto4xx_decrypt_iv_block (struct skcipher_request *req) { -return crypto4xx_crypt (req,AES_IV_SIZE , true); +return crypto4xx_crypt (req,AES_IV_SIZE , true, true); }/**
@@ -278,8 +292,8 @@ crypto4xx_ctr_crypt(struct skcipher_requreturn ret; } -return encrypt ?crypto4xx_encrypt_iv (req) - :crypto4xx_decrypt_iv (req); +return encrypt ?crypto4xx_encrypt_iv_stream (req) + :crypto4xx_decrypt_iv_stream (req); } static int crypto4xx_sk_setup_fallback(struct crypto4xx_ctx *ctx,
drivers/crypto/amcc/crypto4xx_core.c +8 -8
@@ -1153,8 +1153,8 @@ static struct crypto4xx_alg_common crypt .max_keysize = AES_MAX_KEY_SIZE, .ivsize = AES_IV_SIZE, .setkey = crypto4xx_setkey_aes_cbc, - .encrypt = crypto4xx_encrypt_iv, - .decrypt = crypto4xx_decrypt_iv, + .encrypt = crypto4xx_encrypt_iv_block, + .decrypt = crypto4xx_decrypt_iv_block, .init = crypto4xx_sk_init, .exit = crypto4xx_sk_exit, } },
@@ -1173,8 +1173,8 @@ static struct crypto4xx_alg_common crypt .max_keysize = AES_MAX_KEY_SIZE, .ivsize = AES_IV_SIZE, .setkey = crypto4xx_setkey_aes_cfb, - .encrypt = crypto4xx_encrypt_iv, - .decrypt = crypto4xx_decrypt_iv, + .encrypt = crypto4xx_encrypt_iv_stream, + .decrypt = crypto4xx_decrypt_iv_stream, .init = crypto4xx_sk_init, .exit = crypto4xx_sk_exit, } },
@@ -1233,8 +1233,8 @@ static struct crypto4xx_alg_common crypt .min_keysize = AES_MIN_KEY_SIZE, .max_keysize = AES_MAX_KEY_SIZE, .setkey = crypto4xx_setkey_aes_ecb, - .encrypt = crypto4xx_encrypt_noiv, - .decrypt = crypto4xx_decrypt_noiv, + .encrypt = crypto4xx_encrypt_noiv_block, + .decrypt = crypto4xx_decrypt_noiv_block, .init = crypto4xx_sk_init, .exit = crypto4xx_sk_exit, } },
@@ -1253,8 +1253,8 @@ static struct crypto4xx_alg_common crypt .max_keysize = AES_MAX_KEY_SIZE, .ivsize = AES_IV_SIZE, .setkey = crypto4xx_setkey_aes_ofb, - .encrypt = crypto4xx_encrypt_iv, - .decrypt = crypto4xx_decrypt_iv, + .encrypt = crypto4xx_encrypt_iv_stream, + .decrypt = crypto4xx_decrypt_iv_stream, .init = crypto4xx_sk_init, .exit = crypto4xx_sk_exit, } },
drivers/crypto/amcc/crypto4xx_core.h +6 -4
@@ -179,10 +179,12 @@ int crypto4xx_setkey_rfc3686(struct cryp const u8 *key, unsigned int keylen);int crypto4xx_encrypt_ctr (struct skcipher_request *req);int crypto4xx_decrypt_ctr (struct skcipher_request *req); -int crypto4xx_encrypt_iv (struct skcipher_request *req); -int crypto4xx_decrypt_iv (struct skcipher_request *req); -int crypto4xx_encrypt_noiv (struct skcipher_request *req); -int crypto4xx_decrypt_noiv (struct skcipher_request *req); +int crypto4xx_encrypt_iv_stream (struct skcipher_request *req); +int crypto4xx_decrypt_iv_stream (struct skcipher_request *req); +int crypto4xx_encrypt_iv_block (struct skcipher_request *req); +int crypto4xx_decrypt_iv_block (struct skcipher_request *req); +int crypto4xx_encrypt_noiv_block (struct skcipher_request *req); +int crypto4xx_decrypt_noiv_block (struct skcipher_request *req);int crypto4xx_rfc3686_encrypt (struct skcipher_request *req);int crypto4xx_rfc3686_decrypt (struct skcipher_request *req);int crypto4xx_sha1_alg_init (struct crypto_tfm *tfm);
Greg Kroah-Hartman
maintainerPATCH 181/271 crypto: ccp/gcm - use const time tag comparison.
In reply to Greg Kroah-HartmanFrom: Cfir Cohen <[email protected]>
commit 538a5a072e6ef04377b180ee9b3ce5bae0a85da4 upstream.
Avoid leaking GCM tag through timing side channel.
--- drivers/crypto/ccp/ccp-ops.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/crypto/ccp/ccp-ops.c +2 -1
@@ -853,7 +853,8 @@ static int ccp_run_aes_gcm_cmd(struct ccif (ret) goto e_tag; - ret =memcmp (tag.address, final_wa.address,AES_BLOCK_SIZE ); + ret =crypto_memneq (tag.address, final_wa.address, +AES_BLOCK_SIZE ) ? -EBADMSG :0 ;ccp_dm_free (&tag); }
Greg Kroah-Hartman
maintainerPATCH 182/271 crypto: crypto4xx - fix a potential double free in ppc4xx_trng_probe
In reply to Greg Kroah-HartmanFrom: Wen Yang <[email protected]>
commit 95566aa75cd6b3b404502c06f66956b5481194b3 upstream.
There is a possible double free issue in ppc4xx_trng_probe():
85: dev->trng_base = of_iomap(trng, 0);
86: of_node_put(trng); ---> released here
87: if (!dev->trng_base)
88: goto err_out;
...
110: ierr_out:
111: of_node_put(trng); ---> double released here
...
This issue was detected by using the Coccinelle software. We fix it by removing the unnecessary of_node_put().
--- drivers/crypto/amcc/crypto4xx_trng.c | 1 - 1 file changed, 1 deletion(-)
drivers/crypto/amcc/crypto4xx_trng.c +0 -1
@@ -111,7 +111,6 @@ void ppc4xx_trng_probe(struct crypto4xx_return ; err_out: -of_node_put (trng);iounmap (dev->trng_base);kfree (rng); dev->trng_base =NULL ;