ARM: dts: bcm283x: Fix hdmi hpd gpio pull
Subsystems (16)
Sasha Levin
maintainerPATCH 1/43 ARM: dts: bcm283x: Fix hdmi hpd gpio pull
From: Helen Koike <[email protected]>
[ Upstream commit 544e784188f1dd7c797c70b213385e67d92005b6 ]
Raspberry pi board model B revison 2 have the hot plug detector gpio active high (and not low as it was in the dts).
--- arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts +1 -1
@@ -93,7 +93,7 @@ }; &hdmi { - hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>; + hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>; }; &uart0 {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 2/43 s390: limit brk randomization to 32MB
From: Martin Schwidefsky <[email protected]>
[ Upstream commit cd479eccd2e057116d504852814402a1e68ead80 ]
For a 64-bit process the randomization of the program break is quite large with 1GB. That is as big as the randomization of the anonymous mapping base, for a test case started with '/lib/ld64.so.1 <exec>' it can happen that the heap is placed after the stack. To avoid this limit the program break randomization to 32MB for 64-bit and keep 8MB for 31-bit.
--- arch/s390/include/asm/elf.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
arch/s390/include/asm/elf.h +7 -4
@@ -252,11 +252,14 @@ do { \/* * Cache aliasing on the latest machines calls for a mapping granularity -* of 512KB. For 64-bit processes use a 512KB alignment and a randomization -* of up to 1GB. For 31-bit processes the virtual address space is limited, -* use no alignment and limit the randomization to 8MB. +* of 512KB for the anonymous mapping base. For 64-bit processes use a +* 512KB alignment and a randomization of up to 1GB. For 31-bit processes +* the virtual address space is limited, use no alignment and limit the +* randomization to 8MB. +* For the additional randomization of the program break use 32MB for +* 64-bit and 8MB for 31-bit. */ -#define BRK_RND_MASK (is_compat_task() ? 0x7ffUL : 0x3ffffUL) +#define BRK_RND_MASK (is_compat_task() ? 0x7ffUL : 0x1fffUL)#define MMAP_RND_MASK (is_compat_task() ? 0x7ffUL : 0x3ff80UL)#define MMAP_ALIGN_MASK (is_compat_task() ? 0 : 0x7fUL)#define STACK_RND_MASK MMAP_RND_MASK
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 3/43 qlcnic: Avoid potential NULL pointer dereference
In reply to Sasha LevinFrom: Aditya Pakki <[email protected]>
[ Upstream commit 5bf7295fe34a5251b1d241b9736af4697b590670 ]
netdev_alloc_skb can fail and return a NULL pointer which is dereferenced without a check. The patch avoids such a scenario.
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c +2 -0
@@ -1047,6 +1047,8 @@ int qlcnic_do_lb_test(struct qlcnic_adapter *adapter, u8 mode)for (i =0 ; i <QLCNIC_NUM_ILB_PKT ; i++) { skb =netdev_alloc_skb (adapter->netdev,QLCNIC_ILB_PKT_SIZE ); +if (!skb) +break ;qlcnic_create_loopback_buff (skb->data, adapter->mac_addr);skb_put (skb,QLCNIC_ILB_PKT_SIZE ); adapter->ahw->diag_cnt =0 ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 4/43 netfilter: nft_set_rbtree: check for inactive element after flag mismatch
In reply to Sasha LevinFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 05b7639da55f5555b9866a1f4b7e8995232a6323 ]
Otherwise, we hit bogus ENOENT when removing elements.
--- net/netfilter/nft_set_rbtree.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
net/netfilter/nft_set_rbtree.c +3 -4
@@ -224,10 +224,6 @@ static void *nft_rbtree_deactivate(const struct net *net,else if (d >0 ) parent = parent->rb_right;else { -if (!nft_set_elem_active (&rbe->ext, genmask)) { - parent = parent->rb_left; -continue ; - }if (nft_rbtree_interval_end (rbe) && !nft_rbtree_interval_end (this)) { parent = parent->rb_left;
@@ -236,6 +232,9 @@ static void *nft_rbtree_deactivate(const struct net *net, nft_rbtree_interval_end(this)) { parent = parent->rb_right;continue ; + } else if (!nft_set_elem_active(&rbe->ext, genmask)) { + parent = parent->rb_left; +continue ; }nft_rbtree_flush (net, set, rbe);return rbe;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 5/43 netfilter: bridge: set skb transport_header before entering NF_INET_PRE_ROUTING
In reply to Sasha LevinFrom: Xin Long <[email protected]>
[ Upstream commit e166e4fdaced850bee3d5ee12a5740258fb30587 ]
Since Commit 21d1196a35f5 ("ipv4: set transport header earlier"), skb->transport_header has been always set before entering INET netfilter. This patch is to set skb->transport_header for bridge before entering INET netfilter by bridge-nf-call-iptables.
It also fixes an issue that sctp_error() couldn't compute a right csum due to unset skb->transport_header.
--- net/bridge/br_netfilter_hooks.c | 1 + net/bridge/br_netfilter_ipv6.c | 2 ++ 2 files changed, 3 insertions(+)
net/bridge/br_netfilter_hooks.c +1 -0
@@ -512,6 +512,7 @@ static unsigned int br_nf_pre_routing(void *priv, nf_bridge->ipv4_daddr =ip_hdr (skb)->daddr; skb->protocol =htons (ETH_P_IP ); + skb->transport_header = skb->network_header +ip_hdr (skb)->ihl *4 ; NF_HOOK(NFPROTO_IPV4, NF_INET_PRE_ROUTING, state->net, state->sk, skb, skb->dev, NULL,
net/bridge/br_netfilter_ipv6.c +2 -0
@@ -235,6 +235,8 @@ unsigned int br_nf_pre_routing_ipv6(void *priv, nf_bridge->ipv6_daddr =ipv6_hdr (skb)->daddr; skb->protocol =htons (ETH_P_IPV6 ); + skb->transport_header = skb->network_header +sizeof (struct ipv6hdr ); +NF_HOOK (NFPROTO_IPV6 ,NF_INET_PRE_ROUTING , state->net, state->sk, skb, skb->dev,NULL , br_nf_pre_routing_finish_ipv6);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 6/43 s390/qeth: fix race when initializing the IP address table
In reply to Sasha LevinFrom: Julian Wiedmann <[email protected]>
[ Upstream commit 7221b727f0079a32aca91f657141e1de564d4b97 ]
The ucast IP table is utilized by some of the L3-specific sysfs attributes that qeth_l3_create_device_attributes() provides. So initialize the table _before_ registering the attributes.
--- drivers/s390/net/qeth_l3_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/s390/net/qeth_l3_main.c +3 -1
@@ -3022,12 +3022,14 @@ static int qeth_l3_probe_device(struct ccwgroup_device *gdev)struct qeth_card *card =dev_get_drvdata (&gdev->dev);int rc; +hash_init (card->ip_htable); +if (gdev->dev.type == &qeth_generic_devtype) { rc =qeth_l3_create_device_attributes (&gdev->dev);if (rc)return rc; } -hash_init (card->ip_htable); +hash_init (card->ip_mc_htable); card->options.layer2 =0 ; card->info.hwtrap =0 ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 7/43 sc16is7xx: missing unregister/delete driver on error in sc16is7xx_init()
In reply to Sasha LevinFrom: Mao Wenan <[email protected]>
[ Upstream commit ac0cdb3d990108df795b676cd0d0e65ac34b2273 ]
Add the missing uart_unregister_driver() and i2c_del_driver() before return from sc16is7xx_init() in the error handling case.
--- drivers/tty/serial/sc16is7xx.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/tty/serial/sc16is7xx.c +10 -2
@@ -1483,7 +1483,7 @@ static int __init sc16is7xx_init(void) ret =i2c_add_driver (&sc16is7xx_i2c_uart_driver);if (ret <0 ) {pr_err ("failed to init sc16is7xx i2c --> %d\n" , ret); -return ret; + goto err_i2c; }#endif
@@ -1491,10 +1491,18 @@ static int __init sc16is7xx_init(void) ret =spi_register_driver (&sc16is7xx_spi_uart_driver);if (ret <0 ) {pr_err ("failed to init sc16is7xx spi --> %d\n" , ret); -return ret; + goto err_spi; }#endif return ret; + +err_spi: +#ifdef CONFIG_SERIAL_SC16IS7XX_I2C +i2c_del_driver (&sc16is7xx_i2c_uart_driver); +#endif +err_i2c: +uart_unregister_driver (&sc16is7xx_uart); +return ret; }module_init (sc16is7xx_init);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 8/43 serial: ar933x_uart: Fix build failure with disabled console
In reply to Sasha LevinFrom: Petr Štetiar <[email protected]>
[ Upstream commit 72ff51d8dd262d1fef25baedc2ac35116435be47 ]
Andrey has reported on OpenWrt's bug tracking system[1], that he currently can't use ar93xx_uart as pure serial UART without console (CONFIG_SERIAL_8250_CONSOLE and CONFIG_SERIAL_AR933X_CONSOLE undefined), because compilation ends with following error:
ar933x_uart.c: In function 'ar933x_uart_console_write':
ar933x_uart.c:550:14: error: 'struct uart_port' has no
member named 'sysrq'
So this patch moves all the code related to console handling behind series of CONFIG_SERIAL_AR933X_CONSOLE ifdefs.
1. https://bugs.openwrt.org/index.php?do=details&task_id=2152
--- drivers/tty/serial/ar933x_uart.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-)
drivers/tty/serial/ar933x_uart.c +8 -16
@@ -52,11 +52,6 @@ struct ar933x_uart_port {struct clk *clk; }; -static inline bool ar933x_uart_console_enabled (void ) -{ -return IS_ENABLED (CONFIG_SERIAL_AR933X_CONSOLE ); -} -static inline unsigned int ar933x_uart_read (struct ar933x_uart_port *up,int offset) {
@@ -511,6 +506,7 @@ static const struct uart_ops ar933x_uart_ops = { .verify_port = ar933x_uart_verify_port, }; +#ifdef CONFIG_SERIAL_AR933X_CONSOLE static struct ar933x_uart_port * ar933x_console_ports[CONFIG_SERIAL_AR933X_NR_UARTS ];
@@ -607,14 +603,7 @@ static struct console ar933x_uart_console = { .index = -1, .data = &ar933x_uart_driver, }; - -static void ar933x_uart_add_console_port (struct ar933x_uart_port *up) -{ -if (!ar933x_uart_console_enabled ()) -return ; - - ar933x_console_ports[up->port.line] = up; -} +#endif /* CONFIG_SERIAL_AR933X_CONSOLE */ static struct uart_driver ar933x_uart_driver = { .owner =THIS_MODULE ,
@@ -703,7 +692,9 @@ static int ar933x_uart_probe(struct platform_device *pdev) baud =ar933x_uart_get_baud (port->uartclk,0 ,AR933X_UART_MAX_STEP ); up->max_baud = min_t(unsigned int, baud, AR933X_UART_MAX_BAUD); -ar933x_uart_add_console_port (up); +#ifdef CONFIG_SERIAL_AR933X_CONSOLE + ar933x_console_ports[up->port.line] = up; +#endif ret =uart_add_one_port (&ar933x_uart_driver, &up->port);if (ret)
@@ -752,8 +743,9 @@ static int __init ar933x_uart_init(void) {int ret; -if (ar933x_uart_console_enabled ()) - ar933x_uart_driver.cons = &ar933x_uart_console; +#ifdef CONFIG_SERIAL_AR933X_CONSOLE + ar933x_uart_driver.cons = &ar933x_uart_console; +#endif ret =uart_register_driver (&ar933x_uart_driver);if (ret)
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 9/43 KVM: arm/arm64: vgic-its: Take the srcu lock when parsing the memslots
In reply to Sasha LevinFrom: Marc Zyngier <[email protected]>
[ Upstream commit 7494cec6cb3ba7385a6a223b81906384f15aae34 ]
Calling kvm_is_visible_gfn() implies that we're parsing the memslots, and doing this without the srcu lock is frown upon:
[12704.164532] =============================
[12704.164544] WARNING: suspicious RCU usage
[12704.164560] 5.1.0-rc1-00008-g600025238f51-dirty #16 Tainted: G W
[12704.164573] -----------------------------
[12704.164589] ./include/linux/kvm_host.h:605 suspicious rcu_dereference_check() usage!
[12704.164602] other info that might help us debug this:
[12704.164616] rcu_scheduler_active = 2, debug_locks = 1
[12704.164631] 6 locks held by qemu-system-aar/13968:
[12704.164644] #0: 000000007ebdae4f (&kvm->lock){+.+.}, at: vgic_its_set_attr+0x244/0x3a0
[12704.164691] #1: 000000007d751022 (&its->its_lock){+.+.}, at: vgic_its_set_attr+0x250/0x3a0
[12704.164726] #2: 00000000219d2706 (&vcpu->mutex){+.+.}, at: lock_all_vcpus+0x64/0xd0
[12704.164761] #3: 00000000a760aecd (&vcpu->mutex){+.+.}, at: lock_all_vcpus+0x64/0xd0
[12704.164794] #4: 000000000ef8e31d (&vcpu->mutex){+.+.}, at: lock_all_vcpus+0x64/0xd0
[12704.164827] #5: 000000007a872093 (&vcpu->mutex){+.+.}, at: lock_all_vcpus+0x64/0xd0
[12704.164861] stack backtrace:
[12704.164878] CPU: 2 PID: 13968 Comm: qemu-system-aar Tainted: G W 5.1.0-rc1-00008-g600025238f51-dirty #16
[12704.164887] Hardware name: rockchip evb_rk3399/evb_rk3399, BIOS 2019.04-rc3-00124-g2feec69fb1 03/15/2019
[12704.164896] Call trace:
[12704.164910] dump_backtrace+0x0/0x138
[12704.164920] show_stack+0x24/0x30
[12704.164934] dump_stack+0xbc/0x104
[12704.164946] lockdep_rcu_suspicious+0xcc/0x110
[12704.164958] gfn_to_memslot+0x174/0x190
[12704.164969] kvm_is_visible_gfn+0x28/0x70
[12704.164980] vgic_its_check_id.isra.0+0xec/0x1e8
[12704.164991] vgic_its_save_tables_v0+0x1ac/0x330
[12704.165001] vgic_its_set_attr+0x298/0x3a0
[12704.165012] kvm_device_ioctl_attr+0x9c/0xd8
[12704.165022] kvm_device_ioctl+0x8c/0xf8
[12704.165035] do_vfs_ioctl+0xc8/0x960
[12704.165045] ksys_ioctl+0x8c/0xa0
[12704.165055] __arm64_sys_ioctl+0x28/0x38
[12704.165067] el0_svc_common+0xd8/0x138
[12704.165078] el0_svc_handler+0x38/0x78
[12704.165089] el0_svc+0x8/0xcMake sure the lock is taken when doing this.
--- virt/kvm/arm/vgic/vgic-its.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
virt/kvm/arm/vgic/vgic-its.c +10 -3
@@ -704,8 +704,9 @@ static bool vgic_its_check_id(struct vgic_its *its, u64 baser, u32 id,int l1_tbl_size =GITS_BASER_NR_PAGES (baser) *SZ_64K ;u64 indirect_ptr, type =GITS_BASER_TYPE (baser);int esz =GITS_BASER_ENTRY_SIZE (baser); -int index; +int index, idx;gfn_t gfn; +bool ret;switch (type) {case GITS_BASER_TYPE_DEVICE :
@@ -732,7 +733,8 @@ static bool vgic_its_check_id(struct vgic_its *its, u64 baser, u32 id,if (eaddr) *eaddr = addr; -return kvm_is_visible_gfn (its->dev->kvm, gfn); + + goto out; }/* calculate and check the index into the 1st level */
@@ -766,7 +768,12 @@ static bool vgic_its_check_id(struct vgic_its *its, u64 baser, u32 id,if (eaddr) *eaddr = indirect_ptr; -return kvm_is_visible_gfn (its->dev->kvm, gfn); + +out: + idx =srcu_read_lock (&its->dev->kvm->srcu); + ret =kvm_is_visible_gfn (its->dev->kvm, gfn); +srcu_read_unlock (&its->dev->kvm->srcu, idx); +return ret; } static int vgic_its_alloc_collection(struct vgic_its *its,
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 10/43 usb: gadget: net2280: Fix overrun of OUT messages
In reply to Sasha LevinFrom: Guido Kiener <[email protected]>
[ Upstream commit 9d6a54c1430647355a5e23434881b2ca3d192b48 ]
The OUT endpoint normally blocks (NAK) subsequent packets when a short packet was received and returns an incomplete queue entry to the gadget driver. Thereby the gadget driver can detect a short packet when reading queue entries with a length that is not equal to a multiple of packet size.
The start_queue() function enables receiving OUT packets regardless of the content of the OUT FIFO. This results in a race: With the current code, it's possible that the "!ep->is_in && (readl(&ep->regs->ep_stat) & BIT(NAK_OUT_PACKETS))" test in start_dma() will fail, then a short packet will be received, and then start_queue() will call stop_out_naking(). That's what we don't want (OUT naking gets turned off while there is data in the FIFO) because then the next driver request might receive a mixture of old and new packets.
With the patch, this race can't occur because the FIFO's state is tested after we know that OUT naking is already turned on, and OUT naking is stopped only when both of the conditions are met. This ensures that all received data is delivered to the gadget driver, which can detect a short packet now before new packets are appended to the last short packet.
--- drivers/usb/gadget/udc/net2280.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/usb/gadget/udc/net2280.c +1 -3
@@ -870,9 +870,6 @@ static void start_queue(struct net2280_ep *ep, u32 dmactl, u32 td_dma) (void )readl (&ep->dev->pci->pcimstctl);writel (BIT (DMA_START ), &dma->dmastat); - -if (!ep->is_in) -stop_out_naking (ep); }static void start_dma (struct net2280_ep *ep,struct net2280_request *req)
@@ -911,6 +908,7 @@ static void start_dma(struct net2280_ep *ep, struct net2280_request *req)writel (BIT (DMA_START ), &dma->dmastat);return ; } +stop_out_naking (ep); } tmp = dmactl_default;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 11/43 usb: gadget: net2280: Fix net2280_dequeue()
In reply to Sasha LevinFrom: Guido Kiener <[email protected]>
[ Upstream commit f1d3fba17cd4eeea20397f1324b7b9c69a6a935c ]
When a request must be dequeued with net2280_dequeue() e.g. due to a device clear action and the same request is finished by the function scan_dma_completions() then the function net2280_dequeue() does not find the request in the following search loop and returns the error -EINVAL without restoring the status ep->stopped. Thus the endpoint keeps blocked and does not receive any data anymore.
This fix restores the status and does not issue an error message.
--- drivers/usb/gadget/udc/net2280.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/gadget/udc/net2280.c +2 -2
@@ -1277,9 +1277,9 @@ static int net2280_dequeue(struct usb_ep *_ep, struct usb_request *_req)break ; }if (&req->req != _req) { + ep->stopped = stopped;spin_unlock_irqrestore (&ep->dev->lock, flags); -dev_err (&ep->dev->pdev->dev,"%s: Request mismatch\n" , - __func__); +ep_dbg (ep->dev,"%s: Request mismatch\n" , __func__);return -EINVAL ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 12/43 usb: gadget: net2272: Fix net2272_dequeue()
In reply to Sasha LevinFrom: Guido Kiener <[email protected]>
[ Upstream commit 091dacc3cc10979ab0422f0a9f7fcc27eee97e69 ]
Restore the status of ep->stopped in function net2272_dequeue().
When the given request is not found in the endpoint queue the function returns -EINVAL without restoring the state of ep->stopped. Thus the endpoint keeps blocked and does not transfer any data anymore.
This fix is only compile-tested, since we do not have a corresponding hardware. An analogous fix was tested in the sibling driver. See "usb: gadget: net2280: Fix net2280_dequeue()"
--- drivers/usb/gadget/udc/net2272.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/gadget/udc/net2272.c +1 -0
@@ -958,6 +958,7 @@ net2272_dequeue(struct usb_ep *_ep, struct usb_request *_req)break ; }if (&req->req != _req) { + ep->stopped = stopped;spin_unlock_irqrestore (&ep->dev->lock, flags);return -EINVAL ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 13/43 ARM: dts: pfla02: increase phy reset duration
In reply to Sasha LevinFrom: Marco Felsch <[email protected]>
[ Upstream commit 032f85c9360fb1a08385c584c2c4ed114b33c260 ]
Increase the reset duration to ensure correct phy functionality. The reset duration is taken from barebox commit 52fdd510de ("ARM: dts:
pfla02: use long enough reset for ethernet phy"):
Use a longer reset time for ethernet phy Micrel KSZ9031RNX. Otherwise a small percentage of modules have 'transmission timeouts' errors like
barebox@Phytec phyFLEX-i.MX6 Quad Carrier-Board:/ ifup eth0
warning: No MAC address set. Using random address 7e:94:4d:02:f8:f3
eth0: 1000Mbps full duplex link detected
eth0: transmission timeout
T eth0: transmission timeout
T eth0: transmission timeout
T eth0: transmission timeout
T eth0: transmission timeout
--- arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi +1 -0
@@ -89,6 +89,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; phy-mode = "rgmii"; + phy-reset-duration = <10>; /* in msecs */ phy-reset-gpios = <&gpio3 23 GPIO_ACTIVE_LOW>; phy-supply = <&vdd_eth_io_reg>; status = "disabled";
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 14/43 net: ks8851: Dequeue RX packets explicitly
In reply to Sasha LevinFrom: Lukas Wunner <[email protected]>
[ Upstream commit 536d3680fd2dab5c39857d62a3e084198fc74ff9 ]
The ks8851 driver lets the chip auto-dequeue received packets once they have been read in full. It achieves that by setting the ADRFE flag in the RXQCR register ("Auto-Dequeue RXQ Frame Enable").
However if allocation of a packet's socket buffer or retrieval of the packet over the SPI bus fails, the packet will not have been read in full and is not auto-dequeued. Such partial retrieval of a packet confuses the chip's RX queue management: On the next RX interrupt, the first packet read from the queue will be the one left there previously and this one can be retrieved without issues. But for any newly received packets, the frame header status and byte count registers (RXFHSR and RXFHBCR) contain bogus values, preventing their retrieval.
The chip allows explicitly dequeueing a packet from the RX queue by setting the RRXEF flag in the RXQCR register ("Release RX Error Frame"). This could be used to dequeue the packet in case of an error, but if that error is a failed SPI transfer, it is unknown if the packet was transferred in full and was auto-dequeued or if it was only transferred in part and requires an explicit dequeue. The safest approach is thus to always dequeue packets explicitly and forgo auto-dequeueing.
Without this change, I've witnessed packet retrieval break completely when an SPI DMA transfer fails, requiring a chip reset. Explicit dequeueing magically fixes this and makes packet retrieval absolutely robust for me.
The chip's documentation suggests auto-dequeuing and uses the RRXEF flag only to dequeue error frames which the driver doesn't want to retrieve. But that seems to be a fair-weather approach.
--- drivers/net/ethernet/micrel/ks8851.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/micrel/ks8851.c +4 -4
@@ -526,9 +526,8 @@ static void ks8851_rx_pkts(struct ks8851_net *ks)/* set dma read address */ ks8851_wrreg16 (ks,KS_RXFDPR ,RXFDPR_RXFPAI |0x00 ); -/* start the packet dma process, and set auto-dequeue rx */ -ks8851_wrreg16 (ks,KS_RXQCR , - ks->rc_rxqcr |RXQCR_SDA |RXQCR_ADRFE ); +/* start DMA access */ +ks8851_wrreg16 (ks,KS_RXQCR , ks->rc_rxqcr |RXQCR_SDA );if (rxlen >4 ) {unsigned int rxalign;
@@ -559,7 +558,8 @@ static void ks8851_rx_pkts(struct ks8851_net *ks) } } -ks8851_wrreg16 (ks,KS_RXQCR , ks->rc_rxqcr); +/* end DMA access and dequeue packet */ +ks8851_wrreg16 (ks,KS_RXQCR , ks->rc_rxqcr |RXQCR_RRXEF ); } }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 15/43 net: ks8851: Reassert reset pin if chip ID check fails
In reply to Sasha LevinFrom: Lukas Wunner <[email protected]>
[ Upstream commit 761cfa979a0c177d6c2d93ef5585cd79ae49a7d5 ]
Commit 73fdeb82e963 ("net: ks8851: Add optional vdd_io regulator and reset gpio") amended the ks8851 driver to briefly assert the chip's reset pin on probe. It also amended the probe routine's error path to reassert the reset pin if a subsequent initialization step fails.
However the commit misplaced reassertion of the reset pin in the error path such that it is not performed if the check of the Chip ID and Enable Register (CIDER) fails. The error path is therefore slightly asymmetrical to the probe routine's body. Fix it.
--- drivers/net/ethernet/micrel/ks8851.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/micrel/ks8851.c +1 -1
@@ -1545,9 +1545,9 @@ static int ks8851_probe(struct spi_device *spi)free_irq (ndev->irq, ks); err_irq: +err_id:if (gpio_is_valid (gpio))gpio_set_value (gpio,0 ); -err_id:regulator_disable (ks->vdd_reg); err_reg:regulator_disable (ks->vdd_io);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 16/43 net: ks8851: Delay requesting IRQ until opened
In reply to Sasha LevinFrom: Lukas Wunner <[email protected]>
[ Upstream commit d268f31552794abf5b6aa5af31021643411f25f5 ]
The ks8851 driver currently requests the IRQ before registering the net_device. Because the net_device name is used as IRQ name and is still "eth%d" when the IRQ is requested, it's impossibe to tell IRQs apart if multiple ks8851 chips are present. Most other drivers delay requesting the IRQ until the net_device is opened. Do the same.
The driver doesn't enable interrupts on the chip before opening the net_device and disables them when closing it, so there doesn't seem to be a need to request the IRQ already on probe.
--- drivers/net/ethernet/micrel/ks8851.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
drivers/net/ethernet/micrel/ks8851.c +11 -13
@@ -776,6 +776,15 @@ static void ks8851_tx_work(struct work_struct *work)static int ks8851_net_open (struct net_device *dev) {struct ks8851_net *ks =netdev_priv (dev); +int ret; + + ret =request_threaded_irq (dev->irq,NULL , ks8851_irq, +IRQF_TRIGGER_LOW |IRQF_ONESHOT , + dev->name, ks); +if (ret <0 ) { +netdev_err (dev,"failed to get irq\n" ); +return ret; + }/* lock the card, even if we may not actually be doing anything * else at the moment */
@@ -890,6 +899,8 @@ static int ks8851_net_stop(struct net_device *dev)dev_kfree_skb (txb); } +free_irq (dev->irq, ks); +return 0 ; }
@@ -1520,14 +1531,6 @@ static int ks8851_probe(struct spi_device *spi)ks8851_read_selftest (ks);ks8851_init_mac (ks); - ret =request_threaded_irq (spi->irq,NULL , ks8851_irq, -IRQF_TRIGGER_LOW |IRQF_ONESHOT , - ndev->name, ks); -if (ret <0 ) { -dev_err (&spi->dev,"failed to get irq\n" ); - goto err_irq; - } - ret =register_netdev (ndev);if (ret) {dev_err (&spi->dev,"failed to register network device\n" );
@@ -1540,11 +1543,7 @@ static int ks8851_probe(struct spi_device *spi)return 0 ; - err_netdev: -free_irq (ndev->irq, ks); - -err_irq: err_id:if (gpio_is_valid (gpio))gpio_set_value (gpio,0 );
@@ -1565,7 +1564,6 @@ static int ks8851_remove(struct spi_device *spi)dev_info (&spi->dev,"remove\n" );unregister_netdev (priv->netdev); -free_irq (spi->irq, priv);if (gpio_is_valid (priv->gpio))gpio_set_value (priv->gpio,0 );regulator_disable (priv->vdd_reg);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 17/43 net: ks8851: Set initial carrier state to down
In reply to Sasha LevinFrom: Lukas Wunner <[email protected]>
[ Upstream commit 9624bafa5f6418b9ca5b3f66d1f6a6a2e8bf6d4c ]
The ks8851 chip's initial carrier state is down. A Link Change Interrupt is signaled once interrupts are enabled if the carrier is up.
The ks8851 driver has it backwards by assuming that the initial carrier state is up. The state is therefore misrepresented if the interface is opened with no cable attached. Fix it.
The Link Change interrupt is sometimes not signaled unless the P1MBSR register (which contains the Link Status bit) is read on ->ndo_open(). This might be a hardware erratum. Read the register by calling mii_check_link(), which has the desirable side effect of setting the carrier state to down if the cable was detached while the interface was closed.
--- drivers/net/ethernet/micrel/ks8851.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/micrel/ks8851.c +2 -0
@@ -849,6 +849,7 @@ static int ks8851_net_open(struct net_device *dev)netif_dbg (ks, ifup, ks->netdev,"network device up\n" );mutex_unlock (&ks->lock); +mii_check_link (&ks->mii);return 0 ; }
@@ -1510,6 +1511,7 @@ static int ks8851_probe(struct spi_device *spi)spi_set_drvdata (spi, ks); +netif_carrier_off (ks->netdev); ndev->if_port =IF_PORT_100BASET ; ndev->netdev_ops = &ks8851_netdev_ops; ndev->irq = spi->irq;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 18/43 staging: rtl8188eu: Fix potential NULL pointer dereference of kcalloc
In reply to Sasha LevinFrom: Aditya Pakki <[email protected]>
[ Upstream commit 7671ce0d92933762f469266daf43bd34d422d58c ]
hwxmits is allocated via kcalloc and not checked for failure before its dereference. The patch fixes this problem by returning error upstream in rtl8723bs, rtl8188eu.
--- drivers/staging/rtl8188eu/core/rtw_xmit.c | 9 +++++++-- drivers/staging/rtl8188eu/include/rtw_xmit.h | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 14 +++++++------- drivers/staging/rtl8723bs/include/rtw_xmit.h | 2 +- 4 files changed, 16 insertions(+), 11 deletions(-)
drivers/staging/rtl8188eu/core/rtw_xmit.c +7 -2
@@ -188,7 +188,9 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitpriv->free_xmit_extbuf_cnt = num_xmit_extbuf; -rtw_alloc_hwxmits (padapter); + res =rtw_alloc_hwxmits (padapter); +if (res == _FAIL) + goto exit;rtw_init_hwxmits (pxmitpriv->hwxmits, pxmitpriv->hwxmit_entry);for (i =0 ; i <4 ; i++)
@@ -1573,7 +1575,7 @@ s32 rtw_xmit_classifier(struct adapter *padapter, struct xmit_frame *pxmitframe)return res; } -void rtw_alloc_hwxmits (struct adapter *padapter) +s32 rtw_alloc_hwxmits (struct adapter *padapter) {struct hw_xmit *hwxmits;struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@@ -1582,6 +1584,8 @@ void rtw_alloc_hwxmits(struct adapter *padapter) pxmitpriv->hwxmits =kcalloc (pxmitpriv->hwxmit_entry,sizeof (struct hw_xmit ),GFP_KERNEL ); +if (!pxmitpriv->hwxmits) +return _FAIL; hwxmits = pxmitpriv->hwxmits;
@@ -1589,6 +1593,7 @@ void rtw_alloc_hwxmits(struct adapter *padapter) hwxmits[1 ] .sta_queue = &pxmitpriv->vi_pending; hwxmits[2 ] .sta_queue = &pxmitpriv->be_pending; hwxmits[3 ] .sta_queue = &pxmitpriv->bk_pending; +return _SUCCESS; }void rtw_free_hwxmits (struct adapter *padapter)
drivers/staging/rtl8188eu/include/rtw_xmit.h +1 -1
@@ -342,7 +342,7 @@ s32 rtw_txframes_sta_ac_pending(struct adapter *padapter,void rtw_init_hwxmits (struct hw_xmit *phwxmit,int entry);s32 _rtw_init_xmit_priv (struct xmit_priv *pxmitpriv,struct adapter *padapter);void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv); -void rtw_alloc_hwxmits (struct adapter *padapter); +s32 rtw_alloc_hwxmits (struct adapter *padapter);void rtw_free_hwxmits (struct adapter *padapter);s32 rtw_xmit (struct adapter *padapter,struct sk_buff **pkt);
drivers/staging/rtl8723bs/core/rtw_xmit.c +7 -7
@@ -271,7 +271,9 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) } } -rtw_alloc_hwxmits (padapter); + res =rtw_alloc_hwxmits (padapter); +if (res == _FAIL) + goto exit;rtw_init_hwxmits (pxmitpriv->hwxmits, pxmitpriv->hwxmit_entry);for (i =0 ; i <4 ; i++) {
@@ -2157,7 +2159,7 @@ s32 rtw_xmit_classifier(struct adapter *padapter, struct xmit_frame *pxmitframe)return res; } -void rtw_alloc_hwxmits (struct adapter *padapter) +s32 rtw_alloc_hwxmits (struct adapter *padapter) {struct hw_xmit *hwxmits;struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@@ -2168,10 +2170,8 @@ void rtw_alloc_hwxmits(struct adapter *padapter) pxmitpriv->hwxmits = (struct hw_xmit *)rtw_zmalloc (sizeof (struct hw_xmit ) * pxmitpriv->hwxmit_entry); -if (pxmitpriv->hwxmits ==NULL ) { -DBG_871X ("alloc hwxmits fail!...\n" ); -return ; - } +if (!pxmitpriv->hwxmits) +return _FAIL; hwxmits = pxmitpriv->hwxmits;
@@ -2217,7 +2217,7 @@ void rtw_alloc_hwxmits(struct adapter *padapter) } - +return _SUCCESS; }void rtw_free_hwxmits (struct adapter *padapter)
drivers/staging/rtl8723bs/include/rtw_xmit.h +1 -1
@@ -494,7 +494,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter);void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv); -void rtw_alloc_hwxmits (struct adapter *padapter); +s32 rtw_alloc_hwxmits (struct adapter *padapter);void rtw_free_hwxmits (struct adapter *padapter);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 19/43 staging: rtlwifi: rtl8822b: fix to avoid potential NULL pointer dereference
In reply to Sasha LevinFrom: Aditya Pakki <[email protected]>
[ Upstream commit d70d70aec9632679dd00dcc1b1e8b2517e2c7da0 ]
skb allocated via dev_alloc_skb can fail and return a NULL pointer. This patch avoids such a scenario and returns, consistent with other invocations.
--- drivers/staging/rtlwifi/rtl8822be/fw.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/staging/rtlwifi/rtl8822be/fw.c +2 -0
@@ -752,6 +752,8 @@ void rtl8822be_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished) u1_rsvd_page_loc, 3); skb =dev_alloc_skb (totalpacketlen); +if (!skb) +return ;memcpy ((u8 *)skb_put (skb, totalpacketlen), &reserved_page_packet, totalpacketlen);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 20/43 staging: rtl8712: uninitialized memory in read_bbreg_hdl()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 22c971db7dd4b0ad8dd88e99c407f7a1f4231a2e ]
Colin King reported a bug in read_bbreg_hdl():
memcpy(pcmd->rsp, (u8 *)&val, pcmd->rspsz);
The problem is that "val" is uninitialized.
This code is obviously not useful, but so far as I can tell "pcmd->cmdcode" is never GEN_CMD_CODE(_Read_BBREG) so it's not harmful either. For now the easiest fix is to just call r8712_free_cmd_obj() and return.
--- drivers/staging/rtl8712/rtl8712_cmd.c | 10 +--------- drivers/staging/rtl8712/rtl8712_cmd.h | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-)
drivers/staging/rtl8712/rtl8712_cmd.c +1 -9
@@ -159,17 +159,9 @@ static u8 write_macreg_hdl(struct _adapter *padapter, u8 *pbuf)static u8 read_bbreg_hdl (struct _adapter *padapter,u8 *pbuf) { -u32 val; -void (*pcmd_callback)(struct _adapter *dev,struct cmd_obj *pcmd);struct cmd_obj *pcmd = (struct cmd_obj *)pbuf; -if (pcmd->rsp && pcmd->rspsz >0 ) -memcpy (pcmd->rsp, (u8 *)&val, pcmd->rspsz); - pcmd_callback = cmd_callback[pcmd->cmdcode].callback; -if (!pcmd_callback) -r8712_free_cmd_obj (pcmd); -else -pcmd_callback (padapter, pcmd); +r8712_free_cmd_obj (pcmd);return H2C_SUCCESS ; }
drivers/staging/rtl8712/rtl8712_cmd.h +1 -1
@@ -152,7 +152,7 @@ enum rtl8712_h2c_cmd {static struct _cmd_callback cmd_callback[] = { {GEN_CMD_CODE (_Read_MACREG),NULL },/*0*/ {GEN_CMD_CODE (_Write_MACREG),NULL }, - {GEN_CMD_CODE (_Read_BBREG), &r8712_getbbrfreg_cmdrsp_callback}, + {GEN_CMD_CODE (_Read_BBREG),NULL }, {GEN_CMD_CODE (_Write_BBREG),NULL }, {GEN_CMD_CODE (_Read_RFREG), &r8712_getbbrfreg_cmdrsp_callback}, {GEN_CMD_CODE (_Write_RFREG),NULL },/*5*/
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 21/43 staging: rtlwifi: Fix potential NULL pointer dereference of kzalloc
In reply to Sasha LevinFrom: Aditya Pakki <[email protected]>
[ Upstream commit 6a8ca24590a2136921439b376c926c11a6effc0e ]
phydm.internal is allocated using kzalloc which is used multiple times without a check for NULL pointer. This patch avoids such a scenario by returning 0, consistent with the failure case.
--- drivers/staging/rtlwifi/phydm/rtl_phydm.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/staging/rtlwifi/phydm/rtl_phydm.c +2 -0
@@ -191,6 +191,8 @@ static int rtl_phydm_init_priv(struct rtl_priv *rtlpriv, rtlpriv->phydm.internal =kzalloc (sizeof (struct phy_dm_struct ),GFP_KERNEL ); +if (!rtlpriv->phydm.internal) +return 0 ;_rtl_phydm_init_com_info (rtlpriv, ic, params);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 22/43 net: macb: Add null check for PCLK and HCLK
In reply to Sasha LevinFrom: Harini Katakam <[email protected]>
[ Upstream commit cd5afa91f078c0787be0a62b5ef90301c00b0271 ]
Both PCLK and HCLK are "required" clocks according to macb devicetree documentation. There is a chance that devm_clk_get doesn't return a negative error but just a NULL clock structure instead. In such a case the driver proceeds as usual and uses pclk value 0 to calculate MDC divisor which is incorrect. Hence fix the same in clock initialization.
--- drivers/net/ethernet/cadence/macb_main.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/net/ethernet/cadence/macb_main.c +8 -2
@@ -2817,14 +2817,20 @@ static int macb_clk_init(struct platform_device *pdev, struct clk **pclk, *hclk =devm_clk_get (&pdev->dev,"hclk" ); } -if (IS_ERR (*pclk)) { +if (IS_ERR_OR_NULL (*pclk)) { err =PTR_ERR (*pclk); +if (!err) + err = -ENODEV ; +dev_err (&pdev->dev,"failed to get macb_clk (%u)\n" , err);return err; } -if (IS_ERR (*hclk)) { +if (IS_ERR_OR_NULL (*hclk)) { err =PTR_ERR (*hclk); +if (!err) + err = -ENODEV ; +dev_err (&pdev->dev,"failed to get hclk (%u)\n" , err);return err; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 23/43 net/sched: don't dereference a->goto_chain to read the chain index
In reply to Sasha LevinFrom: Davide Caratti <[email protected]>
[ Upstream commit fe384e2fa36ca084a456fd30558cccc75b4b3fbd ]
callers of tcf_gact_goto_chain_index() can potentially read an old value of the chain index, or even dereference a NULL 'goto_chain' pointer, because 'goto_chain' and 'tcfa_action' are read in the traffic path without caring of concurrent write in the control path. The most recent value of chain index can be read also from a->tcfa_action (it's encoded there together with TC_ACT_GOTO_CHAIN bits), so we don't really need to dereference 'goto_chain': just read the chain id from the control action.
--- include/net/tc_act/tc_gact.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/tc_act/tc_gact.h +1 -1
@@ -51,7 +51,7 @@ static inline bool is_tcf_gact_goto_chain(const struct tc_action *a)static inline u32 tcf_gact_goto_chain_index (const struct tc_action *a) { -return a->goto_chain->index; +return READ_ONCE (a->tcfa_action) &TC_ACT_EXT_VAL_MASK ; }#endif /* __NET_TC_GACT_H */
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 24/43 ARM: dts: imx6qdl: Fix typo in imx6qdl-icore-rqs.dtsi
In reply to Sasha LevinFrom: Masanari Iida <[email protected]>
[ Upstream commit 41b37f4c0fa67185691bcbd30201cad566f2f0d1 ]
This patch fixes a spelling typo.
--- arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi +2 -2
@@ -222,7 +222,7 @@ pinctrl-2 = <&pinctrl_usdhc3_200mhz>; vmcc-supply = <®_sd3_vmmc>; cd-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; - bus-witdh = <4>; + bus-width = <4>; no-1-8-v; status = "okay"; };
@@ -233,7 +233,7 @@ pinctrl-1 = <&pinctrl_usdhc4_100mhz>; pinctrl-2 = <&pinctrl_usdhc4_200mhz>; vmcc-supply = <®_sd4_vmmc>; - bus-witdh = <8>; + bus-width = <8>; no-1-8-v; non-removable; status = "okay";
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 25/43 NFS: Fix a typo in nfs_init_timeout_values()
In reply to Sasha LevinFrom: Trond Myklebust <[email protected]>
[ Upstream commit 5a698243930c441afccec04e4d5dc8febfd2b775 ]
Specifying a retrans=0 mount parameter to a NFS/TCP mount, is inadvertently causing the NFS client to rewrite any specified timeout parameter to the default of 60 seconds.
--- fs/nfs/client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/client.c +1 -1
@@ -459,7 +459,7 @@ void nfs_init_timeout_values(struct rpc_timeout *to, int proto,case XPRT_TRANSPORT_RDMA :if (retrans ==NFS_UNSPEC_RETRANS ) to->to_retries =NFS_DEF_TCP_RETRANS ; -if (timeo ==NFS_UNSPEC_TIMEO || to->to_retries ==0 ) +if (timeo ==NFS_UNSPEC_TIMEO || to->to_initval ==0 ) to->to_initval =NFS_DEF_TCP_TIMEO *HZ /10 ;if (to->to_initval >NFS_MAX_TCP_TIMEOUT ) to->to_initval =NFS_MAX_TCP_TIMEOUT ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 26/43 net: xilinx: fix possible object reference leak
In reply to Sasha LevinFrom: Wen Yang <[email protected]>
[ Upstream commit fa3a419d2f674b431d38748cb58fb7da17ee8949 ]
The call to of_parse_phandle returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
./drivers/net/ethernet/xilinx/xilinx_axienet_main.c:1624:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 1569, but without a corresponding object release within this function.
--- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/xilinx/xilinx_axienet_main.c +2 -0
@@ -1575,12 +1575,14 @@ static int axienet_probe(struct platform_device *pdev) ret =of_address_to_resource (np,0 , &dmares);if (ret) {dev_err (&pdev->dev,"unable to get DMA resource\n" ); +of_node_put (np); goto free_netdev; } lp->dma_regs =devm_ioremap_resource (&pdev->dev, &dmares);if (IS_ERR (lp->dma_regs)) {dev_err (&pdev->dev,"could not map DMA regs\n" ); ret =PTR_ERR (lp->dma_regs); +of_node_put (np); goto free_netdev; } lp->rx_irq =irq_of_parse_and_map (np,1 );
Signature · 7 lines
2.19.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 27/43 net: ibm: fix possible object reference leak
In reply to Sasha LevinFrom: Wen Yang <[email protected]>
[ Upstream commit be693df3cf9dd113ff1d2c0d8150199efdba37f6 ]
The call to ehea_get_eth_dn returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
./drivers/net/ethernet/ibm/ehea/ehea_main.c:3163:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 3154, but without a corresponding object release within this function.
--- drivers/net/ethernet/ibm/ehea/ehea_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/ibm/ehea/ehea_main.c +1 -0
@@ -3176,6 +3176,7 @@ static ssize_t ehea_probe_port(struct device *dev,if (ehea_add_adapter_mr (adapter)) {pr_err ("creating MR failed\n" ); +of_node_put (eth_dn);return -EIO ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 28/43 net: ethernet: ti: fix possible object reference leak
In reply to Sasha LevinFrom: Wen Yang <[email protected]>
[ Upstream commit 75eac7b5f68b0a0671e795ac636457ee27cc11d8 ]
The call to of_get_child_by_name returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
./drivers/net/ethernet/ti/netcp_ethss.c:3661:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 3654, but without a corresponding object release within this function. ./drivers/net/ethernet/ti/netcp_ethss.c:3665:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 3654, but without a corresponding object release within this function.
--- drivers/net/ethernet/ti/netcp_ethss.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/ethernet/ti/netcp_ethss.c +6 -2
@@ -3538,12 +3538,16 @@ static int gbe_probe(struct netcp_device *netcp_device, struct device *dev, ret =netcp_txpipe_init (&gbe_dev->tx_pipe, netcp_device, gbe_dev->dma_chan_name, gbe_dev->tx_queue_id); -if (ret) +if (ret) { +of_node_put (interfaces);return ret; + } ret =netcp_txpipe_open (&gbe_dev->tx_pipe); -if (ret) +if (ret) { +of_node_put (interfaces);return ret; + }/* Create network interfaces */ INIT_LIST_HEAD (&gbe_dev->gbe_intf_head);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 29/43 gpio: aspeed: fix a potential NULL pointer dereference
In reply to Sasha LevinFrom: Kangjie Lu <[email protected]>
[ Upstream commit 6cf4511e9729c00a7306cf94085f9cc3c52ee723 ]
In case devm_kzalloc, the patch returns ENOMEM to avoid potential NULL pointer dereference.
--- drivers/gpio/gpio-aspeed.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpio/gpio-aspeed.c +2 -0
@@ -861,6 +861,8 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev) gpio->offset_timer =devm_kzalloc (&pdev->dev, gpio->chip.ngpio,GFP_KERNEL ); +if (!gpio->offset_timer) +return -ENOMEM ;return aspeed_gpio_setup_irqs (gpio, pdev); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 30/43 drm/meson: Fix invalid pointer in meson_drv_unbind()
In reply to Sasha LevinFrom: Jean-Philippe Brucker <[email protected]>
[ Upstream commit 776e78677f514ecddd12dba48b9040958999bd5a ]
meson_drv_bind() registers a meson_drm struct as the device's privdata, but meson_drv_unbind() tries to retrieve a drm_device. This may cause a segfault on shutdown:
[ 5194.593429] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000197 ... [ 5194.788850] Call trace: [ 5194.791349] drm_dev_unregister+0x1c/0x118 [drm] [ 5194.795848] meson_drv_unbind+0x50/0x78 [meson_drm]
Retrieve the right pointer in meson_drv_unbind().
--- drivers/gpu/drm/meson/meson_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/meson/meson_drv.c +2 -2
@@ -294,8 +294,8 @@ static int meson_drv_bind(struct device *dev)static void meson_drv_unbind (struct device *dev) { -struct drm_device *drm =dev_get_drvdata (dev); -struct meson_drm *priv = drm->dev_private; +struct meson_drm *priv =dev_get_drvdata (dev); +struct drm_device *drm = priv->drm;drm_dev_unregister (drm);drm_kms_helper_poll_fini (drm);
Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 31/43 drm/meson: Uninstall IRQ handler
In reply to Sasha LevinFrom: Jean-Philippe Brucker <[email protected]>
[ Upstream commit 2d8f92897ad816f5dda54b2ed2fd9f2d7cb1abde ]
meson_drv_unbind() doesn't unregister the IRQ handler, which can lead to use-after-free if the IRQ fires after unbind:
[ 64.656876] Unable to handle kernel paging request at virtual address ffff000011706dbc ... [ 64.662001] pc : meson_irq+0x18/0x30 [meson_drm]
I'm assuming that a similar problem could happen on the error path of bind(), so uninstall the IRQ handler there as well.
--- drivers/gpu/drm/meson/meson_drv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/meson/meson_drv.c +4 -1
@@ -277,10 +277,12 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) ret =drm_dev_register (drm,0 );if (ret) - goto free_drm; + goto uninstall_irq;return 0 ; +uninstall_irq: +drm_irq_uninstall (drm); free_drm:drm_dev_unref (drm);
@@ -298,6 +300,7 @@ static void meson_drv_unbind(struct device *dev)struct drm_device *drm = priv->drm;drm_dev_unregister (drm); +drm_irq_uninstall (drm);drm_kms_helper_poll_fini (drm);drm_fbdev_cma_fini (priv->fbdev);drm_mode_config_cleanup (drm);
Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 32/43 scsi: qla4xxx: fix a potential NULL pointer dereference
In reply to Sasha LevinFrom: Kangjie Lu <[email protected]>
[ Upstream commit fba1bdd2a9a93f3e2181ec1936a3c2f6b37e7ed6 ]
In case iscsi_lookup_endpoint fails, the fix returns -EINVAL to avoid NULL pointer dereference.
--- drivers/scsi/qla4xxx/ql4_os.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/scsi/qla4xxx/ql4_os.c +2 -0
@@ -3207,6 +3207,8 @@ static int qla4xxx_conn_bind(struct iscsi_cls_session *cls_session,if (iscsi_conn_bind (cls_session, cls_conn, is_leading))return -EINVAL ; ep =iscsi_lookup_endpoint (transport_fd); +if (!ep) +return -EINVAL ; conn = cls_conn->dd_data; qla_conn = conn->dd_data; qla_conn->qla_ep = ep->dd_data;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 33/43 usb: usb251xb: fix to avoid potential NULL pointer dereference
In reply to Sasha LevinFrom: Aditya Pakki <[email protected]>
[ Upstream commit 41f00e6e9e55546390031996b773e7f3c1d95928 ]
of_match_device in usb251xb_probe can fail and returns a NULL pointer. The patch avoids a potential NULL pointer dereference in this scenario.
--- drivers/usb/misc/usb251xb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/misc/usb251xb.c +1 -1
@@ -530,7 +530,7 @@ static int usb251xb_probe(struct usb251xb *hub) dev);int err; -if (np) { +if (np && of_id) { err =usb251xb_get_ofdata (hub, (struct usb251xb_data *)of_id->data);if (err) {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 34/43 usb: u132-hcd: fix resource leak
In reply to Sasha LevinFrom: Mukesh Ojha <[email protected]>
[ Upstream commit f276e002793cdb820862e8ea8f76769d56bba575 ]
if platform_driver_register fails, cleanup the allocated resource gracefully.
--- drivers/usb/host/u132-hcd.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/host/u132-hcd.c +3 -0
@@ -3208,6 +3208,9 @@ static int __init u132_hcd_init(void)printk (KERN_INFO "driver %s\n" , hcd_name); workqueue =create_singlethread_workqueue ("u132" ); retval =platform_driver_register (&u132_platform_driver); +if (retval) +destroy_workqueue (workqueue); +return retval; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 35/43 tty: fix NULL pointer issue when tty_port ops is not set
In reply to Sasha LevinFrom: Fabien Dessenne <[email protected]>
[ Upstream commit f4e68d58cf2b20a581759bbc7228052534652673 ]
Unlike 'client_ops' which is initialized to 'default_client_ops', the port operations 'ops' may be left to NULL.
Check the 'ops' value before checking the 'ops->x' value.
--- drivers/tty/tty_port.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/tty/tty_port.c +5 -5
@@ -326,7 +326,7 @@ static void tty_port_shutdown(struct tty_port *port, struct tty_struct *tty)if (tty &&C_HUPCL (tty))tty_port_lower_dtr_rts (port); -if (port->ops->shutdown) +if (port->ops && port->ops->shutdown) port->ops->shutdown (port); } out:
@@ -401,7 +401,7 @@ EXPORT_SYMBOL_GPL(tty_port_tty_wakeup);int tty_port_carrier_raised (struct tty_port *port) { -if (port->ops->carrier_raised ==NULL ) +if (!port->ops || !port->ops->carrier_raised)return 1 ;return port->ops->carrier_raised (port); }
@@ -418,7 +418,7 @@ EXPORT_SYMBOL(tty_port_carrier_raised);void tty_port_raise_dtr_rts (struct tty_port *port) { -if (port->ops->dtr_rts) +if (port->ops && port->ops->dtr_rts) port->ops->dtr_rts (port,1 ); }EXPORT_SYMBOL (tty_port_raise_dtr_rts);
@@ -434,7 +434,7 @@ EXPORT_SYMBOL(tty_port_raise_dtr_rts);void tty_port_lower_dtr_rts (struct tty_port *port) { -if (port->ops->dtr_rts) +if (port->ops && port->ops->dtr_rts) port->ops->dtr_rts (port,0 ); }EXPORT_SYMBOL (tty_port_lower_dtr_rts);
@@ -690,7 +690,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,if (!tty_port_initialized (port)) {clear_bit (TTY_IO_ERROR , &tty->flags); -if (port->ops->activate) { +if (port->ops && port->ops->activate) {int retval = port->ops->activate (port, tty);if (retval) {mutex_unlock (&port->mutex);
Signature · 1 line
2.19.1
Re: [PATCH AUTOSEL 4.14 35/43] tty: fix NULL pointer issue when tty_port ops is not set
Hi Sasha,
Quoted 11 lines · Sasha Levin
From: Fabien Dessenne <[email protected]>
[ Upstream commit
f4e68d58cf2b20a581759bbc7228052534652673]Unlike '
client_ops' which is initialized to 'default_client_ops', the port operations 'ops' may be left to NULL.
Check the 'ops' value before checking the 'ops->x' value.Signed-off-by Fabien Dessenne <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>Signed-off-by Sasha Levin (Microsoft) <[email protected]>
Despite the commit message, this one doesn't really fix anything and has been reverted in Greg's tree (not sure why hasn't shown up in linux-next yet).
Johan
Sasha Levin
maintainerPATCH 36/43 ceph: fix use-after-free on symlink traversal
In reply to Sasha LevinFrom: Al Viro <[email protected]>
[ Upstream commit daf5cc27eed99afdea8d96e71b89ba41f5406ef6 ]
free the symlink body after the same RCU delay we have for freeing the struct inode itself, so that traversal during RCU pathwalk wouldn't step into freed memory.
--- fs/ceph/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ceph/inode.c +1 -1
@@ -520,6 +520,7 @@ static void ceph_i_callback(struct rcu_head *head) struct inode *inode = container_of(head, struct inode, i_rcu);struct ceph_inode_info *ci =ceph_inode (inode); +kfree (ci->i_symlink);kmem_cache_free (ceph_inode_cachep, ci); }
@@ -551,7 +552,6 @@ void ceph_destroy_inode(struct inode *inode)ceph_put_snap_realm (mdsc, realm); } -kfree (ci->i_symlink);while ((n =rb_first (&ci->i_fragtree)) !=NULL ) { frag = rb_entry(n, struct ceph_inode_frag, node);rb_erase (n, &ci->i_fragtree);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 37/43 scsi: zfcp: reduce flood of fcrscn1 trace records on multi-element RSCN
In reply to Sasha LevinFrom: Steffen Maier <[email protected]>
[ Upstream commit c8206579175c34a2546de8a74262456278a7795a ]
If an incoming ELS of type RSCN contains more than one element, zfcp suboptimally causes repeated erp trigger NOP trace records for each previously failed port. These could be ports that went away. It loops over each RSCN element, and for each of those in an inner loop over all zfcp_ports.
The trigger to recover failed ports should be just the reception of some RSCN, no matter how many elements it has. So we can loop over failed ports separately, and only then loop over each RSCN element to handle the non-failed ports.
The call chain was:
zfcp_fc_incoming_rscn
for (i = 1; i < no_entries; i++)
_zfcp_fc_incoming_rscn
list_for_each_entry(port, &adapter->port_list, list)
if (masked port->d_id match) zfcp_fc_test_link
if (!port->d_id) zfcp_erp_port_reopen "fcrscn1" <===In order the reduce the "flooding" of the REC trace area in such cases, we factor out handling the failed ports to be outside of the entries loop:
zfcp_fc_incoming_rscn
if (no_entries > 1) <===
list_for_each_entry(port, &adapter->port_list, list) <===
if (!port->d_id) zfcp_erp_port_reopen "fcrscn1" <===
for (i = 1; i < no_entries; i++)
_zfcp_fc_incoming_rscn
list_for_each_entry(port, &adapter->port_list, list)
if (masked port->d_id match) zfcp_fc_test_linkAbbreviated example trace records before this code change:
Tag : fcrscn1
WWPN : 0x500507630310d327
ERP want : 0x02
ERP need : 0x02
Tag : fcrscn1
WWPN : 0x500507630310d327
ERP want : 0x02
ERP need : 0x00 NOP => superfluous trace record
The last trace entry repeats if there are more than 2 RSCN elements.
--- drivers/s390/scsi/zfcp_fc.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
drivers/s390/scsi/zfcp_fc.c +17 -4
@@ -240,10 +240,6 @@ static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range,list_for_each_entry (port, &adapter->port_list, list) {if ((port->d_id & range) == (ntoh24 (page->rscn_fid) & range))zfcp_fc_test_link (port); -if (!port->d_id) -zfcp_erp_port_reopen (port, -ZFCP_STATUS_COMMON_ERP_FAILED , -"fcrscn1" ); }read_unlock_irqrestore (&adapter->port_list_lock, flags); }
@@ -251,6 +247,7 @@ static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range,static void zfcp_fc_incoming_rscn (struct zfcp_fsf_req *fsf_req) {struct fsf_status_read_buffer *status_buffer = (void *)fsf_req->data; +struct zfcp_adapter *adapter = fsf_req->adapter;struct fc_els_rscn *head;struct fc_els_rscn_page *page;u16 i;
@@ -264,6 +261,22 @@ static void zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req) no_entries =be16_to_cpu (head->rscn_plen) /sizeof (struct fc_els_rscn_page ); +if (no_entries >1 ) { +/* handle failed ports */ +unsigned long flags; +struct zfcp_port *port; + +read_lock_irqsave (&adapter->port_list_lock, flags); +list_for_each_entry (port, &adapter->port_list, list) { +if (port->d_id) +continue ; +zfcp_erp_port_reopen (port, +ZFCP_STATUS_COMMON_ERP_FAILED , +"fcrscn1" ); + } +read_unlock_irqrestore (&adapter->port_list_lock, flags); + } +for (i =1 ; i < no_entries; i++) {/* skip head and start with 1st element */ page++;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 38/43 libata: fix using DMA buffers on stack
In reply to Sasha LevinFrom: raymond pang <[email protected]>
[ Upstream commit dd08a8d9a66de4b54575c294a92630299f7e0fe7 ]
When CONFIG_VMAP_STACK=y, __pa() returns incorrect physical address for a stack virtual address. Stack DMA buffers must be avoided.
--- drivers/ata/libata-zpodd.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-)
drivers/ata/libata-zpodd.c +24 -10
@@ -52,38 +52,52 @@ static int eject_tray(struct ata_device *dev)/* Per the spec, only slot type and drawer type ODD can be supported */ static enum odd_mech_type zpodd_get_mech_type (struct ata_device *dev) { -char buf[16 ]; +char *buf;unsigned int ret; -struct rm_feature_desc *desc = (void *)(buf +8 ); +struct rm_feature_desc *desc;struct ata_taskfile tf;static const char cdb[] = {GPCMD_GET_CONFIGURATION ,2 ,/* only 1 feature descriptor requested */ 0 ,3 ,/* 3, removable medium feature */ 0 ,0 ,0 ,/* reserved */ -0 ,sizeof (buf), +0 ,16 ,0 ,0 ,0 , }; + buf =kzalloc (16 ,GFP_KERNEL ); +if (!buf) +return ODD_MECH_TYPE_UNSUPPORTED ; + desc = (void *)(buf +8 ); +ata_tf_init (dev, &tf); tf.flags =ATA_TFLAG_ISADDR |ATA_TFLAG_DEVICE ; tf.command =ATA_CMD_PACKET ; tf.protocol =ATAPI_PROT_PIO ; - tf.lbam =sizeof (buf); + tf.lbam =16 ; ret =ata_exec_internal (dev, &tf, cdb,DMA_FROM_DEVICE , - buf,sizeof (buf),0 ); -if (ret) + buf,16 ,0 ); +if (ret) { +kfree (buf);return ODD_MECH_TYPE_UNSUPPORTED ; + } -if (be16_to_cpu (desc->feature_code) !=3 ) +if (be16_to_cpu (desc->feature_code) !=3 ) { +kfree (buf);return ODD_MECH_TYPE_UNSUPPORTED ; + } -if (desc->mech_type ==0 && desc->load ==0 && desc->eject ==1 ) +if (desc->mech_type ==0 && desc->load ==0 && desc->eject ==1 ) { +kfree (buf);return ODD_MECH_TYPE_SLOT ; -else if (desc->mech_type ==1 && desc->load ==0 && desc->eject ==1 ) + }else if (desc->mech_type ==1 && desc->load ==0 && + desc->eject ==1 ) { +kfree (buf);return ODD_MECH_TYPE_DRAWER ; -else + }else { +kfree (buf);return ODD_MECH_TYPE_UNSUPPORTED ; + } }/* Test if ODD is zero power ready by sense code */
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 39/43 gpio: of: Fix of_gpiochip_add() error path
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit f7299d441a4da8a5088e651ea55023525a793a13 ]
If the call to of_gpiochip_scan_gpios() in of_gpiochip_add() fails, no error handling is performed. This lead to the need of callers to call of_gpiochip_remove() on failure, which causes "BAD of_node_put() on ..." if the failure happened before the call to of_node_get().
Fix this by adding proper error handling.
Note that calling gpiochip_remove_pin_ranges() multiple times causes no
harm: subsequent calls are a no-op.
--- drivers/gpio/gpiolib-of.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpio/gpiolib-of.c +7 -1
@@ -499,7 +499,13 @@ int of_gpiochip_add(struct gpio_chip *chip)of_node_get (chip->of_node); -return of_gpiochip_scan_gpios (chip); + status =of_gpiochip_scan_gpios (chip); +if (status) { +of_node_put (chip->of_node); +gpiochip_remove_pin_ranges (chip); + } + +return status; }void of_gpiochip_remove (struct gpio_chip *chip)
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 40/43 kconfig/[mn]conf: handle backspace (^H) key
In reply to Sasha LevinFrom: Changbin Du <[email protected]>
[ Upstream commit 9c38f1f044080392603c497ecca4d7d09876ff99 ]
Backspace is not working on some terminal emulators which do not send the key code defined by terminfo. Terminals either send '^H' (8) or '^?' (127). But currently only '^?' is handled. Let's also handle '^H' for those terminals.
--- scripts/kconfig/lxdialog/inputbox.c | 3 ++- scripts/kconfig/nconf.c | 2 +- scripts/kconfig/nconf.gui.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-)
scripts/kconfig/lxdialog/inputbox.c +2 -1
@@ -126,7 +126,8 @@ int dialog_inputbox(const char *title, const char *prompt, int height, int widthcase KEY_DOWN :break ;case KEY_BACKSPACE : -case 127 : +case 8 :/* ^H */ +case 127 :/* ^? */ if (pos) {wattrset (dialog, dlg.inputbox.atr);if (input_x ==0 ) {
scripts/kconfig/nconf.c +1 -1
@@ -1048,7 +1048,7 @@ static int do_match(int key, struct match_state *state, int *ans) state->match_direction =FIND_NEXT_MATCH_UP ; *ans =get_mext_match (state->pattern, state->match_direction); - }else if (key ==KEY_BACKSPACE || key ==127 ) { + }else if (key ==KEY_BACKSPACE || key ==8 || key ==127 ) { state->pattern[strlen (state->pattern)-1 ] ='\0' ;adj_match_dir (&state->match_direction); }else
scripts/kconfig/nconf.gui.c +2 -1
@@ -439,7 +439,8 @@ int dialog_inputbox(WINDOW *main_window,case KEY_F (F_EXIT ):case KEY_F (F_BACK ):break ; -case 127 : +case 8 :/* ^H */ +case 127 :/* ^? */ case KEY_BACKSPACE :if (cursor_position >0 ) { memmove(&result[cursor_position-1],
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 41/43 iommu/amd: Reserve exclusion range in iova-domain
In reply to Sasha LevinFrom: Joerg Roedel <[email protected]>
[ Upstream commit 8aafaaf2212192012f5bae305bb31cdf7681d777 ]
If a device has an exclusion range specified in the IVRS table, this region needs to be reserved in the iova-domain of that device. This hasn't happened until now and can cause data corruption on data transfered with these devices.
Treat exclusion ranges as reserved regions in the iommu-core to fix the problem.
--- drivers/iommu/amd_iommu.c | 9 ++++++--- drivers/iommu/amd_iommu_init.c | 7 ++++--- drivers/iommu/amd_iommu_types.h | 2 ++ 3 files changed, 12 insertions(+), 6 deletions(-)
drivers/iommu/amd_iommu.c +6 -3
@@ -3127,21 +3127,24 @@ static void amd_iommu_get_resv_regions(struct device *dev,return ;list_for_each_entry (entry, &amd_iommu_unity_map, list) { +int type, prot =0 ;size_t length; -int prot =0 ;if (devid < entry->devid_start || devid > entry->devid_end)continue ; + type =IOMMU_RESV_DIRECT ; length = entry->address_end - entry->address_start;if (entry->prot &IOMMU_PROT_IR ) prot |=IOMMU_READ ;if (entry->prot &IOMMU_PROT_IW ) prot |=IOMMU_WRITE ; +if (entry->prot &IOMMU_UNITY_MAP_FLAG_EXCL_RANGE ) +/* Exclusion range */ + type =IOMMU_RESV_RESERVED ; region =iommu_alloc_resv_region (entry->address_start, - length, prot, -IOMMU_RESV_DIRECT ); + length, prot, type);if (!region) {pr_err ("Out of memory allocating dm-regions for %s\n" ,dev_name (dev));
drivers/iommu/amd_iommu_init.c +4 -3
@@ -1980,6 +1980,9 @@ static int __init init_unity_map_range(struct ivmd_header *m)if (e ==NULL )return -ENOMEM ; +if (m->flags &IVMD_FLAG_EXCL_RANGE ) +init_exclusion_range (m); +switch (m->type) {default :kfree (e);
@@ -2026,9 +2029,7 @@ static int __init init_memory_definitions(struct acpi_table_header *table)while (p < end) { m = (struct ivmd_header *)p; -if (m->flags &IVMD_FLAG_EXCL_RANGE ) -init_exclusion_range (m); -else if (m->flags &IVMD_FLAG_UNITY_MAP ) +if (m->flags & (IVMD_FLAG_UNITY_MAP |IVMD_FLAG_EXCL_RANGE ))init_unity_map_range (m); p += m->length;
drivers/iommu/amd_iommu_types.h +2 -0
@@ -369,6 +369,8 @@#define IOMMU_PROT_IR 0x01#define IOMMU_PROT_IW 0x02 +#define IOMMU_UNITY_MAP_FLAG_EXCL_RANGE (1 << 2) +/* IOMMU capabilities */ #define IOMMU_CAP_IOTLB 24#define IOMMU_CAP_NPCACHE 26
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 42/43 ptrace: take into account saved_sigmask in PTRACE{GET,SET}SIGMASK
In reply to Sasha LevinFrom: Andrei Vagin <[email protected]>
[ Upstream commit fcfc2aa0185f4a731d05a21e9f359968fdfd02e7 ]
There are a few system calls (pselect, ppoll, etc) which replace a task sigmask while they are running in a kernel-space
When a task calls one of these syscalls, the kernel saves a current sigmask in task->saved_sigmask and sets a syscall sigmask.
On syscall-exit-stop, ptrace traps a task before restoring the saved_sigmask, so PTRACE_GETSIGMASK returns the syscall sigmask and PTRACE_SETSIGMASK does nothing, because its sigmask is replaced by saved_sigmask, when the task returns to user-space.
This patch fixes this problem. PTRACE_GETSIGMASK returns saved_sigmask if it's set. PTRACE_SETSIGMASK drops the TIF_RESTORE_SIGMASK flag.
--- include/linux/sched/signal.h | 18 ++++++++++++++++++ kernel/ptrace.c | 15 +++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-)
include/linux/sched/signal.h +18 -0
@@ -377,10 +377,20 @@ static inline void set_restore_sigmask(void)set_thread_flag (TIF_RESTORE_SIGMASK );WARN_ON (!test_thread_flag (TIF_SIGPENDING )); } + +static inline void clear_tsk_restore_sigmask (struct task_struct *tsk) +{ +clear_tsk_thread_flag (tsk,TIF_RESTORE_SIGMASK ); +} +static inline void clear_restore_sigmask (void ) {clear_thread_flag (TIF_RESTORE_SIGMASK ); } +static inline bool test_tsk_restore_sigmask (struct task_struct *tsk) +{ +return test_tsk_thread_flag (tsk,TIF_RESTORE_SIGMASK ); +}static inline bool test_restore_sigmask (void ) {return test_thread_flag (TIF_RESTORE_SIGMASK );
@@ -398,6 +408,10 @@ static inline void set_restore_sigmask(void) current->restore_sigmask = true;WARN_ON (!test_thread_flag (TIF_SIGPENDING )); } +static inline void clear_tsk_restore_sigmask (struct task_struct *tsk) +{ + tsk->restore_sigmask = false; +}static inline void clear_restore_sigmask (void ) { current->restore_sigmask = false;
@@ -406,6 +420,10 @@ static inline bool test_restore_sigmask(void) {return current->restore_sigmask; } +static inline bool test_tsk_restore_sigmask (struct task_struct *tsk) +{ +return tsk->restore_sigmask; +}static inline bool test_and_clear_restore_sigmask (void ) {if (!current->restore_sigmask)
kernel/ptrace.c +13 -2
@@ -29,6 +29,7 @@#include <linux/hw_breakpoint.h> #include <linux/cn_proc.h> #include <linux/compat.h> +#include <linux/sched/signal.h> /* * Access another process' address space via ptrace.
@@ -925,18 +926,26 @@ int ptrace_request(struct task_struct *child, long request, ret =ptrace_setsiginfo (child, &siginfo);break ; -case PTRACE_GETSIGMASK : +case PTRACE_GETSIGMASK : { +sigset_t *mask; +if (addr !=sizeof (sigset_t)) { ret = -EINVAL ;break ; } -if (copy_to_user (datavp, &child->blocked,sizeof (sigset_t))) +if (test_tsk_restore_sigmask (child)) + mask = &child->saved_sigmask; +else + mask = &child->blocked; + +if (copy_to_user (datavp, mask,sizeof (sigset_t))) ret = -EFAULT ;else ret =0 ;break ; + }case PTRACE_SETSIGMASK : {sigset_t new_set;
@@ -962,6 +971,8 @@ int ptrace_request(struct task_struct *child, long request, child->blocked = new_set;spin_unlock_irq (&child->sighand->siglock); +clear_tsk_restore_sigmask (child); + ret =0 ;break ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 43/43 leds: pca9532: fix a potential NULL pointer dereference
In reply to Sasha LevinFrom: Kangjie Lu <[email protected]>
[ Upstream commit 0aab8e4df4702b31314a27ec4b0631dfad0fae0a ]
In case of_match_device cannot find a match, return -EINVAL to avoid NULL pointer dereference.
--- drivers/leds/leds-pca9532.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/leds/leds-pca9532.c +6 -2
@@ -513,6 +513,7 @@ static int pca9532_probe(struct i2c_client *client, const struct i2c_device_id *id) {int devid; +const struct of_device_id *of_id;struct pca9532_data *data =i2c_get_clientdata (client);struct pca9532_platform_data *pca9532_pdata =dev_get_platdata (&client->dev);
@@ -528,8 +529,11 @@ static int pca9532_probe(struct i2c_client *client,dev_err (&client->dev,"no platform data\n" );return -EINVAL ; } - devid = (int )(uintptr_t )of_match_device ( - of_pca9532_leds_match, &client->dev)->data; + of_id =of_match_device (of_pca9532_leds_match, + &client->dev); +if (unlikely (!of_id)) +return -EINVAL ; + devid = (int )(uintptr_t ) of_id->data; }else { devid = id->driver_data; }
Signature · 1 line
2.19.1