- Linux-stable-mirror - lists.linaro.org

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.9.192 release. There are 26 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 Tue 10 Sep 2019 12:09:36 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.9.192-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.9.192-rc1 Eric Dumazet <edumazet(a)google.com> mld: fix memory leak in mld_del_delrec() Willem de Bruijn <willemb(a)google.com> tcp: inherit timestamp on mtu probe Chen-Yu Tsai <wens(a)csie.org> net: stmmac: dwmac-rk: Don't fail if phy regulator is absent Feng Sun <loyou85(a)gmail.com> net: fix skb use after free in netpoll Linus Torvalds <torvalds(a)linux-foundation.org> Revert "x86/apic: Include the LDR when clearing out APIC registers" Martin Sperl <kernel(a)martin.sperl.org> spi: bcm2835aux: fix corruptions for longer spi transfers Martin Sperl <kernel(a)martin.sperl.org> spi: bcm2835aux: remove dangerous uncontrolled read of fifo Martin Sperl <kernel(a)martin.sperl.org> spi: bcm2835aux: unifying code between polling and interrupt driven code Rob Herring <robh(a)kernel.org> spi: bcm2835aux: ensure interrupts are enabled for shared handler Luis Henriques <lhenriques(a)suse.com> libceph: allow ceph_buffer_put() to receive a NULL ceph_buffer Andrew Jones <drjones(a)redhat.com> KVM: arm/arm64: Only skip MMIO insn once Luis Henriques <lhenriques(a)suse.com> ceph: fix buffer free while holding i_ceph_lock in fill_inode() Luis Henriques <lhenriques(a)suse.com> ceph: fix buffer free while holding i_ceph_lock in __ceph_setxattr() Wenwen Wang <wenwen(a)cs.uga.edu> IB/mlx4: Fix memory leaks Vitaly Kuznetsov <vkuznets(a)redhat.com> Tools: hv: kvp: eliminate 'may be used uninitialized' warning Tho Vu <tho.vu.wh(a)rvc.renesas.com> ravb: Fix use-after-free ravb_tstamp_skb Wenwen Wang <wenwen(a)cs.uga.edu> wimax/i2400m: fix a memory leak bug Wenwen Wang <wenwen(a)cs.uga.edu> net: kalmia: fix memory leaks Wenwen Wang <wenwen(a)cs.uga.edu> cx82310_eth: fix a memory leak bug Wenwen Wang <wenwen(a)cs.uga.edu> net: myri10ge: fix memory leaks Wenwen Wang <wenwen(a)cs.uga.edu> cxgb4: fix a memory leak bug YueHaibing <yuehaibing(a)huawei.com> gpio: Fix build error of function redefinition Thomas Falcon <tlfalcon(a)linux.ibm.com> ibmveth: Convert multicast list size for little-endian system Matthias Kaehlcke <mka(a)chromium.org> Bluetooth: btqca: Add a short delay before downloading the NVM Nathan Chancellor <natechancellor(a)gmail.com> net: tc35815: Explicitly check NET_IP_ALIGN is not zero in tc35815_rx Fuqian Huang <huangfq.daxian(a)gmail.com> net: tundra: tsi108: use spin_lock_irqsave instead of spin_lock_irq in IRQ context ------------- Diffstat: Makefile | 4 +- arch/arm/kvm/mmio.c | 7 +++ arch/x86/kernel/apic/apic.c | 4 -- drivers/bluetooth/btqca.c | 3 ++ drivers/infiniband/hw/mlx4/mad.c | 4 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 4 +- drivers/net/ethernet/ibm/ibmveth.c | 9 ++-- drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 2 +- drivers/net/ethernet/renesas/ravb_main.c | 8 ++- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 6 +-- drivers/net/ethernet/toshiba/tc35815.c | 2 +- drivers/net/ethernet/tundra/tsi108_eth.c | 5 +- drivers/net/usb/cx82310_eth.c | 3 +- drivers/net/usb/kalmia.c | 6 +-- drivers/net/wimax/i2400m/fw.c | 4 +- drivers/spi/spi-bcm2835aux.c | 57 ++++++++-------------- fs/ceph/inode.c | 7 +-- fs/ceph/xattr.c | 8 ++- include/linux/ceph/buffer.h | 3 +- include/linux/gpio.h | 24 --------- net/core/netpoll.c | 6 +-- net/ipv4/tcp_output.c | 3 +- net/ipv6/mcast.c | 5 +- tools/hv/hv_kvp_daemon.c | 2 +- 24 files changed, 84 insertions(+), 102 deletions(-)

5 years, 8 months

6
31
0 0

[PATCH 4.4 00/23] 4.4.192-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.4.192 release. There are 23 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 Tue 10 Sep 2019 12:09:36 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.4.192-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.4.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.4.192-rc1 Chen-Yu Tsai <wens(a)csie.org> net: stmmac: dwmac-rk: Don't fail if phy regulator is absent Feng Sun <loyou85(a)gmail.com> net: fix skb use after free in netpoll Linus Torvalds <torvalds(a)linux-foundation.org> Revert "x86/apic: Include the LDR when clearing out APIC registers" Martin Sperl <kernel(a)martin.sperl.org> spi: bcm2835aux: fix corruptions for longer spi transfers Martin Sperl <kernel(a)martin.sperl.org> spi: bcm2835aux: remove dangerous uncontrolled read of fifo Martin Sperl <kernel(a)martin.sperl.org> spi: bcm2835aux: unifying code between polling and interrupt driven code Rob Herring <robh(a)kernel.org> spi: bcm2835aux: ensure interrupts are enabled for shared handler Luis Henriques <lhenriques(a)suse.com> libceph: allow ceph_buffer_put() to receive a NULL ceph_buffer Andrew Jones <drjones(a)redhat.com> KVM: arm/arm64: Only skip MMIO insn once Luis Henriques <lhenriques(a)suse.com> ceph: fix buffer free while holding i_ceph_lock in __ceph_setxattr() Wenwen Wang <wenwen(a)cs.uga.edu> IB/mlx4: Fix memory leaks Vitaly Kuznetsov <vkuznets(a)redhat.com> Tools: hv: kvp: eliminate 'may be used uninitialized' warning Tho Vu <tho.vu.wh(a)rvc.renesas.com> ravb: Fix use-after-free ravb_tstamp_skb Wenwen Wang <wenwen(a)cs.uga.edu> wimax/i2400m: fix a memory leak bug Wenwen Wang <wenwen(a)cs.uga.edu> net: kalmia: fix memory leaks Wenwen Wang <wenwen(a)cs.uga.edu> cx82310_eth: fix a memory leak bug Wenwen Wang <wenwen(a)cs.uga.edu> net: myri10ge: fix memory leaks Wenwen Wang <wenwen(a)cs.uga.edu> cxgb4: fix a memory leak bug YueHaibing <yuehaibing(a)huawei.com> gpio: Fix build error of function redefinition Thomas Falcon <tlfalcon(a)linux.ibm.com> ibmveth: Convert multicast list size for little-endian system Matthias Kaehlcke <mka(a)chromium.org> Bluetooth: btqca: Add a short delay before downloading the NVM Nathan Chancellor <natechancellor(a)gmail.com> net: tc35815: Explicitly check NET_IP_ALIGN is not zero in tc35815_rx Fuqian Huang <huangfq.daxian(a)gmail.com> net: tundra: tsi108: use spin_lock_irqsave instead of spin_lock_irq in IRQ context ------------- Diffstat: Makefile | 4 +- arch/arm/kvm/mmio.c | 7 +++ arch/x86/kernel/apic/apic.c | 4 -- drivers/bluetooth/btqca.c | 3 ++ drivers/infiniband/hw/mlx4/mad.c | 4 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 4 +- drivers/net/ethernet/ibm/ibmveth.c | 9 ++-- drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 2 +- drivers/net/ethernet/renesas/ravb_main.c | 8 ++- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 6 +-- drivers/net/ethernet/toshiba/tc35815.c | 2 +- drivers/net/ethernet/tundra/tsi108_eth.c | 5 +- drivers/net/usb/cx82310_eth.c | 3 +- drivers/net/usb/kalmia.c | 6 +-- drivers/net/wimax/i2400m/fw.c | 4 +- drivers/spi/spi-bcm2835aux.c | 57 ++++++++-------------- fs/ceph/xattr.c | 8 ++- include/linux/ceph/buffer.h | 3 +- include/linux/gpio.h | 24 --------- net/core/netpoll.c | 6 +-- tools/hv/hv_kvp_daemon.c | 2 +- 21 files changed, 75 insertions(+), 96 deletions(-)

5 years, 8 months

6
28
0 0

[PATCH] drm/lima: fix lima_gem_wait() return value

by Vasily Khoruzhick

drm_gem_reservation_object_wait() returns 0 if it succeeds and -ETIME if it timeouts, but lima driver assumed that 0 is error. Cc: stable(a)vger.kernel.org Signed-off-by: Vasily Khoruzhick <anarsoul(a)gmail.com> --- drivers/gpu/drm/lima/lima_gem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/lima/lima_gem.c b/drivers/gpu/drm/lima/lima_gem.c index 477c0f766663..b609dc030d6c 100644 --- a/drivers/gpu/drm/lima/lima_gem.c +++ b/drivers/gpu/drm/lima/lima_gem.c @@ -342,7 +342,7 @@ int lima_gem_wait(struct drm_file *file, u32 handle, u32 op, s64 timeout_ns) timeout = drm_timeout_abs_to_jiffies(timeout_ns); ret = drm_gem_reservation_object_wait(file, handle, write, timeout); - if (ret == 0) + if (ret == -ETIME) ret = timeout ? -ETIMEDOUT : -EBUSY; return ret; -- 2.23.0

5 years, 8 months

3
5
0 0

Re: [PATCH] ath10k: restore QCA9880-AR1A (v1) detection

by Sasha Levin

Hi, [This is an automated email] This commit has been processed because it contains a "Fixes:" tag, fixing commit: 1a7fecb766c8 ath10k: reset chip before reading chip_id in probe. The bot has tested the following trees: v5.2.13, v4.19.71, v4.14.142, v4.9.191, v4.4.191. v5.2.13: Failed to apply! Possible dependencies: 6d084ac27ab4 ("ath10k: initialise struct ath10k_bus params to zero") v4.19.71: Failed to apply! Possible dependencies: 31324d17976e ("ath10k: support extended board data download for dual-band QCA9984") 5849ed48d226 ("ath10k: refactoring needed for extended board data download") 6d084ac27ab4 ("ath10k: initialise struct ath10k_bus params to zero") 7c2dd6154fc2 ("ath10k: add device type enum to ath10k_bus_params") ba94c753ccb4 ("ath10k: add QMI message handshake for wcn3990 client") c0d8d565787c ("ath10k: add struct ath10k_bus_params") de8781d7e74d ("ath10k: disable interface pause wow config for integrated chipset") f1908735f141 ("ath10k: allow ATH10K_SNOC with COMPILE_TEST") v4.14.142: Failed to apply! Possible dependencies: 0fa4fbe9b8cf ("ath10k: add hif power-up/power-down methods") 17f5559e0da5 ("ath10k: platform driver for WCN3990 SNOC WLAN module") 2a1e1ad3fd37 ("ath10k: Add support for 64 bit ce descriptor") 50c51f394e68 ("ath10k: do not mix spaces and tabs in Kconfig") 5dac5f3772f6 ("ath10k: Use dma_addr_t for ce buffers to support 64bit target") 6d084ac27ab4 ("ath10k: initialise struct ath10k_bus params to zero") 7f9befbb555d ("ath10k: move pktlog_filter out of ath10k_debug") 84efe7f6ebc5 ("ath10k: map HTC services to tx/rx pipes for wcn3990") a0aedd6e0b57 ("ath10k: build ce layer in ath10k core module") a6a793f98786 ("ath10k: vote for hardware resources for WCN3990") a6e149a9ff03 ("ath10k: add hif start/stop methods for wcn3990 snoc layer") ba94c753ccb4 ("ath10k: add QMI message handshake for wcn3990 client") c0d8d565787c ("ath10k: add struct ath10k_bus_params") c963a683e701 ("ath10k: add resource init and deinit for WCN3990") d390509bdf50 ("ath10k: add hif tx methods for wcn3990") dafa42036012 ("ath10k: use 64-bit crash dump timestamps") e2fcf60c6fe8 ("ath10k: detach coredump.c from debug.c") f1908735f141 ("ath10k: allow ATH10K_SNOC with COMPILE_TEST") f25b9f285a0e ("ath10k: refactor firmware crashdump code to coredump.c") v4.9.191: Failed to apply! Possible dependencies: 0fa4fbe9b8cf ("ath10k: add hif power-up/power-down methods") 17f5559e0da5 ("ath10k: platform driver for WCN3990 SNOC WLAN module") 4db66499df91 ("ath10k: add initial USB support") 50c51f394e68 ("ath10k: do not mix spaces and tabs in Kconfig") 5524ddd4c1f1 ("ath10k: select WANT_DEV_COREDUMP") 6d084ac27ab4 ("ath10k: initialise struct ath10k_bus params to zero") 84efe7f6ebc5 ("ath10k: map HTC services to tx/rx pipes for wcn3990") a0aedd6e0b57 ("ath10k: build ce layer in ath10k core module") a6a793f98786 ("ath10k: vote for hardware resources for WCN3990") a6e149a9ff03 ("ath10k: add hif start/stop methods for wcn3990 snoc layer") ba94c753ccb4 ("ath10k: add QMI message handshake for wcn3990 client") c0d8d565787c ("ath10k: add struct ath10k_bus_params") c963a683e701 ("ath10k: add resource init and deinit for WCN3990") cec17c382140 ("ath10k: add per peer htt tx stats support for 10.4") d390509bdf50 ("ath10k: add hif tx methods for wcn3990") d96db25d2025 ("ath10k: add initial SDIO support") f1908735f141 ("ath10k: allow ATH10K_SNOC with COMPILE_TEST") v4.4.191: Failed to apply! Possible dependencies: 0b523ced9a3c ("ath10k: add basic skeleton to support ahb") 0d87c9208a17 ("ath10k: expose hif ops for ahb") 133df0f849bc ("ath10k: add chip and bus halt logic in ahb") 14854bfd9daa ("ath10k: add reset ctrl related functions in ahb") 1c44fcb9234c ("ath10k: include irq related functions in ahb") 4ddb3299aa49 ("ath10k: make ath10k_pci_read32/write32() ops more generic") 6d084ac27ab4 ("ath10k: initialise struct ath10k_bus params to zero") 704dc4e36769 ("ath10k: add resource init and deinit in ahb") 7f8e79cdc253 ("ath10k: add helper functions in ahb.c for reg rd/wr") 8beff219c528 ("ath10k: add clock ctrl related functions in ahb") f52f517189de ("ath10k: make some of ath10k_pci_* func reusable") NOTE: The patch will not be queued to stable trees until it is upstream. How should we proceed with this patch? -- Thanks, Sasha

5 years, 8 months

3
2
0 0

[PATCH v2] net: enable wireless core features with LEGACY_WEXT_ALLCONFIG

by Mark Salyzyn

In embedded environments the requirements are to be able to pick and chose which features one requires built into the kernel. If an embedded environment wants to supports loading modules that have been kbuilt out of tree, there is a need to enable hidden configurations for legacy wireless core features to provide the API surface for them to load. Introduce CONFIG_LEGACY_WEXT_ALLCONFIG to select all legacy wireless extension core features by activating in turn all the associated hidden configuration options, without having to specifically select any wireless module(s). Signed-off-by: Mark Salyzyn <salyzyn(a)android.com> Cc: kernel-team(a)android.com Cc: Johannes Berg <johannes(a)sipsolutions.net> Cc: "David S. Miller" <davem(a)davemloft.net> Cc: Marcel Holtmann <marcel(a)holtmann.org> Cc: linux-wireless(a)vger.kernel.org Cc: netdev(a)vger.kernel.org Cc: linux-kernel(a)vger.kernel.org Cc: stable(a)vger.kernel.org # 4.19 --- v2: change name and documentation to CONFIG_LEGACY_WEXT_ALLCONFIG --- net/wireless/Kconfig | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig index 67f8360dfcee..0d646cf28de5 100644 --- a/net/wireless/Kconfig +++ b/net/wireless/Kconfig @@ -17,6 +17,20 @@ config WEXT_SPY config WEXT_PRIV bool +config LEGACY_WEXT_ALLCONFIG + bool "allconfig for legacy wireless extensions" + select WIRELESS_EXT + select WEXT_CORE + select WEXT_PROC + select WEXT_SPY + select WEXT_PRIV + help + Config option used to enable all the legacy wireless extensions to + the core functionality used by add-in modules. + + If you are not building a kernel to be used for a variety of + out-of-kernel built wireless modules, say N here. + config CFG80211 tristate "cfg80211 - wireless configuration API" depends on RFKILL || !RFKILL -- 2.23.0.187.g17f5b7556c-goog

5 years, 8 months

4
5
0 0

Re: [PATCH] SUNRPC: Dequeue the request from the receive queue while we're re-encoding

by Sasha Levin

Hi, [This is an automated email] This commit has been processed because it contains a "Fixes:" tag, fixing commit: 753690898204 SUNRPC: Ensure the bvecs are reset when we re-encode the RPC request. The bot has tested the following trees: v5.2.13. v5.2.13: Failed to apply! Possible dependencies: b5e924191f87 ("SUNRPC: Remove the bh-safe lock requirement on xprt->transport_lock") NOTE: The patch will not be queued to stable trees until it is upstream. How should we proceed with this patch? -- Thanks, Sasha

5 years, 8 months

1
0
0 0

[v4.4.y] xfrm: clean up xfrm protocol checks

by Zubin Mithra

From: Cong Wang <xiyou.wangcong(a)gmail.com> commit dbb2483b2a46fbaf833cfb5deb5ed9cace9c7399 upstream. In commit 6a53b7593233 ("xfrm: check id proto in validate_tmpl()") I introduced a check for xfrm protocol, but according to Herbert IPSEC_PROTO_ANY should only be used as a wildcard for lookup, so it should be removed from validate_tmpl(). And, IPSEC_PROTO_ANY is expected to only match 3 IPSec-specific protocols, this is why xfrm_state_flush() could still miss IPPROTO_ROUTING, which leads that those entries are left in net->xfrm.state_all before exit net. Fix this by replacing IPSEC_PROTO_ANY with zero. This patch also extracts the check from validate_tmpl() to xfrm_id_proto_valid() and uses it in parse_ipsecrequest(). With this, no other protocols should be added into xfrm. Fixes: 6a53b7593233 ("xfrm: check id proto in validate_tmpl()") Reported-by: syzbot+0bf0519d6e0de15914fe(a)syzkaller.appspotmail.com Cc: Steffen Klassert <steffen.klassert(a)secunet.com> Cc: Herbert Xu <herbert(a)gondor.apana.org.au> Signed-off-by: Cong Wang <xiyou.wangcong(a)gmail.com> Acked-by: Herbert Xu <herbert(a)gondor.apana.org.au> Signed-off-by: Steffen Klassert <steffen.klassert(a)secunet.com> Signed-off-by: Zubin Mithra <zsm(a)chromium.org> --- Notes: * Syzkaller triggered a WARNING with the following stacktrace: __dump_stack lib/dump_stack.c:15 [inline] dump_stack+0xbf/0x113 lib/dump_stack.c:51 panic+0x1a6/0x361 kernel/panic.c:116 __warn+0x168/0x1b0 kernel/panic.c:470 warn_slowpath_null+0x3c/0x40 kernel/panic.c:514 xfrm_state_fini+0x83/0x28e net/xfrm/xfrm_state.c:2131 xfrm_net_exit+0x32/0x35 net/xfrm/xfrm_policy.c:3044 ops_exit_list+0xfc/0x12f net/core/net_namespace.c:136 cleanup_net+0x328/0x4ce net/core/net_namespace.c:454 process_one_work+0x7df/0xca8 kernel/workqueue.c:2064 worker_thread+0x592/0x765 kernel/workqueue.c:2196 kthread+0x279/0x28d kernel/kthread.c:211 ret_from_fork+0x4e/0x80 arch/x86/entry/entry_64.S:600 * The commit is present in linux-4.19.y. A backport for 4.14.y and 4.9.y has been sent separately. * The patch resolves the following conflicts: - conflicts in content of xfrm6_tunnel_net_exit() - changes in the prototype of xfrm_state_flush() - net->xfrm.state_gc_work has been moved to a global xfrm_state_gc_work - ordering of xfrm_state_flush(...) and flush_work(...) inside xfrm_state_fini. * Tests run: Chrome OS tryjobs, syzkaller reproducer include/net/xfrm.h | 17 +++++++++++++++++ net/key/af_key.c | 4 +++- net/xfrm/xfrm_state.c | 2 +- net/xfrm/xfrm_user.c | 14 +------------- 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 185fb037b332..631614856afc 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -1301,6 +1301,23 @@ static inline int xfrm_state_kern(const struct xfrm_state *x) return atomic_read(&x->tunnel_users); } +static inline bool xfrm_id_proto_valid(u8 proto) +{ + switch (proto) { + case IPPROTO_AH: + case IPPROTO_ESP: + case IPPROTO_COMP: +#if IS_ENABLED(CONFIG_IPV6) + case IPPROTO_ROUTING: + case IPPROTO_DSTOPTS: +#endif + return true; + default: + return false; + } +} + +/* IPSEC_PROTO_ANY only matches 3 IPsec protocols, 0 could match all. */ static inline int xfrm_id_proto_match(u8 proto, u8 userproto) { return (!userproto || proto == userproto || diff --git a/net/key/af_key.c b/net/key/af_key.c index 36db179d848e..d2ec620319d7 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -1969,8 +1969,10 @@ parse_ipsecrequest(struct xfrm_policy *xp, struct sadb_x_ipsecrequest *rq) if (rq->sadb_x_ipsecrequest_mode == 0) return -EINVAL; + if (!xfrm_id_proto_valid(rq->sadb_x_ipsecrequest_proto)) + return -EINVAL; - t->id.proto = rq->sadb_x_ipsecrequest_proto; /* XXX check proto */ + t->id.proto = rq->sadb_x_ipsecrequest_proto; if ((mode = pfkey_mode_to_xfrm(rq->sadb_x_ipsecrequest_mode)) < 0) return -EINVAL; t->mode = mode; diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 13f261feb75c..787f2cac18c5 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -2133,7 +2133,7 @@ void xfrm_state_fini(struct net *net) unsigned int sz; flush_work(&net->xfrm.state_hash_work); - xfrm_state_flush(net, IPSEC_PROTO_ANY, false); + xfrm_state_flush(net, 0, false); flush_work(&net->xfrm.state_gc_work); WARN_ON(!list_empty(&net->xfrm.state_all)); diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index 8cc2a9df84fd..4dbe6ebeabf8 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -1448,20 +1448,8 @@ static int validate_tmpl(int nr, struct xfrm_user_tmpl *ut, u16 family) return -EINVAL; } - switch (ut[i].id.proto) { - case IPPROTO_AH: - case IPPROTO_ESP: - case IPPROTO_COMP: -#if IS_ENABLED(CONFIG_IPV6) - case IPPROTO_ROUTING: - case IPPROTO_DSTOPTS: -#endif - case IPSEC_PROTO_ANY: - break; - default: + if (!xfrm_id_proto_valid(ut[i].id.proto)) return -EINVAL; - } - } return 0; -- 2.23.0.162.g0b9fbb3734-goog

5 years, 8 months

1
0
0 0

[PATCH AUTOSEL 4.4 1/2] dmaengine: ti: omap-dma: Add cleanup in omap_dma_probe()

by Sasha Levin

From: Wenwen Wang <wenwen(a)cs.uga.edu> [ Upstream commit 962411b05a6d3342aa649e39cda1704c1fc042c6 ] If devm_request_irq() fails to disable all interrupts, no cleanup is performed before retuning the error. To fix this issue, invoke omap_dma_free() to do the cleanup. Signed-off-by: Wenwen Wang <wenwen(a)cs.uga.edu> Acked-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Link: https://lore.kernel.org/r/1565938570-7528-1-git-send-email-wenwen@cs.uga.edu Signed-off-by: Vinod Koul <vkoul(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/dma/omap-dma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c index 1dfc71c90123f..57b6e6ca14a88 100644 --- a/drivers/dma/omap-dma.c +++ b/drivers/dma/omap-dma.c @@ -1199,8 +1199,10 @@ static int omap_dma_probe(struct platform_device *pdev) rc = devm_request_irq(&pdev->dev, irq, omap_dma_irq, IRQF_SHARED, "omap-dma-engine", od); - if (rc) + if (rc) { + omap_dma_free(od); return rc; + } } rc = dma_async_device_register(&od->ddev); -- 2.20.1

5 years, 8 months

1
1
0 0

[PATCH AUTOSEL 4.9 1/6] dmaengine: ti: dma-crossbar: Fix a memory leak bug

by Sasha Levin

From: Wenwen Wang <wenwen(a)cs.uga.edu> [ Upstream commit 2c231c0c1dec42192aca0f87f2dc68b8f0cbc7d2 ] In ti_dra7_xbar_probe(), 'rsv_events' is allocated through kcalloc(). Then of_property_read_u32_array() is invoked to search for the property. However, if this process fails, 'rsv_events' is not deallocated, leading to a memory leak bug. To fix this issue, free 'rsv_events' before returning the error. Signed-off-by: Wenwen Wang <wenwen(a)cs.uga.edu> Acked-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Link: https://lore.kernel.org/r/1565938136-7249-1-git-send-email-wenwen@cs.uga.edu Signed-off-by: Vinod Koul <vkoul(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/dma/ti-dma-crossbar.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/dma/ti-dma-crossbar.c b/drivers/dma/ti-dma-crossbar.c index 8c3c588834d2e..a7e1f6e17e3d1 100644 --- a/drivers/dma/ti-dma-crossbar.c +++ b/drivers/dma/ti-dma-crossbar.c @@ -395,8 +395,10 @@ static int ti_dra7_xbar_probe(struct platform_device *pdev) ret = of_property_read_u32_array(node, pname, (u32 *)rsv_events, nelm * 2); - if (ret) + if (ret) { + kfree(rsv_events); return ret; + } for (i = 0; i < nelm; i++) { ti_dra7_xbar_reserve(rsv_events[i][0], rsv_events[i][1], -- 2.20.1

5 years, 8 months

1
5
0 0

[PATCH AUTOSEL 4.14 1/8] dmaengine: ti: dma-crossbar: Fix a memory leak bug

by Sasha Levin

From: Wenwen Wang <wenwen(a)cs.uga.edu> [ Upstream commit 2c231c0c1dec42192aca0f87f2dc68b8f0cbc7d2 ] In ti_dra7_xbar_probe(), 'rsv_events' is allocated through kcalloc(). Then of_property_read_u32_array() is invoked to search for the property. However, if this process fails, 'rsv_events' is not deallocated, leading to a memory leak bug. To fix this issue, free 'rsv_events' before returning the error. Signed-off-by: Wenwen Wang <wenwen(a)cs.uga.edu> Acked-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Link: https://lore.kernel.org/r/1565938136-7249-1-git-send-email-wenwen@cs.uga.edu Signed-off-by: Vinod Koul <vkoul(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/dma/ti-dma-crossbar.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/dma/ti-dma-crossbar.c b/drivers/dma/ti-dma-crossbar.c index 9272b173c7465..6574cb5a12fee 100644 --- a/drivers/dma/ti-dma-crossbar.c +++ b/drivers/dma/ti-dma-crossbar.c @@ -395,8 +395,10 @@ static int ti_dra7_xbar_probe(struct platform_device *pdev) ret = of_property_read_u32_array(node, pname, (u32 *)rsv_events, nelm * 2); - if (ret) + if (ret) { + kfree(rsv_events); return ret; + } for (i = 0; i < nelm; i++) { ti_dra7_xbar_reserve(rsv_events[i][0], rsv_events[i][1], -- 2.20.1

5 years, 8 months

1
7
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror