From: Vasily Averin <vvs(a)virtuozzo.com>
[ Upstream commit db8dd9697238be70a6b4f9d0284cd89f59c0e070 ]
if seq_file .next fuction does not change position index,
read after some lseek can generate unexpected output.
# mount | grep cgroup
# dd if=/mnt/cgroup.procs bs=1 # normal output
...
1294
1295
1296
1304
1382
584+0 records in
584+0 records out
584 bytes copied
dd: /mnt/cgroup.procs: cannot skip to specified offset
83 <<< generates end of last line
1383 <<< ... and whole last line once again
0+1 records in
0+1 records out
8 bytes copied
dd: /mnt/cgroup.procs: cannot skip to specified offset
1386 <<< generates last line anyway
0+1 records in
0+1 records out
5 bytes copied
https://bugzilla.kernel.org/show_bug.cgi?id=206283
Signed-off-by: Vasily Averin <vvs(a)virtuozzo.com>
Signed-off-by: Tejun Heo <tj(a)kernel.org>
Signed-off-by: Sasha Levin <sashal(a)kernel.org>
---
kernel/cgroup/cgroup-v1.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c
index 7f83f4121d8d0..2db582706ec5c 100644
--- a/kernel/cgroup/cgroup-v1.c
+++ b/kernel/cgroup/cgroup-v1.c
@@ -473,6 +473,7 @@ static void *cgroup_pidlist_next(struct seq_file *s, void *v, loff_t *pos)
*/
p++;
if (p >= end) {
+ (*pos)++;
return NULL;
} else {
*pos = *p;
--
2.20.1
This is the start of the stable review cycle for the 5.5.16 release.
There are 48 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 Thu, 09 Apr 2020 15:46:32 +0000.
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/v5.x/stable-review/patch-5.5.16-rc2…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.5.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 5.5.16-rc2
Randy Dunlap <rdunlap(a)infradead.org>
mm: mempolicy: require at least one nodeid for MPOL_PREFERRED
Daniel Jordan <daniel.m.jordan(a)oracle.com>
padata: always acquire cpu_hotplug_lock before pinst->lock
Ursula Braun <ubraun(a)linux.ibm.com>
net/smc: fix cleanup for linkgroup setup failures
Amritha Nambiar <amritha.nambiar(a)intel.com>
net: Fix Tx hash bound checking
Paolo Abeni <pabeni(a)redhat.com>
net: genetlink: return the error code when attribute parsing fails.
Mika Westerberg <mika.westerberg(a)linux.intel.com>
i2c: i801: Do not add ICH_RES_IO_SMI for the iTCO_wdt device
Mika Westerberg <mika.westerberg(a)linux.intel.com>
watchdog: iTCO_wdt: Make ICH_RES_IO_SMI optional
Mika Westerberg <mika.westerberg(a)linux.intel.com>
watchdog: iTCO_wdt: Export vendorsupport
Neal Cardwell <ncardwell(a)google.com>
tcp: fix TFO SYNACK undo to avoid double-timestamp-undo
Jiri Pirko <jiri(a)mellanox.com>
sched: act: count in the size of action flags bitfield
Mike Marciniszyn <mike.marciniszyn(a)intel.com>
IB/hfi1: Ensure pq is not left on waitlist
David Howells <dhowells(a)redhat.com>
rxrpc: Fix sendmsg(MSG_WAITALL) handling
Luca Coelho <luciano.coelho(a)intel.com>
iwlwifi: dbg: don't abort if sending DBGC_SUSPEND_RESUME fails
Mordechay Goodstein <mordechay.goodstein(a)intel.com>
iwlwifi: yoyo: don't add TLV offset when reading FIFOs
Mordechay Goodstein <mordechay.goodstein(a)intel.com>
iwlwifi: consider HE capability when setting LDPC
Tariq Toukan <tariqt(a)mellanox.com>
net/mlx5e: kTLS, Fix wrong value in record tracker enum
Bibby Hsieh <bibby.hsieh(a)mediatek.com>
soc: mediatek: knows_txdone needs to be set in Mediatek CMDQ helper
Geoffrey Allott <geoffrey(a)allott.email>
ALSA: hda/ca0132 - Add Recon3Di quirk to handle integrated sound on EVGA X99 Classified motherboard
Mike Snitzer <snitzer(a)redhat.com>
Revert "dm: always call blk_queue_split() in dm_process_bio()"
Hans de Goede <hdegoede(a)redhat.com>
power: supply: axp288_charger: Add special handling for HP Pavilion x2 10
Hans de Goede <hdegoede(a)redhat.com>
extcon: axp288: Add wakeup support
Freeman Liu <freeman.liu(a)unisoc.com>
nvmem: sprd: Fix the block lock operation
Nicholas Johnson <nicholas.johnson-opensource(a)outlook.com.au>
nvmem: check for NULL reg_read and reg_write before dereferencing
Alexander Usyskin <alexander.usyskin(a)intel.com>
mei: me: add cedar fork device ids
Eugene Syromiatnikov <esyr(a)redhat.com>
coresight: do not use the BIT() macro in the UAPI header
Kelsey Skunberg <kelsey.skunberg(a)gmail.com>
PCI: sysfs: Revert "rescan" file renames
Kishon Vijay Abraham I <kishon(a)ti.com>
misc: pci_endpoint_test: Avoid using module parameter to determine irqtype
Kishon Vijay Abraham I <kishon(a)ti.com>
misc: pci_endpoint_test: Fix to support > 10 pci-endpoint-test devices
YueHaibing <yuehaibing(a)huawei.com>
misc: rtsx: set correct pcr_ops for rts522A
Matthew Wilcox (Oracle) <willy(a)infradead.org>
XArray: Fix xa_find_next for large multi-index entries
Guenter Roeck <linux(a)roeck-us.net>
brcmfmac: abort and release host after error
Daniel Jordan <daniel.m.jordan(a)oracle.com>
padata: fix uninitialized return value in padata_replace()
Len Brown <len.brown(a)intel.com>
tools/power turbostat: Fix 32-bit capabilities warning
Len Brown <len.brown(a)intel.com>
tools/power turbostat: Fix missing SYS_LPI counter on some Chromebooks
Len Brown <len.brown(a)intel.com>
tools/power turbostat: Fix gcc build warnings
James Zhu <James.Zhu(a)amd.com>
drm/amdgpu: fix typo for vcn1 idle check
Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com>
initramfs: restore default compression behavior
Gerd Hoffmann <kraxel(a)redhat.com>
drm/bochs: downgrade pci_request_region failure from error to warning
Mario Kleiner <mario.kleiner.de(a)gmail.com>
drm/amd/display: Add link_rate quirk for Apple 15" MBP 2017
Evan Quan <evan.quan(a)amd.com>
drm/amdgpu: add fbdev suspend/resume on gpu reset
Jérôme Pouiller <jerome.pouiller(a)silabs.com>
staging: wfx: fix warning about freeing in-use mutex during device unregister
Prabhath Sajeepa <psajeepa(a)purestorage.com>
nvme-rdma: Avoid double freeing of async event data
Codrin Ciubotariu <codrin.ciubotariu(a)microchip.com>
net: macb: Fix handling of fixed-link node
Qiujun Huang <hqjagain(a)gmail.com>
sctp: fix refcount bug in sctp_wfree
Marcelo Ricardo Leitner <marcelo.leitner(a)gmail.com>
sctp: fix possibly using a bad saddr with a given dst
William Dauchy <w.dauchy(a)criteo.com>
net, ip_tunnel: fix interface lookup with no key
Codrin Ciubotariu <codrin.ciubotariu(a)microchip.com>
net: dsa: ksz: Select KSZ protocol tag
Qian Cai <cai(a)lca.pw>
ipv4: fix a RCU-list lock in fib_triestat_seq_show
-------------
Diffstat:
Makefile | 4 +-
drivers/extcon/extcon-axp288.c | 32 ++++++++++
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 2 +-
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 11 ++++
drivers/gpu/drm/bochs/bochs_hw.c | 6 +-
drivers/i2c/busses/i2c-i801.c | 45 ++++---------
drivers/infiniband/hw/hfi1/user_sdma.c | 25 +++++++-
drivers/md/dm.c | 5 +-
drivers/misc/cardreader/rts5227.c | 1 +
drivers/misc/mei/hw-me-regs.h | 2 +
drivers/misc/mei/pci-me.c | 2 +
drivers/misc/pci_endpoint_test.c | 14 +++--
drivers/net/dsa/microchip/Kconfig | 1 +
drivers/net/ethernet/cadence/macb_main.c | 3 +
.../ethernet/mellanox/mlx5/core/en_accel/ktls.h | 4 +-
.../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 +
drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 25 +++-----
drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 6 +-
drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 6 +-
drivers/nvme/host/rdma.c | 8 ++-
drivers/nvmem/nvmem-sysfs.c | 6 ++
drivers/nvmem/sprd-efuse.c | 2 +-
drivers/pci/pci-sysfs.c | 6 +-
drivers/power/supply/axp288_charger.c | 57 ++++++++++++++++-
drivers/soc/mediatek/mtk-cmdq-helper.c | 1 +
drivers/staging/wfx/hif_tx.c | 1 +
drivers/watchdog/iTCO_vendor.h | 2 +
drivers/watchdog/iTCO_vendor_support.c | 16 ++---
drivers/watchdog/iTCO_wdt.c | 28 +++++----
include/uapi/linux/coresight-stm.h | 6 +-
kernel/padata.c | 6 +-
lib/test_xarray.c | 18 ++++++
lib/xarray.c | 3 +-
mm/mempolicy.c | 6 +-
net/core/dev.c | 2 +
net/ipv4/fib_trie.c | 3 +
net/ipv4/ip_tunnel.c | 6 +-
net/ipv4/tcp_input.c | 6 +-
net/netlink/genetlink.c | 5 +-
net/rxrpc/sendmsg.c | 4 +-
net/sched/act_api.c | 1 +
net/sctp/ipv6.c | 20 ++++--
net/sctp/protocol.c | 28 ++++++---
net/sctp/socket.c | 31 ++++++---
net/smc/af_smc.c | 25 +++++---
net/smc/smc_core.c | 12 ++++
net/smc/smc_core.h | 2 +-
sound/pci/hda/patch_ca0132.c | 1 +
tools/power/x86/turbostat/Makefile | 2 +-
tools/power/x86/turbostat/turbostat.c | 73 ++++++++++++++--------
usr/Kconfig | 22 +++----
52 files changed, 421 insertions(+), 188 deletions(-)
This is the start of the stable review cycle for the 5.4.31 release.
There are 38 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 Thu, 09 Apr 2020 15:46:32 +0000.
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/v5.x/stable-review/patch-5.4.31-rc2…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.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 5.4.31-rc2
Randy Dunlap <rdunlap(a)infradead.org>
mm: mempolicy: require at least one nodeid for MPOL_PREFERRED
Daniel Jordan <daniel.m.jordan(a)oracle.com>
padata: always acquire cpu_hotplug_lock before pinst->lock
Amritha Nambiar <amritha.nambiar(a)intel.com>
net: Fix Tx hash bound checking
Mika Westerberg <mika.westerberg(a)linux.intel.com>
i2c: i801: Do not add ICH_RES_IO_SMI for the iTCO_wdt device
Mika Westerberg <mika.westerberg(a)linux.intel.com>
watchdog: iTCO_wdt: Make ICH_RES_IO_SMI optional
Mika Westerberg <mika.westerberg(a)linux.intel.com>
watchdog: iTCO_wdt: Export vendorsupport
Neal Cardwell <ncardwell(a)google.com>
tcp: fix TFO SYNACK undo to avoid double-timestamp-undo
Mike Marciniszyn <mike.marciniszyn(a)intel.com>
IB/hfi1: Ensure pq is not left on waitlist
David Howells <dhowells(a)redhat.com>
rxrpc: Fix sendmsg(MSG_WAITALL) handling
Luca Coelho <luciano.coelho(a)intel.com>
iwlwifi: dbg: don't abort if sending DBGC_SUSPEND_RESUME fails
Mordechay Goodstein <mordechay.goodstein(a)intel.com>
iwlwifi: yoyo: don't add TLV offset when reading FIFOs
Mordechay Goodstein <mordechay.goodstein(a)intel.com>
iwlwifi: consider HE capability when setting LDPC
Tariq Toukan <tariqt(a)mellanox.com>
net/mlx5e: kTLS, Fix wrong value in record tracker enum
Bibby Hsieh <bibby.hsieh(a)mediatek.com>
soc: mediatek: knows_txdone needs to be set in Mediatek CMDQ helper
Geoffrey Allott <geoffrey(a)allott.email>
ALSA: hda/ca0132 - Add Recon3Di quirk to handle integrated sound on EVGA X99 Classified motherboard
Mike Snitzer <snitzer(a)redhat.com>
Revert "dm: always call blk_queue_split() in dm_process_bio()"
Hans de Goede <hdegoede(a)redhat.com>
power: supply: axp288_charger: Add special handling for HP Pavilion x2 10
Hans de Goede <hdegoede(a)redhat.com>
extcon: axp288: Add wakeup support
Nicholas Johnson <nicholas.johnson-opensource(a)outlook.com.au>
nvmem: check for NULL reg_read and reg_write before dereferencing
Alexander Usyskin <alexander.usyskin(a)intel.com>
mei: me: add cedar fork device ids
Eugene Syromiatnikov <esyr(a)redhat.com>
coresight: do not use the BIT() macro in the UAPI header
Kelsey Skunberg <kelsey.skunberg(a)gmail.com>
PCI: sysfs: Revert "rescan" file renames
Kishon Vijay Abraham I <kishon(a)ti.com>
misc: pci_endpoint_test: Avoid using module parameter to determine irqtype
Kishon Vijay Abraham I <kishon(a)ti.com>
misc: pci_endpoint_test: Fix to support > 10 pci-endpoint-test devices
YueHaibing <yuehaibing(a)huawei.com>
misc: rtsx: set correct pcr_ops for rts522A
Guenter Roeck <linux(a)roeck-us.net>
brcmfmac: abort and release host after error
Daniel Jordan <daniel.m.jordan(a)oracle.com>
padata: fix uninitialized return value in padata_replace()
Matthew Wilcox (Oracle) <willy(a)infradead.org>
XArray: Fix xa_find_next for large multi-index entries
Tariq Toukan <tariqt(a)mellanox.com>
net/mlx5e: kTLS, Fix TCP seq off-by-1 issue in TX resync flow
Len Brown <len.brown(a)intel.com>
tools/power turbostat: Fix 32-bit capabilities warning
Len Brown <len.brown(a)intel.com>
tools/power turbostat: Fix missing SYS_LPI counter on some Chromebooks
Len Brown <len.brown(a)intel.com>
tools/power turbostat: Fix gcc build warnings
James Zhu <James.Zhu(a)amd.com>
drm/amdgpu: fix typo for vcn1 idle check
Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com>
initramfs: restore default compression behavior
Gerd Hoffmann <kraxel(a)redhat.com>
drm/bochs: downgrade pci_request_region failure from error to warning
Mario Kleiner <mario.kleiner.de(a)gmail.com>
drm/amd/display: Add link_rate quirk for Apple 15" MBP 2017
Masahiro Yamada <masahiroy(a)kernel.org>
kconfig: introduce m32-flag and m64-flag
Prabhath Sajeepa <psajeepa(a)purestorage.com>
nvme-rdma: Avoid double freeing of async event data
-------------
Diffstat:
Makefile | 4 +-
drivers/extcon/extcon-axp288.c | 32 ++++++++++
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 2 +-
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 11 ++++
drivers/gpu/drm/bochs/bochs_hw.c | 6 +-
drivers/i2c/busses/i2c-i801.c | 45 ++++---------
drivers/infiniband/hw/hfi1/user_sdma.c | 25 +++++++-
drivers/md/dm.c | 5 +-
drivers/misc/cardreader/rts5227.c | 1 +
drivers/misc/mei/hw-me-regs.h | 2 +
drivers/misc/mei/pci-me.c | 2 +
drivers/misc/pci_endpoint_test.c | 14 +++--
.../ethernet/mellanox/mlx5/core/en_accel/ktls.h | 4 +-
.../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 2 +-
.../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 +
drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 25 +++-----
drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 6 +-
drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 6 +-
drivers/nvme/host/rdma.c | 8 ++-
drivers/nvmem/nvmem-sysfs.c | 6 ++
drivers/pci/pci-sysfs.c | 6 +-
drivers/power/supply/axp288_charger.c | 57 ++++++++++++++++-
drivers/soc/mediatek/mtk-cmdq-helper.c | 1 +
drivers/watchdog/iTCO_vendor.h | 2 +
drivers/watchdog/iTCO_vendor_support.c | 16 ++---
drivers/watchdog/iTCO_wdt.c | 28 +++++----
include/uapi/linux/coresight-stm.h | 6 +-
kernel/padata.c | 6 +-
lib/test_xarray.c | 18 ++++++
lib/xarray.c | 3 +-
mm/mempolicy.c | 6 +-
net/core/dev.c | 2 +
net/ipv4/tcp_input.c | 6 +-
net/rxrpc/sendmsg.c | 4 +-
scripts/Kconfig.include | 7 +++
sound/pci/hda/patch_ca0132.c | 1 +
tools/power/x86/turbostat/Makefile | 2 +-
tools/power/x86/turbostat/turbostat.c | 73 ++++++++++++++--------
usr/Kconfig | 22 +++----
39 files changed, 327 insertions(+), 147 deletions(-)
From: "Gustavo A. R. Silva" <gustavo(a)embeddedor.com>
commit c3422ad5f84a66739ec6a37251ca27638c85b6be upstream.
Currently there is no check on platform_get_irq() return value
in case it fails, hence never actually reporting any errors and
causing unexpected behavior when using such value as argument
for function regmap_irq_get_virq().
Fix this by adding a proper check, a message reporting any errors
and returning *pirq*
Addresses-Coverity-ID: 1443940 ("Improper use of negative value")
Fixes: 843735b788a4 ("power: axp288_charger: axp288 charger driver")
Cc: stable(a)vger.kernel.org
Signed-off-by: Gustavo A. R. Silva <gustavo(a)embeddedor.com>
Reviewed-by: Hans de Goede <hdegoede(a)redhat.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel(a)collabora.com>
Signed-off-by: Nobuhiro Iwamatsu (CIP) <nobuhiro1.iwamatsu(a)toshiba.co.jp>
---
drivers/power/axp288_charger.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/power/axp288_charger.c b/drivers/power/axp288_charger.c
index e4d569f57acc9..0c6fed79c363b 100644
--- a/drivers/power/axp288_charger.c
+++ b/drivers/power/axp288_charger.c
@@ -883,6 +883,10 @@ static int axp288_charger_probe(struct platform_device *pdev)
/* Register charger interrupts */
for (i = 0; i < CHRG_INTR_END; i++) {
pirq = platform_get_irq(info->pdev, i);
+ if (pirq < 0) {
+ dev_err(&pdev->dev, "Failed to get IRQ: %d\n", pirq);
+ return pirq;
+ }
info->irq[i] = regmap_irq_get_virq(info->regmap_irqc, pirq);
if (info->irq[i] < 0) {
dev_warn(&info->pdev->dev,
--
2.26.0