I've backported fixes for several security issues involving filesystem
validation in btrfs. All of these are already fixed in the later
stable branches.
I tested with the reproducers where available. I also checked for
regressions with xfstests and didn't find any (but many tests fail with
or without these changes).
Ben.
--
Ben Hutchings, Software Developer Codethink Ltd
https://www.codethink.co.uk/ Dale House, 35 Dale Street
Manchester, M1 2HF, United Kingdom
We need to handle mmc_of_parse() errors during probe.
This finally fixes the wifi regression on Raspberry Pi 3 series.
In error case the wifi chip was permanently in reset because of
the power sequence depending on the deferred probe of the GPIO expander.
Fixes: b580c52d58d9 ("mmc: sdhci-iproc: add IPROC SDHCI driver")
Cc: stable(a)vger.kernel.org
Signed-off-by: Stefan Wahren <stefan.wahren(a)i2se.com>
---
drivers/mmc/host/sdhci-iproc.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c
index 0db9905..9d12c06 100644
--- a/drivers/mmc/host/sdhci-iproc.c
+++ b/drivers/mmc/host/sdhci-iproc.c
@@ -296,7 +296,10 @@ static int sdhci_iproc_probe(struct platform_device *pdev)
iproc_host->data = iproc_data;
- mmc_of_parse(host->mmc);
+ ret = mmc_of_parse(host->mmc);
+ if (ret)
+ goto err;
+
sdhci_get_property(pdev);
host->mmc->caps |= iproc_host->data->mmc_caps;
--
2.7.4
Now tuning reset will be done when the timing is MMC_TIMING_LEGACY/
MMC_TIMING_MMC_HS/MMC_TIMING_SD_HS. But for timing MMC_TIMING_MMC_HS,
we can not do tuning reset, otherwise HS400 timing is not right.
Here is the process of init HS400, first finish tuning in HS200 mode,
then switch to HS mode and 8 bit DDR mode, finally switch to HS400
mode. If we do tuning reset in HS mode, this will cause HS400 mode
lost the tuning setting, which will cause CRC error.
This fix commit d9370424c948 ("mmc: sdhci-esdhc-imx: reset tuning
circuit when power on mmc card").
Signed-off-by: Haibo Chen <haibo.chen(a)nxp.com>
Cc: stable(a)vger.kernel.org # v4.12+
---
drivers/mmc/host/sdhci-esdhc-imx.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index d0d319398a54..984cc1a788cb 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -979,6 +979,7 @@ static void esdhc_set_uhs_signaling(struct sdhci_host *host, unsigned timing)
case MMC_TIMING_UHS_SDR25:
case MMC_TIMING_UHS_SDR50:
case MMC_TIMING_UHS_SDR104:
+ case MMC_TIMING_MMC_HS:
case MMC_TIMING_MMC_HS200:
writel(m, host->ioaddr + ESDHC_MIX_CTRL);
break;
--
2.17.1
The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
>From 1b3922a8bc74231f9a767d1be6d9a061a4d4eeab Mon Sep 17 00:00:00 2001
From: Qu Wenruo <wqu(a)suse.com>
Date: Tue, 8 Jan 2019 14:08:18 +0800
Subject: [PATCH] btrfs: Use real device structure to verify dev extent
[BUG]
Linux v5.0-rc1 will fail fstests/btrfs/163 with the following kernel
message:
BTRFS error (device dm-6): dev extent devid 1 physical offset 13631488 len 8388608 is beyond device boundary 0
BTRFS error (device dm-6): failed to verify dev extents against chunks: -117
BTRFS error (device dm-6): open_ctree failed
[CAUSE]
Commit cf90d884b347 ("btrfs: Introduce mount time chunk <-> dev extent
mapping check") introduced strict check on dev extents.
We use btrfs_find_device() with dev uuid and fs uuid set to NULL, and
only dependent on @devid to find the real device.
For seed devices, we call clone_fs_devices() in open_seed_devices() to
allow us search seed devices directly.
However clone_fs_devices() just populates devices with devid and dev
uuid, without populating other essential members, like disk_total_bytes.
This makes any device returned by btrfs_find_device(fs_info, devid,
NULL, NULL) is just a dummy, with 0 disk_total_bytes, and any dev
extents on the seed device will not pass the device boundary check.
[FIX]
This patch will try to verify the device returned by btrfs_find_device()
and if it's a dummy then re-search in seed devices.
Fixes: cf90d884b347 ("btrfs: Introduce mount time chunk <-> dev extent mapping check")
CC: stable(a)vger.kernel.org # 4.19+
Reported-by: Filipe Manana <fdmanana(a)suse.com>
Signed-off-by: Qu Wenruo <wqu(a)suse.com>
Signed-off-by: David Sterba <dsterba(a)suse.com>
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 2576b1a379c9..3e4f8f88353e 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -7825,6 +7825,18 @@ static int verify_one_dev_extent(struct btrfs_fs_info *fs_info,
ret = -EUCLEAN;
goto out;
}
+
+ /* It's possible this device is a dummy for seed device */
+ if (dev->disk_total_bytes == 0) {
+ dev = find_device(fs_info->fs_devices->seed, devid, NULL);
+ if (!dev) {
+ btrfs_err(fs_info, "failed to find seed devid %llu",
+ devid);
+ ret = -EUCLEAN;
+ goto out;
+ }
+ }
+
if (physical_offset + physical_len > dev->disk_total_bytes) {
btrfs_err(fs_info,
"dev extent devid %llu physical offset %llu len %llu is beyond device boundary %llu",
Commit e1c3743e1a20 ("powerpc/tm: Set MSR[TS] just prior to recheckpoint")
moved a code block around and this block uses a 'msr' variable outside of
the CONFIG_PPC_TRANSACTIONAL_MEM, however the 'msr' variable is declared
inside a CONFIG_PPC_TRANSACTIONAL_MEM block, causing a possible error when
CONFIG_PPC_TRANSACTION_MEM is not defined.
error: 'msr' undeclared (first use in this function)
This is not causing a compilation error in the mainline kernel, because
'msr' is being used as an argument of MSR_TM_ACTIVE(), which is defined as
the following when CONFIG_PPC_TRANSACTIONAL_MEM is *not* set:
#define MSR_TM_ACTIVE(x) 0
This patch just fixes this issue avoiding the 'msr' variable usage outside
the CONFIG_PPC_TRANSACTIONAL_MEM block, avoiding trusting in the
MSR_TM_ACTIVE() definition.
Cc: stable(a)vger.kernel.org
Reported-by: Christoph Biedl <linux-kernel.bfrz(a)manchmal.in-ulm.de>
Fixes: e1c3743e1a20 ("powerpc/tm: Set MSR[TS] just prior to recheckpoint")
Signed-off-by: Breno Leitao <leitao(a)debian.org>
---
NB: Since stable kernels didn't cherry picked 5c784c8414fba ('powerpc/tm:
Remove msr_tm_active()), MSR_TM_ACTIVE() is not defined as 0 for
CONFIG_PPC_TRANSACTIONAL_MEM=n case, thus triggering the compilation error
above.
Tested against stable kernel 4.19.13-rc2 and problem is now fixed when
CONFIG_PPC_TRANSACTIONAL_MEM=n
arch/powerpc/kernel/signal_64.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
index daa28cb72272..8fe698162ab9 100644
--- a/arch/powerpc/kernel/signal_64.c
+++ b/arch/powerpc/kernel/signal_64.c
@@ -739,11 +739,12 @@ SYSCALL_DEFINE0(rt_sigreturn)
if (restore_tm_sigcontexts(current, &uc->uc_mcontext,
&uc_transact->uc_mcontext))
goto badframe;
- }
+ } else
#endif
- /* Fall through, for non-TM restore */
- if (!MSR_TM_ACTIVE(msr)) {
+ {
/*
+ * Fall through, for non-TM restore
+ *
* Unset MSR[TS] on the thread regs since MSR from user
* context does not have MSR active, and recheckpoint was
* not called since restore_tm_sigcontexts() was not called
--
2.19.0
The patch below does not apply to the 4.20-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
>From 1b3922a8bc74231f9a767d1be6d9a061a4d4eeab Mon Sep 17 00:00:00 2001
From: Qu Wenruo <wqu(a)suse.com>
Date: Tue, 8 Jan 2019 14:08:18 +0800
Subject: [PATCH] btrfs: Use real device structure to verify dev extent
[BUG]
Linux v5.0-rc1 will fail fstests/btrfs/163 with the following kernel
message:
BTRFS error (device dm-6): dev extent devid 1 physical offset 13631488 len 8388608 is beyond device boundary 0
BTRFS error (device dm-6): failed to verify dev extents against chunks: -117
BTRFS error (device dm-6): open_ctree failed
[CAUSE]
Commit cf90d884b347 ("btrfs: Introduce mount time chunk <-> dev extent
mapping check") introduced strict check on dev extents.
We use btrfs_find_device() with dev uuid and fs uuid set to NULL, and
only dependent on @devid to find the real device.
For seed devices, we call clone_fs_devices() in open_seed_devices() to
allow us search seed devices directly.
However clone_fs_devices() just populates devices with devid and dev
uuid, without populating other essential members, like disk_total_bytes.
This makes any device returned by btrfs_find_device(fs_info, devid,
NULL, NULL) is just a dummy, with 0 disk_total_bytes, and any dev
extents on the seed device will not pass the device boundary check.
[FIX]
This patch will try to verify the device returned by btrfs_find_device()
and if it's a dummy then re-search in seed devices.
Fixes: cf90d884b347 ("btrfs: Introduce mount time chunk <-> dev extent mapping check")
CC: stable(a)vger.kernel.org # 4.19+
Reported-by: Filipe Manana <fdmanana(a)suse.com>
Signed-off-by: Qu Wenruo <wqu(a)suse.com>
Signed-off-by: David Sterba <dsterba(a)suse.com>
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 2576b1a379c9..3e4f8f88353e 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -7825,6 +7825,18 @@ static int verify_one_dev_extent(struct btrfs_fs_info *fs_info,
ret = -EUCLEAN;
goto out;
}
+
+ /* It's possible this device is a dummy for seed device */
+ if (dev->disk_total_bytes == 0) {
+ dev = find_device(fs_info->fs_devices->seed, devid, NULL);
+ if (!dev) {
+ btrfs_err(fs_info, "failed to find seed devid %llu",
+ devid);
+ ret = -EUCLEAN;
+ goto out;
+ }
+ }
+
if (physical_offset + physical_len > dev->disk_total_bytes) {
btrfs_err(fs_info,
"dev extent devid %llu physical offset %llu len %llu is beyond device boundary %llu",
This is the start of the stable review cycle for the 4.20.2 release.
There are 65 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 Sun Jan 13 13:10:14 UTC 2019.
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.20.2-rc1…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.20.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.20.2-rc1
Enric Balletbo i Serra <enric.balletbo(a)collabora.com>
drm/rockchip: psr: do not dereference encoder before it is null checked.
Boris Brezillon <boris.brezillon(a)bootlin.com>
drm/vc4: Set ->is_yuv to false when num_planes == 1
Lyude Paul <lyude(a)redhat.com>
drm/nouveau/drm/nouveau: Check rc from drm_dp_mst_topology_mgr_resume()
Christophe Leroy <christophe.leroy(a)c-s.fr>
lib: fix build failure in CONFIG_DEBUG_VIRTUAL test
Frank Rowand <frank.rowand(a)sony.com>
of: __of_detach_node() - remove node from phandle cache
Frank Rowand <frank.rowand(a)sony.com>
of: of_node_get()/of_node_put() nodes held in phandle cache
Lubomir Rintel <lkundrak(a)v3.sk>
power: supply: olpc_battery: correct the temperature units
Alexander Shishkin <alexander.shishkin(a)linux.intel.com>
intel_th: msu: Fix an off-by-one in attribute store
Christian Borntraeger <borntraeger(a)de.ibm.com>
genwqe: Fix size check
Shuah Khan <shuah(a)kernel.org>
selftests: Fix test errors related to lib.mk khdr target
Christian Lamparter <chunkeey(a)gmail.com>
powerpc/4xx/ocm: Fix compilation error due to PAGE_KERNEL usage
Shaokun Zhang <zhangshaokun(a)hisilicon.com>
drivers/perf: hisi: Fixup one DDRC PMU register offset
YueHaibing <yuehaibing(a)huawei.com>
video: fbdev: pxafb: Fix "WARNING: invalid free of devm_ allocated data"
Yan, Zheng <zyan(a)redhat.com>
ceph: don't update importing cap's mseq when handing cap export
Linus Torvalds <torvalds(a)linux-foundation.org>
sched/fair: Fix infinite loop in update_blocked_averages() by reverting a9e7f6544b9c
Sohil Mehta <sohil.mehta(a)intel.com>
iommu/vt-d: Handle domain agaw being less than iommu agaw
Steve Wise <swise(a)opengridcomputing.com>
RDMA/iwcm: Don't copy past the end of dev_name() string
Bart Van Assche <bvanassche(a)acm.org>
RDMA/srpt: Fix a use-after-free in the channel release code
Alexander Shishkin <alexander.shishkin(a)linux.intel.com>
stm class: Fix a module refcount leak in policy creation error path
Sagi Grimberg <sagi(a)grimberg.me>
rxe: fix error completion wr_id and qp_num
Dominique Martinet <dominique.martinet(a)cea.fr>
9p/net: put a lower bound on msize
Mircea Caprioru <mircea.caprioru(a)analog.com>
iio: dac: ad5686: fix bit shift read register
Evan Green <evgreen(a)chromium.org>
iio: adc: qcom-spmi-adc5: Initialize prescale properly
Breno Leitao <leitao(a)debian.org>
powerpc/tm: Set MSR[TS] just prior to recheckpoint
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Revert "powerpc/tm: Unset MSR[TS] if not recheckpointing"
J. Bruce Fields <bfields(a)redhat.com>
nfsd4: zero-length WRITE should succeed
Chuck Lever <chuck.lever(a)oracle.com>
xprtrdma: Yet another double DMA-unmap
Benjamin Coddington <bcodding(a)redhat.com>
lockd: Show pid of lockd for remote locks
Jarkko Nikula <jarkko.nikula(a)linux.intel.com>
PCI / PM: Allow runtime PM without callback functions
Ondrej Mosnacek <omosnace(a)redhat.com>
selinux: policydb - fix byte order and alignment issues
Larry Finger <Larry.Finger(a)lwfinger.net>
b43: Fix error in cordic routine
Andreas Gruenbacher <agruenba(a)redhat.com>
gfs2: Fix loop in gfs2_rbm_find
Andreas Gruenbacher <agruenba(a)redhat.com>
gfs2: Get rid of potential double-freeing in gfs2_create_inode
Vasily Averin <vvs(a)virtuozzo.com>
dlm: memory leaks on error path in dlm_user_request()
Vasily Averin <vvs(a)virtuozzo.com>
dlm: lost put_lkb on error path in receive_convert() and receive_unlock()
Vasily Averin <vvs(a)virtuozzo.com>
dlm: possible memory leak on error path in create_lkb()
Vasily Averin <vvs(a)virtuozzo.com>
dlm: fixed memory leaks after failed ls_remove_names allocation
Jaegeuk Kim <jaegeuk(a)kernel.org>
dm: do not allow readahead to limit IO size
Damien Le Moal <damien.lemoal(a)wdc.com>
block: mq-deadline: Fix write completion handling
Ming Lei <ming.lei(a)redhat.com>
block: deactivate blk_stat timer in wbt_disable_default()
Matthew Wilcox <willy(a)infradead.org>
Fix failure path in alloc_pid()
Rafael J. Wysocki <rafael.j.wysocki(a)intel.com>
driver core: Add missing dev->bus->need_parent_lock checks
Dennis Krein <Dennis.Krein(a)netapp.com>
srcu: Lock srcu_data structure in srcu_gp_start()
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Always check descriptor sizes in parser code
Hui Peng <benquike(a)163.com>
ALSA: usb-audio: Fix an out-of-bound read in create_composite_quirks
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Check mixer unit descriptors more strictly
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Avoid access before bLength check in build_audio_procunit()
Dan Carpenter <dan.carpenter(a)oracle.com>
ALSA: cs46xx: Potential NULL dereference in probe
Brad Love <brad(a)nextdimension.cc>
media: cx23885: only reset DMA on problematic CPUs
Huang Ying <ying.huang(a)intel.com>
mm, swap: fix swapoff with KSM pages
Dan Williams <dan.j.williams(a)intel.com>
mm, hmm: mark hmm_devmem_{add, add_resource} EXPORT_SYMBOL_GPL
Dan Williams <dan.j.williams(a)intel.com>
mm, hmm: replace hmm_devmem_pages_create() with devm_memremap_pages()
Dan Williams <dan.j.williams(a)intel.com>
mm, hmm: use devm semantics for hmm_devmem_{add, remove}
Dan Williams <dan.j.williams(a)intel.com>
mm, devm_memremap_pages: add MEMORY_DEVICE_PRIVATE support
Vasily Averin <vvs(a)virtuozzo.com>
sunrpc: use SVC_NET() in svcauth_gss_* functions
Vasily Averin <vvs(a)virtuozzo.com>
sunrpc: fix cache_head leak due to queued request
Michal Hocko <mhocko(a)suse.com>
memcg, oom: notify on oom killer invocation from the charge path
Dan Williams <dan.j.williams(a)intel.com>
mm, devm_memremap_pages: fix shutdown handling
Dan Williams <dan.j.williams(a)intel.com>
mm, devm_memremap_pages: kill mapping "System RAM" support
Dan Williams <dan.j.williams(a)intel.com>
mm, devm_memremap_pages: mark devm_memremap_pages() EXPORT_SYMBOL_GPL
Michal Hocko <mhocko(a)suse.com>
hwpoison, memory_hotplug: allow hwpoisoned pages to be offlined
Minchan Kim <minchan(a)kernel.org>
zram: fix double free backing device
David Herrmann <dh.herrmann(a)gmail.com>
fork: record start_time late
Ewan D. Milne <emilne(a)redhat.com>
scsi: lpfc: do not set queue->page_count to 0 if pc_sli4_params.wqpcnt is invalid
Steffen Maier <maier(a)linux.ibm.com>
scsi: zfcp: fix posting too many status read buffers leading to adapter shutdown
-------------
Diffstat:
Makefile | 4 +-
arch/powerpc/kernel/signal_32.c | 38 ++-
arch/powerpc/kernel/signal_64.c | 64 +++--
arch/powerpc/platforms/4xx/ocm.c | 4 +-
block/blk-mq-sched.c | 3 +-
block/blk-mq-sched.h | 1 +
block/blk-stat.h | 5 +
block/blk-wbt.c | 4 +-
block/mq-deadline.c | 12 +-
drivers/base/dd.c | 4 +-
drivers/block/zram/zram_drv.c | 4 +-
drivers/dax/pmem.c | 14 +-
drivers/gpu/drm/nouveau/dispnv50/disp.c | 12 +-
drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 4 +-
drivers/gpu/drm/vc4/vc4_plane.c | 1 +
drivers/hwtracing/intel_th/msu.c | 3 +-
drivers/hwtracing/stm/policy.c | 12 +-
drivers/iio/adc/qcom-spmi-adc5.c | 58 ++--
drivers/iio/dac/ad5686.c | 3 +-
drivers/infiniband/core/iwcm.c | 12 +-
drivers/infiniband/sw/rxe/rxe_resp.c | 13 +-
drivers/infiniband/ulp/srpt/ib_srpt.c | 18 +-
drivers/iommu/intel-iommu.c | 4 +-
drivers/md/dm-table.c | 3 +
drivers/media/pci/cx23885/cx23885-core.c | 55 +++-
drivers/media/pci/cx23885/cx23885.h | 2 +
drivers/misc/genwqe/card_utils.c | 2 +-
drivers/net/wireless/broadcom/b43/phy_common.c | 2 +-
drivers/nvdimm/pmem.c | 13 +-
drivers/of/base.c | 101 +++++--
drivers/of/dynamic.c | 3 +
drivers/of/of_private.h | 4 +
drivers/pci/p2pdma.c | 10 +-
drivers/pci/pci-driver.c | 27 +-
drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 4 +-
drivers/power/supply/olpc_battery.c | 4 +-
drivers/s390/scsi/zfcp_aux.c | 6 +-
drivers/scsi/lpfc/lpfc_sli.c | 3 +-
drivers/video/fbdev/pxafb.c | 4 +-
fs/ceph/caps.c | 1 -
fs/dlm/lock.c | 17 +-
fs/dlm/lockspace.c | 2 +-
fs/gfs2/inode.c | 18 +-
fs/gfs2/rgrp.c | 2 +-
fs/lockd/clntproc.c | 2 +-
fs/lockd/xdr.c | 4 +-
fs/lockd/xdr4.c | 4 +-
fs/nfsd/nfs4proc.c | 2 -
include/linux/hmm.h | 4 +-
include/linux/memremap.h | 2 +
kernel/fork.c | 13 +-
kernel/memremap.c | 94 ++++---
kernel/pid.c | 6 +-
kernel/rcu/srcutree.c | 2 +
kernel/sched/fair.c | 43 +--
lib/test_debug_virtual.c | 1 +
mm/hmm.c | 305 +++------------------
mm/memcontrol.c | 20 +-
mm/memory_hotplug.c | 16 ++
mm/swapfile.c | 3 +-
net/9p/client.c | 21 ++
net/sunrpc/auth_gss/svcauth_gss.c | 8 +-
net/sunrpc/cache.c | 10 +-
net/sunrpc/xprtrdma/frwr_ops.c | 6 +-
net/sunrpc/xprtrdma/verbs.c | 9 +-
security/selinux/ss/policydb.c | 51 +++-
sound/pci/cs46xx/dsp_spos.c | 3 +
sound/usb/card.c | 2 +-
sound/usb/mixer.c | 29 +-
sound/usb/quirks-table.h | 6 +
sound/usb/stream.c | 36 ++-
tools/testing/nvdimm/test/iomap.c | 17 +-
tools/testing/selftests/android/Makefile | 2 +-
tools/testing/selftests/futex/functional/Makefile | 1 +
tools/testing/selftests/gpio/Makefile | 6 +-
tools/testing/selftests/kvm/Makefile | 2 +-
tools/testing/selftests/lib.mk | 8 +-
.../selftests/networking/timestamping/Makefile | 1 +
tools/testing/selftests/tc-testing/bpf/Makefile | 1 +
tools/testing/selftests/vm/Makefile | 1 +
80 files changed, 710 insertions(+), 611 deletions(-)
This is a note to let you know that I've just added the patch titled
mei: me: add denverton innovation engine device IDs
to my char-misc git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
in the char-misc-linus branch.
The patch will show up in the next release of the linux-next tree
(usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the
next -rc kernel release.
If you have any questions about this process, please let me know.
>From f7ee8ead151f9d0b8dac6ab6c3ff49bbe809c564 Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler(a)intel.com>
Date: Sun, 13 Jan 2019 14:24:48 +0200
Subject: mei: me: add denverton innovation engine device IDs
Add the Denverton innovation engine (IE) device ids.
The IE is an ME-like device which provides HW security
offloading.
Cc: <stable(a)vger.kernel.org>
Signed-off-by: Tomas Winkler <tomas.winkler(a)intel.com>
Signed-off-by: Alexander Usyskin <alexander.usyskin(a)intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
---
drivers/misc/mei/hw-me-regs.h | 2 ++
drivers/misc/mei/pci-me.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
index e4b10b2d1a08..23739a60517f 100644
--- a/drivers/misc/mei/hw-me-regs.h
+++ b/drivers/misc/mei/hw-me-regs.h
@@ -127,6 +127,8 @@
#define MEI_DEV_ID_BXT_M 0x1A9A /* Broxton M */
#define MEI_DEV_ID_APL_I 0x5A9A /* Apollo Lake I */
+#define MEI_DEV_ID_DNV_IE 0x19E5 /* Denverton IE */
+
#define MEI_DEV_ID_GLK 0x319A /* Gemini Lake */
#define MEI_DEV_ID_KBP 0xA2BA /* Kaby Point */
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index c2bf3e99955e..e89497f858ae 100644
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -93,6 +93,8 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
{MEI_PCI_DEVICE(MEI_DEV_ID_BXT_M, MEI_ME_PCH8_CFG)},
{MEI_PCI_DEVICE(MEI_DEV_ID_APL_I, MEI_ME_PCH8_CFG)},
+ {MEI_PCI_DEVICE(MEI_DEV_ID_DNV_IE, MEI_ME_PCH8_CFG)},
+
{MEI_PCI_DEVICE(MEI_DEV_ID_GLK, MEI_ME_PCH8_CFG)},
{MEI_PCI_DEVICE(MEI_DEV_ID_KBP, MEI_ME_PCH8_CFG)},
--
2.20.1
This is a note to let you know that I've just added the patch titled
mei: me: mark LBG devices as having dma support
to my char-misc git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
in the char-misc-linus branch.
The patch will show up in the next release of the linux-next tree
(usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the
next -rc kernel release.
If you have any questions about this process, please let me know.
>From 173436ba800d01178a8b19e5de4a8cb02c0db760 Mon Sep 17 00:00:00 2001
From: Alexander Usyskin <alexander.usyskin(a)intel.com>
Date: Sun, 13 Jan 2019 14:24:47 +0200
Subject: mei: me: mark LBG devices as having dma support
The LBG server platform sports DMA support.
Cc: <stable(a)vger.kernel.org> #v5.0+
Signed-off-by: Alexander Usyskin <alexander.usyskin(a)intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler(a)intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
---
drivers/misc/mei/pci-me.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index 73ace2d59dea..c2bf3e99955e 100644
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -88,7 +88,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_2, MEI_ME_PCH8_CFG)},
{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H, MEI_ME_PCH8_SPS_CFG)},
{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H_2, MEI_ME_PCH8_SPS_CFG)},
- {MEI_PCI_DEVICE(MEI_DEV_ID_LBG, MEI_ME_PCH8_CFG)},
+ {MEI_PCI_DEVICE(MEI_DEV_ID_LBG, MEI_ME_PCH12_CFG)},
{MEI_PCI_DEVICE(MEI_DEV_ID_BXT_M, MEI_ME_PCH8_CFG)},
{MEI_PCI_DEVICE(MEI_DEV_ID_APL_I, MEI_ME_PCH8_CFG)},
--
2.20.1
This is a note to let you know that I've just added the patch titled
mei: dma: silent the reject message
to my char-misc git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
in the char-misc-linus branch.
The patch will show up in the next release of the linux-next tree
(usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the
next -rc kernel release.
If you have any questions about this process, please let me know.
>From 82e59cbe5fdc0d521f9037861af21af6d5814afd Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler(a)intel.com>
Date: Sun, 13 Jan 2019 14:24:46 +0200
Subject: mei: dma: silent the reject message
Not all FW versions support DMA on their first release,
hence it is normal behavior to receive a reject response
upon DMA setup request.
In order to prevent confusion, the DMA setup reject message
is printed only in debug level.
Cc: <stable(a)vger.kernel.org> #v5.0+
Signed-off-by: Tomas Winkler <tomas.winkler(a)intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
---
drivers/misc/mei/hbm.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/misc/mei/hbm.c b/drivers/misc/mei/hbm.c
index 78c26cebf5d4..8f7616557c97 100644
--- a/drivers/misc/mei/hbm.c
+++ b/drivers/misc/mei/hbm.c
@@ -1187,9 +1187,15 @@ int mei_hbm_dispatch(struct mei_device *dev, struct mei_msg_hdr *hdr)
dma_setup_res = (struct hbm_dma_setup_response *)mei_msg;
if (dma_setup_res->status) {
- dev_info(dev->dev, "hbm: dma setup response: failure = %d %s\n",
- dma_setup_res->status,
- mei_hbm_status_str(dma_setup_res->status));
+ u8 status = dma_setup_res->status;
+
+ if (status == MEI_HBMS_NOT_ALLOWED) {
+ dev_dbg(dev->dev, "hbm: dma setup not allowed\n");
+ } else {
+ dev_info(dev->dev, "hbm: dma setup response: failure = %d %s\n",
+ status,
+ mei_hbm_status_str(status));
+ }
dev->hbm_f_dr_supported = 0;
mei_dmam_ring_free(dev);
}
--
2.20.1
Kyungtae Kim detected a potential integer overflow in bcm_[rx|tx]_setup() when
the conversion into ktime multiplies the given value with NSEC_PER_USEC (1000).
Reference: https://marc.info/?l=linux-can&m=154732118819828&w=2
Add a check for the given tv_usec, so that the value stays below one second.
Additionally limit the tv_sec value to a reasonable value for CAN related
use-cases of 15 minutes.
Reported-by: Kyungtae Kim <kt0755(a)gmail.com>
Tested-by: Oliver Hartkopp <socketcan(a)hartkopp.net>
Signed-off-by: Oliver Hartkopp <socketcan(a)hartkopp.net>
Cc: linux-stable <stable(a)vger.kernel.org> # >= 2.6.26
---
net/can/bcm.c | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/net/can/bcm.c b/net/can/bcm.c
index 0af8f0db892a..ff3799be077b 100644
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -67,6 +67,9 @@
*/
#define MAX_NFRAMES 256
+/* limit timers to 15 minutes for sending/timeouts */
+#define BCM_TIMER_SEC_MAX (15*60)
+
/* use of last_frames[index].flags */
#define RX_RECV 0x40 /* received data for this element */
#define RX_THR 0x80 /* element not been sent due to throttle feature */
@@ -140,6 +143,18 @@ static inline ktime_t bcm_timeval_to_ktime(struct bcm_timeval tv)
return ktime_set(tv.tv_sec, tv.tv_usec * NSEC_PER_USEC);
}
+/* check limitations for timeval provided by user */
+static int bcm_is_invalid_tv(struct bcm_msg_head *msg_head)
+{
+ if ((msg_head->ival1.tv_sec > BCM_TIMER_SEC_MAX) ||
+ (msg_head->ival1.tv_usec >= USEC_PER_SEC) ||
+ (msg_head->ival2.tv_sec > BCM_TIMER_SEC_MAX) ||
+ (msg_head->ival2.tv_usec >= USEC_PER_SEC))
+ return 1;
+
+ return 0;
+}
+
#define CFSIZ(flags) ((flags & CAN_FD_FRAME) ? CANFD_MTU : CAN_MTU)
#define OPSIZ sizeof(struct bcm_op)
#define MHSIZ sizeof(struct bcm_msg_head)
@@ -873,6 +888,10 @@ static int bcm_tx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,
if (msg_head->nframes < 1 || msg_head->nframes > MAX_NFRAMES)
return -EINVAL;
+ /* check timeval limitations */
+ if ((msg_head->flags & SETTIMER) && bcm_is_invalid_tv(msg_head))
+ return -EINVAL;
+
/* check the given can_id */
op = bcm_find_op(&bo->tx_ops, msg_head, ifindex);
if (op) {
@@ -1053,6 +1072,10 @@ static int bcm_rx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,
(!(msg_head->can_id & CAN_RTR_FLAG))))
return -EINVAL;
+ /* check timeval limitations */
+ if ((msg_head->flags & SETTIMER) && bcm_is_invalid_tv(msg_head))
+ return -EINVAL;
+
/* check the given can_id */
op = bcm_find_op(&bo->rx_ops, msg_head, ifindex);
if (op) {
--
2.20.1
I'm announcing the release of the 4.9.150 kernel.
All users of the 4.9 kernel series must upgrade.
The updated 4.9.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.9.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2
arch/arm/boot/dts/imx7d-nitrogen7.dts | 9
arch/arm/mach-imx/cpuidle-imx6sx.c | 2
arch/mips/kernel/vdso.c | 4
arch/mips/math-emu/dsemul.c | 38 +-
arch/powerpc/boot/crt0.S | 4
arch/powerpc/kernel/signal_32.c | 20 +
arch/powerpc/kernel/signal_64.c | 44 ++-
arch/x86/crypto/chacha20_glue.c | 1
drivers/gpu/drm/vc4/vc4_plane.c | 1
drivers/hwtracing/intel_th/msu.c | 3
drivers/infiniband/hw/hfi1/verbs.c | 2
drivers/infiniband/sw/rxe/rxe_resp.c | 13 -
drivers/input/keyboard/omap4-keypad.c | 16 -
drivers/iommu/intel-iommu.c | 4
drivers/misc/genwqe/card_utils.c | 2
drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 3
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 1
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 54 +++-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 4
drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 3
drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 14 -
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 15 +
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 246 +++++++++----------
drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 13 -
drivers/net/ethernet/hisilicon/hns/hns_enet.c | 43 +++
drivers/net/ethernet/neterion/vxge/vxge-config.c | 2
drivers/net/ethernet/nuvoton/w90p910_ether.c | 2
drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | 3
drivers/net/usb/lan78xx.c | 4
drivers/net/wireless/broadcom/b43/phy_common.c | 2
drivers/pinctrl/meson/pinctrl-meson.c | 3
drivers/power/supply/olpc_battery.c | 4
drivers/s390/scsi/zfcp_aux.c | 6
drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2
drivers/target/iscsi/cxgbit/cxgbit_cm.c | 5
drivers/target/iscsi/cxgbit/cxgbit_main.c | 1
drivers/tty/serial/sunsu.c | 31 ++
drivers/vhost/vsock.c | 2
fs/ceph/caps.c | 1
fs/dlm/lock.c | 17 -
fs/dlm/lockspace.c | 2
fs/gfs2/inode.c | 18 -
fs/gfs2/rgrp.c | 2
include/uapi/linux/input-event-codes.h | 9
kernel/fork.c | 13 -
kernel/memremap.c | 11
mm/memory_hotplug.c | 16 +
net/9p/client.c | 21 +
net/ceph/auth_x.c | 2
net/netfilter/ipset/ip_set_list_set.c | 2
net/netfilter/nf_conntrack_seqadj.c | 7
net/sunrpc/auth_gss/svcauth_gss.c | 8
net/sunrpc/cache.c | 10
net/sunrpc/xprtsock.c | 4
net/xfrm/xfrm_state.c | 2
scripts/checkstack.pl | 4
sound/pci/cs46xx/dsp_spos.c | 3
sound/usb/mixer.c | 10
sound/usb/quirks-table.h | 3
tools/testing/nvdimm/test/iomap.c | 2
61 files changed, 522 insertions(+), 273 deletions(-)
Alexander Shishkin (1):
intel_th: msu: Fix an off-by-one in attribute store
Andreas Gruenbacher (2):
gfs2: Get rid of potential double-freeing in gfs2_create_inode
gfs2: Fix loop in gfs2_rbm_find
Anson Huang (1):
ARM: imx: update the cpu power up timing setting on i.mx6sx
Arnd Bergmann (1):
w90p910_ether: remove incorrect __init annotation
Benjamin Poirier (1):
xfrm: Fix bucket count reported to userspace
Boris Brezillon (1):
drm/vc4: Set ->is_yuv to false when num_planes == 1
Breno Leitao (1):
powerpc/tm: Set MSR[TS] just prior to recheckpoint
Christian Borntraeger (1):
genwqe: Fix size check
Colin Ian King (1):
vxge: ensure data0 is initialized in when fetching firmware version information
Dan Carpenter (2):
scsi: bnx2fc: Fix NULL dereference in error handling
ALSA: cs46xx: Potential NULL dereference in probe
Dan Williams (2):
mm, devm_memremap_pages: mark devm_memremap_pages() EXPORT_SYMBOL_GPL
mm, devm_memremap_pages: kill mapping "System RAM" support
David Herrmann (1):
fork: record start_time late
Dominique Martinet (1):
9p/net: put a lower bound on msize
Eric Biggers (1):
crypto: x86/chacha20 - avoid sleeping with preemption disabled
Fabio Estevam (1):
ARM: dts: imx7d-nitrogen7: Fix the description of the Wifi clock
Florian Westphal (1):
netfilter: seqadj: re-load tcp header pointer after possible head reallocation
Greg Kroah-Hartman (1):
Linux 4.9.150
Hui Peng (1):
ALSA: usb-audio: Fix an out-of-bound read in create_composite_quirks
Ilya Dryomov (1):
libceph: fix CEPH_FEATURE_CEPHX_V2 check in calc_signature()
Ivan Mironov (1):
bnx2x: Fix NULL pointer dereference in bnx2x_del_all_vlans() on some hw
Jason Martinsen (1):
lan78xx: Resolve issue with changing MAC address
Jerome Brunet (1):
pinctrl: meson: fix pull enable register calculation
Kangjie Lu (1):
net: netxen: fix a missing check and an uninitialized use
Larry Finger (1):
b43: Fix error in cordic routine
Lubomir Rintel (1):
power: supply: olpc_battery: correct the temperature units
Michael J. Ruhl (1):
IB/hfi1: Incorrect sizing of sge for PIO will OOPs
Michal Hocko (1):
hwpoison, memory_hotplug: allow hwpoisoned pages to be offlined
Nathan Chancellor (1):
drivers: net: xgene: Remove unnecessary forward declarations
Pan Bian (1):
netfilter: ipset: do not call ipset_nest_end after nla_nest_cancel
Paul Burton (1):
MIPS: math-emu: Write-protect delay slot emulation pages
Paul Mackerras (1):
powerpc: Fix COFF zImage booting on old powermacs
Peter Hutterer (1):
Input: restore EV_ABS ABS_RESERVED
Qian Cai (1):
checkstack.pl: fix for aarch64
Sagi Grimberg (1):
rxe: fix error completion wr_id and qp_num
Sohil Mehta (1):
iommu/vt-d: Handle domain agaw being less than iommu agaw
Stefan Hajnoczi (1):
vhost/vsock: fix uninitialized vhost_vsock->guest_cid
Steffen Maier (1):
scsi: zfcp: fix posting too many status read buffers leading to adapter shutdown
Sudarsana Reddy Kalluru (3):
bnx2x: Clear fip MAC when fcoe offload support is disabled
bnx2x: Remove configured vlans as part of unload sequence.
bnx2x: Send update-svid ramrod with retry/poll flags enabled
Takashi Iwai (1):
ALSA: usb-audio: Avoid access before bLength check in build_audio_procunit()
Tony Lindgren (1):
Input: omap-keypad - fix idle configuration to not block SoC idle states
Trond Myklebust (1):
SUNRPC: Fix a race with XPRT_CONNECTING
Varun Prakash (2):
scsi: target: iscsi: cxgbit: fix csk leak
scsi: target: iscsi: cxgbit: add missing spin_lock_init()
Vasily Averin (6):
sunrpc: fix cache_head leak due to queued request
sunrpc: use SVC_NET() in svcauth_gss_* functions
dlm: fixed memory leaks after failed ls_remove_names allocation
dlm: possible memory leak on error path in create_lkb()
dlm: lost put_lkb on error path in receive_convert() and receive_unlock()
dlm: memory leaks on error path in dlm_user_request()
Yan, Zheng (1):
ceph: don't update importing cap's mseq when handing cap export
Yangtao Li (1):
serial/sunsu: fix refcount leak
Yonglong Liu (9):
net: hns: Incorrect offset address used for some registers.
net: hns: All ports can not work when insmod hns ko after rmmod.
net: hns: Some registers use wrong address according to the datasheet.
net: hns: Fixed bug that netdev was opened twice
net: hns: Clean rx fbd when ae stopped.
net: hns: Free irq when exit from abnormal branch
net: hns: Avoid net reset caused by pause frames storm
net: hns: Fix ntuple-filters status error.
net: hns: Add mac pcs config when enable|disable mac
I'm announcing the release of the 3.18.132 kernel.
All users of the 3.18 kernel series must upgrade.
The updated 3.18.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.18.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2
arch/mips/boot/compressed/calc_vmlinuz_load_addr.c | 7 +-
arch/mips/include/asm/pgtable-64.h | 5 +
arch/x86/include/asm/kvm_host.h | 2
arch/x86/kernel/cpu/mtrr/if.c | 2
drivers/gpio/gpio-max7301.c | 12 ---
drivers/hv/vmbus_drv.c | 20 ++++++
drivers/isdn/capi/kcapi.c | 4 -
drivers/media/platform/vivid/vivid-vid-cap.c | 2
drivers/misc/genwqe/card_utils.c | 2
drivers/mmc/core/mmc.c | 4 -
drivers/mmc/host/omap_hsmmc.c | 12 +++
drivers/net/ethernet/ibm/ibmveth.c | 6 +
drivers/net/usb/hso.c | 18 +++++
drivers/net/wireless/b43/phy_common.c | 2
drivers/net/xen-netfront.c | 2
drivers/power/olpc_battery.c | 4 -
drivers/s390/scsi/zfcp_aux.c | 6 -
drivers/usb/class/cdc-acm.c | 10 +++
drivers/usb/class/cdc-acm.h | 1
drivers/usb/host/r8a66597-hcd.c | 5 +
drivers/usb/serial/option.c | 7 +-
drivers/usb/serial/pl2303.c | 5 +
drivers/usb/serial/pl2303.h | 5 +
drivers/vhost/vhost.c | 2
fs/ceph/caps.c | 1
fs/cifs/smb2maperror.c | 4 -
fs/dlm/lock.c | 17 +++--
fs/dlm/lockspace.c | 2
fs/ext4/inline.c | 5 +
fs/ext4/super.c | 13 +++-
fs/gfs2/rgrp.c | 2
include/net/sock.h | 36 ++++++++++-
include/trace/events/ext4.h | 20 ++++++
kernel/fork.c | 13 +++-
net/9p/client.c | 21 ++++++
net/ax25/af_ax25.c | 11 ++-
net/ax25/ax25_dev.c | 2
net/compat.c | 15 ++--
net/core/sock.c | 3
net/ipv6/ip6_udp_tunnel.c | 3
net/netrom/af_netrom.c | 15 +++-
net/packet/af_packet.c | 8 +-
net/sctp/ipv6.c | 1
net/sunrpc/auth_gss/svcauth_gss.c | 8 +-
net/sunrpc/cache.c | 9 ++
net/sunrpc/svcsock.c | 2
net/vmw_vsock/vmci_transport.c | 67 +++++++++++++++------
sound/pci/cs46xx/dsp_spos.c | 3
sound/usb/mixer.c | 10 ++-
sound/usb/quirks-table.h | 3
51 files changed, 351 insertions(+), 90 deletions(-)
Andreas Gruenbacher (1):
gfs2: Fix loop in gfs2_rbm_find
Christian Borntraeger (1):
genwqe: Fix size check
Christophe Leroy (1):
gpio: max7301: fix driver for use with CONFIG_VMAP_STACK
Colin Ian King (1):
x86/mtrr: Don't copy uninitialized gentry fields back to userspace
Cong Wang (3):
ax25: fix a use-after-free in ax25_fillin_cb()
ipv6: explicitly initialize udp6_addr in udp_sock_create6()
netrom: fix locking in nr_find_socket()
Dan Carpenter (1):
ALSA: cs46xx: Potential NULL dereference in probe
David Herrmann (1):
fork: record start_time late
Deepa Dinamani (1):
sock: Make sock->sk_stamp thread-safe
Dexuan Cui (1):
Drivers: hv: vmbus: Return -EINVAL for the sys files for unopened channels
Dominique Martinet (1):
9p/net: put a lower bound on msize
Eric Dumazet (1):
isdn: fix kernel-infoleak in capi_unlocked_ioctl
Georgy A Bystrenin (1):
CIFS: Fix error mapping for SMB2_LOCK command which caused OFD lock problem
Greg Kroah-Hartman (1):
Linux 3.18.132
Hans Verkuil (1):
media: vivid: free bitmap_cap when updating std/timings/etc.
Huacai Chen (2):
MIPS: Ensure pmd_present() returns false after pmd_mknotpresent()
MIPS: Align kernel load address to 64KB
Hui Peng (2):
USB: hso: Fix OOB memory access in hso_probe/hso_get_config_data
ALSA: usb-audio: Fix an out-of-bound read in create_composite_quirks
Jason Wang (1):
vhost: make sure used idx is seen before log in vhost_add_used_n()
Jia-Ju Bai (1):
usb: r8a66597: Fix a possible concurrency use-after-free bug in r8a66597_endpoint_disable()
Jorgen Hansen (1):
VSOCK: Send reset control packet when socket is partially bound
Juergen Gross (1):
xen/netfront: tolerate frags with no data
Larry Finger (1):
b43: Fix error in cordic routine
Lubomir Rintel (1):
power: supply: olpc_battery: correct the temperature units
Macpaul Lin (1):
cdc-acm: fix abnormal DATA RX issue for Mediatek Preloader.
Maurizio Lombardi (1):
ext4: missing unlock/put_page() in ext4_try_to_write_inline_data()
Pan Bian (1):
ext4: fix possible use after free in ext4_quota_enable
Russell King (1):
mmc: omap_hsmmc: fix DMA API warning
Scott Chen (1):
USB: serial: pl2303: add ids for Hewlett-Packard HP POS pole displays
Sean Christopherson (1):
KVM: x86: Use jmp to invoke kvm_spurious_fault() from .fixup
Steffen Maier (1):
scsi: zfcp: fix posting too many status read buffers leading to adapter shutdown
Takashi Iwai (1):
ALSA: usb-audio: Avoid access before bLength check in build_audio_procunit()
Theodore Ts'o (1):
ext4: force inode writes when nfsd calls commit_metadata()
Tore Anderson (1):
USB: serial: option: add HP lt4132
Tyrel Datwyler (1):
ibmveth: fix DMA unmap error in ibmveth_xmit_start error path
Ulf Hansson (1):
mmc: core: Reset HPI enabled state during re-init and in case of errors
Vasily Averin (6):
sunrpc: fix cache_head leak due to queued request
sunrpc: use SVC_NET() in svcauth_gss_* functions
dlm: fixed memory leaks after failed ls_remove_names allocation
dlm: possible memory leak on error path in create_lkb()
dlm: lost put_lkb on error path in receive_convert() and receive_unlock()
dlm: memory leaks on error path in dlm_user_request()
Willem de Bruijn (2):
packet: validate address length
packet: validate address length if non-zero
Xin Long (1):
sctp: initialize sin6_flowinfo for ipv6 addrs in sctp_inet6addr_event
Yan, Zheng (1):
ceph: don't update importing cap's mseq when handing cap export
This is the start of the stable review cycle for the 3.18.132 release.
There are 47 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 Sun Jan 13 13:09:31 UTC 2019.
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/v3.x/stable-review/patch-3.18.132-r…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-3.18.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 3.18.132-rc1
Lubomir Rintel <lkundrak(a)v3.sk>
power: supply: olpc_battery: correct the temperature units
Christian Borntraeger <borntraeger(a)de.ibm.com>
genwqe: Fix size check
Yan, Zheng <zyan(a)redhat.com>
ceph: don't update importing cap's mseq when handing cap export
Dominique Martinet <dominique.martinet(a)cea.fr>
9p/net: put a lower bound on msize
Larry Finger <Larry.Finger(a)lwfinger.net>
b43: Fix error in cordic routine
Andreas Gruenbacher <agruenba(a)redhat.com>
gfs2: Fix loop in gfs2_rbm_find
Vasily Averin <vvs(a)virtuozzo.com>
dlm: memory leaks on error path in dlm_user_request()
Vasily Averin <vvs(a)virtuozzo.com>
dlm: lost put_lkb on error path in receive_convert() and receive_unlock()
Vasily Averin <vvs(a)virtuozzo.com>
dlm: possible memory leak on error path in create_lkb()
Vasily Averin <vvs(a)virtuozzo.com>
dlm: fixed memory leaks after failed ls_remove_names allocation
Hui Peng <benquike(a)163.com>
ALSA: usb-audio: Fix an out-of-bound read in create_composite_quirks
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Avoid access before bLength check in build_audio_procunit()
Dan Carpenter <dan.carpenter(a)oracle.com>
ALSA: cs46xx: Potential NULL dereference in probe
Vasily Averin <vvs(a)virtuozzo.com>
sunrpc: use SVC_NET() in svcauth_gss_* functions
Vasily Averin <vvs(a)virtuozzo.com>
sunrpc: fix cache_head leak due to queued request
David Herrmann <dh.herrmann(a)gmail.com>
fork: record start_time late
Steffen Maier <maier(a)linux.ibm.com>
scsi: zfcp: fix posting too many status read buffers leading to adapter shutdown
Georgy A Bystrenin <gkot(a)altlinux.org>
CIFS: Fix error mapping for SMB2_LOCK command which caused OFD lock problem
Huacai Chen <chenhc(a)lemote.com>
MIPS: Align kernel load address to 64KB
Huacai Chen <chenhc(a)lemote.com>
MIPS: Ensure pmd_present() returns false after pmd_mknotpresent()
Hans Verkuil <hverkuil-cisco(a)xs4all.nl>
media: vivid: free bitmap_cap when updating std/timings/etc.
Macpaul Lin <macpaul.lin(a)mediatek.com>
cdc-acm: fix abnormal DATA RX issue for Mediatek Preloader.
Theodore Ts'o <tytso(a)mit.edu>
ext4: force inode writes when nfsd calls commit_metadata()
Maurizio Lombardi <mlombard(a)redhat.com>
ext4: missing unlock/put_page() in ext4_try_to_write_inline_data()
Pan Bian <bianpan2016(a)163.com>
ext4: fix possible use after free in ext4_quota_enable
Sean Christopherson <sean.j.christopherson(a)intel.com>
KVM: x86: Use jmp to invoke kvm_spurious_fault() from .fixup
Jia-Ju Bai <baijiaju1990(a)gmail.com>
usb: r8a66597: Fix a possible concurrency use-after-free bug in r8a66597_endpoint_disable()
Scott Chen <scott(a)labau.com.tw>
USB: serial: pl2303: add ids for Hewlett-Packard HP POS pole displays
Deepa Dinamani <deepa.kernel(a)gmail.com>
sock: Make sock->sk_stamp thread-safe
Juergen Gross <jgross(a)suse.com>
xen/netfront: tolerate frags with no data
Jorgen Hansen <jhansen(a)vmware.com>
VSOCK: Send reset control packet when socket is partially bound
Jason Wang <jasowang(a)redhat.com>
vhost: make sure used idx is seen before log in vhost_add_used_n()
Xin Long <lucien.xin(a)gmail.com>
sctp: initialize sin6_flowinfo for ipv6 addrs in sctp_inet6addr_event
Willem de Bruijn <willemb(a)google.com>
packet: validate address length if non-zero
Willem de Bruijn <willemb(a)google.com>
packet: validate address length
Cong Wang <xiyou.wangcong(a)gmail.com>
netrom: fix locking in nr_find_socket()
Eric Dumazet <edumazet(a)google.com>
isdn: fix kernel-infoleak in capi_unlocked_ioctl
Cong Wang <xiyou.wangcong(a)gmail.com>
ipv6: explicitly initialize udp6_addr in udp_sock_create6()
Tyrel Datwyler <tyreld(a)linux.vnet.ibm.com>
ibmveth: fix DMA unmap error in ibmveth_xmit_start error path
Cong Wang <xiyou.wangcong(a)gmail.com>
ax25: fix a use-after-free in ax25_fillin_cb()
Colin Ian King <colin.king(a)canonical.com>
x86/mtrr: Don't copy uninitialized gentry fields back to userspace
Dexuan Cui <decui(a)microsoft.com>
Drivers: hv: vmbus: Return -EINVAL for the sys files for unopened channels
Christophe Leroy <christophe.leroy(a)c-s.fr>
gpio: max7301: fix driver for use with CONFIG_VMAP_STACK
Russell King <rmk+kernel(a)armlinux.org.uk>
mmc: omap_hsmmc: fix DMA API warning
Ulf Hansson <ulf.hansson(a)linaro.org>
mmc: core: Reset HPI enabled state during re-init and in case of errors
Tore Anderson <tore(a)fud.no>
USB: serial: option: add HP lt4132
Hui Peng <benquike(a)gmail.com>
USB: hso: Fix OOB memory access in hso_probe/hso_get_config_data
-------------
Diffstat:
Makefile | 4 +-
arch/mips/boot/compressed/calc_vmlinuz_load_addr.c | 7 ++-
arch/mips/include/asm/pgtable-64.h | 5 ++
arch/x86/include/asm/kvm_host.h | 2 +-
arch/x86/kernel/cpu/mtrr/if.c | 2 +
drivers/gpio/gpio-max7301.c | 12 +---
drivers/hv/vmbus_drv.c | 20 +++++++
drivers/isdn/capi/kcapi.c | 4 +-
drivers/media/platform/vivid/vivid-vid-cap.c | 2 +
drivers/misc/genwqe/card_utils.c | 2 +-
drivers/mmc/core/mmc.c | 4 +-
drivers/mmc/host/omap_hsmmc.c | 12 +++-
drivers/net/ethernet/ibm/ibmveth.c | 6 +-
drivers/net/usb/hso.c | 18 +++++-
drivers/net/wireless/b43/phy_common.c | 2 +-
drivers/net/xen-netfront.c | 2 +-
drivers/power/olpc_battery.c | 4 +-
drivers/s390/scsi/zfcp_aux.c | 6 +-
drivers/usb/class/cdc-acm.c | 10 ++++
drivers/usb/class/cdc-acm.h | 1 +
drivers/usb/host/r8a66597-hcd.c | 5 +-
drivers/usb/serial/option.c | 7 ++-
drivers/usb/serial/pl2303.c | 5 ++
drivers/usb/serial/pl2303.h | 5 ++
drivers/vhost/vhost.c | 2 +
fs/ceph/caps.c | 1 -
fs/cifs/smb2maperror.c | 4 +-
fs/dlm/lock.c | 17 +++---
fs/dlm/lockspace.c | 2 +-
fs/ext4/inline.c | 5 +-
fs/ext4/super.c | 13 ++++-
fs/gfs2/rgrp.c | 2 +-
include/net/sock.h | 36 +++++++++++-
include/trace/events/ext4.h | 20 +++++++
kernel/fork.c | 13 ++++-
net/9p/client.c | 21 +++++++
net/ax25/af_ax25.c | 11 +++-
net/ax25/ax25_dev.c | 2 +
net/compat.c | 15 +++--
net/core/sock.c | 3 +
net/ipv6/ip6_udp_tunnel.c | 3 +-
net/netrom/af_netrom.c | 15 +++--
net/packet/af_packet.c | 8 ++-
net/sctp/ipv6.c | 1 +
net/sunrpc/auth_gss/svcauth_gss.c | 8 +--
net/sunrpc/cache.c | 9 ++-
net/sunrpc/svcsock.c | 2 +-
net/vmw_vsock/vmci_transport.c | 67 ++++++++++++++++------
sound/pci/cs46xx/dsp_spos.c | 3 +
sound/usb/mixer.c | 10 +++-
sound/usb/quirks-table.h | 3 +
51 files changed, 352 insertions(+), 91 deletions(-)
This is the start of the stable review cycle for the 4.14.93 release.
There are 105 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 Sun Jan 13 13:10:07 UTC 2019.
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.14.93-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.14.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.14.93-rc1
Boris Brezillon <boris.brezillon(a)bootlin.com>
drm/vc4: Set ->is_yuv to false when num_planes == 1
Christophe Leroy <christophe.leroy(a)c-s.fr>
lib: fix build failure in CONFIG_DEBUG_VIRTUAL test
Lubomir Rintel <lkundrak(a)v3.sk>
power: supply: olpc_battery: correct the temperature units
Alexander Shishkin <alexander.shishkin(a)linux.intel.com>
intel_th: msu: Fix an off-by-one in attribute store
Christian Borntraeger <borntraeger(a)de.ibm.com>
genwqe: Fix size check
Yan, Zheng <zyan(a)redhat.com>
ceph: don't update importing cap's mseq when handing cap export
Linus Torvalds <torvalds(a)linux-foundation.org>
sched/fair: Fix infinite loop in update_blocked_averages() by reverting a9e7f6544b9c
Sohil Mehta <sohil.mehta(a)intel.com>
iommu/vt-d: Handle domain agaw being less than iommu agaw
Sagi Grimberg <sagi(a)grimberg.me>
rxe: fix error completion wr_id and qp_num
Dominique Martinet <dominique.martinet(a)cea.fr>
9p/net: put a lower bound on msize
Breno Leitao <leitao(a)debian.org>
powerpc/tm: Set MSR[TS] just prior to recheckpoint
Ard Biesheuvel <ard.biesheuvel(a)linaro.org>
arm64: relocatable: fix inconsistencies in linker script and options
Ard Biesheuvel <ard.biesheuvel(a)linaro.org>
arm64: drop linker script hack to hide __efistub_ symbols
Benjamin Coddington <bcodding(a)redhat.com>
lockd: Show pid of lockd for remote locks
Ondrej Mosnacek <omosnace(a)redhat.com>
selinux: policydb - fix byte order and alignment issues
Larry Finger <Larry.Finger(a)lwfinger.net>
b43: Fix error in cordic routine
Andreas Gruenbacher <agruenba(a)redhat.com>
gfs2: Fix loop in gfs2_rbm_find
Andreas Gruenbacher <agruenba(a)redhat.com>
gfs2: Get rid of potential double-freeing in gfs2_create_inode
Vasily Averin <vvs(a)virtuozzo.com>
dlm: memory leaks on error path in dlm_user_request()
Vasily Averin <vvs(a)virtuozzo.com>
dlm: lost put_lkb on error path in receive_convert() and receive_unlock()
Vasily Averin <vvs(a)virtuozzo.com>
dlm: possible memory leak on error path in create_lkb()
Vasily Averin <vvs(a)virtuozzo.com>
dlm: fixed memory leaks after failed ls_remove_names allocation
Hui Peng <benquike(a)163.com>
ALSA: usb-audio: Fix an out-of-bound read in create_composite_quirks
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Avoid access before bLength check in build_audio_procunit()
Dan Carpenter <dan.carpenter(a)oracle.com>
ALSA: cs46xx: Potential NULL dereference in probe
Damien Le Moal <damien.lemoal(a)wdc.com>
dm zoned: Fix target BIO completion handling
Mikulas Patocka <mpatocka(a)redhat.com>
dm verity: fix crash on bufio buffer that was allocated with vmalloc
Stefan Hajnoczi <stefanha(a)redhat.com>
vhost/vsock: fix uninitialized vhost_vsock->guest_cid
Joel Stanley <joel(a)jms.id.au>
raid6/ppc: Fix build for clang
Joel Stanley <joel(a)jms.id.au>
powerpc/boot: Set target when cross-compiling for clang
Joel Stanley <joel(a)jms.id.au>
Makefile: Export clang toolchain variables
Masahiro Yamada <yamada.masahiro(a)socionext.com>
kbuild: consolidate Clang compiler flags
Masahiro Yamada <yamada.masahiro(a)socionext.com>
kbuild: add -no-integrated-as Clang option unconditionally
Matthias Kaehlcke <mka(a)chromium.org>
md: raid10: remove VLAIS
Joel Stanley <joel(a)jms.id.au>
ftrace: Build with CPPFLAGS to get -Qunused-arguments
Joel Stanley <joel(a)jms.id.au>
powerpc: Disable -Wbuiltin-requires-header when setjmp is used
Nicholas Piggin <npiggin(a)gmail.com>
powerpc: avoid -mno-sched-epilog on GCC 4.9 and newer
Vasily Averin <vvs(a)virtuozzo.com>
sunrpc: use SVC_NET() in svcauth_gss_* functions
Vasily Averin <vvs(a)virtuozzo.com>
sunrpc: fix cache_head leak due to queued request
Huang Ying <ying.huang(a)intel.com>
mm, swap: fix swapoff with KSM pages
Dan Williams <dan.j.williams(a)intel.com>
mm, hmm: mark hmm_devmem_{add, add_resource} EXPORT_SYMBOL_GPL
Dan Williams <dan.j.williams(a)intel.com>
mm, hmm: use devm semantics for hmm_devmem_{add, remove}
Dan Williams <dan.j.williams(a)intel.com>
mm, devm_memremap_pages: kill mapping "System RAM" support
Dan Williams <dan.j.williams(a)intel.com>
mm, devm_memremap_pages: mark devm_memremap_pages() EXPORT_SYMBOL_GPL
Michal Hocko <mhocko(a)suse.com>
hwpoison, memory_hotplug: allow hwpoisoned pages to be offlined
Minchan Kim <minchan(a)kernel.org>
zram: fix double free backing device
David Herrmann <dh.herrmann(a)gmail.com>
fork: record start_time late
Martin Kelly <martin(a)martingkelly.com>
tools: fix cross-compile var clobbering
Thomas Gleixner <tglx(a)linutronix.de>
genirq/affinity: Don't return with empty affinity masks on error
Ewan D. Milne <emilne(a)redhat.com>
scsi: lpfc: do not set queue->page_count to 0 if pc_sli4_params.wqpcnt is invalid
Steffen Maier <maier(a)linux.ibm.com>
scsi: zfcp: fix posting too many status read buffers leading to adapter shutdown
Yangtao Li <tiny.windzz(a)gmail.com>
serial/sunsu: fix refcount leak
Daniele Palmas <dnlplm(a)gmail.com>
qmi_wwan: Fix qmap header retrieval in qmimux_rx_fixup
Kangjie Lu <kjlu(a)umn.edu>
net: netxen: fix a missing check and an uninitialized use
Mantas Mikulėnas <grawity(a)gmail.com>
Input: synaptics - enable SMBus for HP EliteBook 840 G4
Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de>
gpio: mvebu: only fail on missing clk if pwm is actually to be used
Michael S. Tsirkin <mst(a)redhat.com>
virtio: fix test build after uio.h change
Masahiro Yamada <yamada.masahiro(a)socionext.com>
kbuild: fix false positive warning/error about missing libelf
Sara Sharon <sara.sharon(a)intel.com>
mac80211: free skb fraglist before freeing the skb
Colin Ian King <colin.king(a)canonical.com>
vxge: ensure data0 is initialized in when fetching firmware version information
Jason Martinsen <jasonmartinsen(a)msn.com>
lan78xx: Resolve issue with changing MAC address
Anssi Hannula <anssi.hannula(a)bitwise.fi>
net: macb: fix dropped RX frames due to a race
Anssi Hannula <anssi.hannula(a)bitwise.fi>
net: macb: fix random memory corruption on RX with 64-bit DMA
Dan Carpenter <dan.carpenter(a)oracle.com>
qed: Fix an error code qed_ll2_start_xmit()
Trond Myklebust <trond.myklebust(a)hammerspace.com>
SUNRPC: Fix a race with XPRT_CONNECTING
Yonglong Liu <liuyonglong(a)huawei.com>
net: hns: Fix ping failed when use net bridge and send multicast
Yonglong Liu <liuyonglong(a)huawei.com>
net: hns: Add mac pcs config when enable|disable mac
Yonglong Liu <liuyonglong(a)huawei.com>
net: hns: Fix ntuple-filters status error.
Yonglong Liu <liuyonglong(a)huawei.com>
net: hns: Avoid net reset caused by pause frames storm
Yonglong Liu <liuyonglong(a)huawei.com>
net: hns: Free irq when exit from abnormal branch
Yonglong Liu <liuyonglong(a)huawei.com>
net: hns: Clean rx fbd when ae stopped.
Yonglong Liu <liuyonglong(a)huawei.com>
net: hns: Fixed bug that netdev was opened twice
Yonglong Liu <liuyonglong(a)huawei.com>
net: hns: Some registers use wrong address according to the datasheet.
Yonglong Liu <liuyonglong(a)huawei.com>
net: hns: All ports can not work when insmod hns ko after rmmod.
Yonglong Liu <liuyonglong(a)huawei.com>
net: hns: Incorrect offset address used for some registers.
Arnd Bergmann <arnd(a)arndb.de>
w90p910_ether: remove incorrect __init annotation
Nathan Chancellor <natechancellor(a)gmail.com>
drivers: net: xgene: Remove unnecessary forward declarations
Sinan Kaya <okaya(a)kernel.org>
x86, hyperv: remove PCI dependency
Varun Prakash <varun(a)chelsio.com>
scsi: target: iscsi: cxgbit: add missing spin_lock_init()
Varun Prakash <varun(a)chelsio.com>
scsi: target: iscsi: cxgbit: fix csk leak
Sudarsana Reddy Kalluru <sudarsana.kalluru(a)cavium.com>
bnx2x: Send update-svid ramrod with retry/poll flags enabled
Sudarsana Reddy Kalluru <sudarsana.kalluru(a)cavium.com>
bnx2x: Remove configured vlans as part of unload sequence.
Sudarsana Reddy Kalluru <sudarsana.kalluru(a)cavium.com>
bnx2x: Clear fip MAC when fcoe offload support is disabled
Florian Westphal <fw(a)strlen.de>
netfilter: nat: can't use dst_hold on noref dst
Pan Bian <bianpan2016(a)163.com>
netfilter: ipset: do not call ipset_nest_end after nla_nest_cancel
Stefan Assmann <sassmann(a)kpanic.de>
i40e: fix mac filter delete when setting mac address
Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com>
x86/dump_pagetables: Fix LDT remap address marker
Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com>
x86/mm: Fix guard hole handling
YueHaibing <yuehaibing(a)huawei.com>
ieee802154: ca8210: fix possible u8 overflow in ca8210_rx_done
Thomas Falcon <tlfalcon(a)linux.ibm.com>
ibmvnic: Fix non-atomic memory allocation in IRQ context
Yussuf Khalil <dev(a)pp3345.net>
Input: synaptics - enable RMI on ThinkPad T560
Tony Lindgren <tony(a)atomide.com>
Input: omap-keypad - fix idle configuration to not block SoC idle states
Dan Carpenter <dan.carpenter(a)oracle.com>
scsi: bnx2fc: Fix NULL dereference in error handling
Florian Westphal <fw(a)strlen.de>
netfilter: seqadj: re-load tcp header pointer after possible head reallocation
Steffen Klassert <steffen.klassert(a)secunet.com>
xfrm: Fix NULL pointer dereference in xfrm_input when skb_dst_force clears the dst_entry.
Benjamin Poirier <bpoirier(a)suse.com>
xfrm: Fix bucket count reported to userspace
Wei Yongjun <weiyongjun1(a)huawei.com>
xfrm: Fix error return code in xfrm_output_one()
Qian Cai <cai(a)lca.pw>
checkstack.pl: fix for aarch64
Peter Hutterer <peter.hutterer(a)who-t.net>
Input: restore EV_ABS ABS_RESERVED
Fabio Estevam <festevam(a)gmail.com>
ARM: dts: imx7d-nitrogen7: Fix the description of the Wifi clock
Anson Huang <anson.huang(a)nxp.com>
ARM: imx: update the cpu power up timing setting on i.mx6sx
Hans de Goede <hdegoede(a)redhat.com>
HID: ite: Add USB id match for another ITE based keyboard rfkill key quirk
Michael Ellerman <mpe(a)ellerman.id.au>
powerpc/mm: Fix linux page tables build with some configs
Paul Mackerras <paulus(a)ozlabs.org>
powerpc: Fix COFF zImage booting on old powermacs
Jerome Brunet <jbrunet(a)baylibre.com>
pinctrl: meson: fix pull enable register calculation
-------------
Diffstat:
Makefile | 31 +-
arch/arm/boot/dts/imx7d-nitrogen7.dts | 9 +-
arch/arm/mach-imx/cpuidle-imx6sx.c | 2 +-
arch/arm64/Makefile | 2 +-
arch/arm64/kernel/image.h | 44 +-
arch/arm64/kernel/vmlinux.lds.S | 9 +-
arch/powerpc/Makefile | 7 +-
arch/powerpc/boot/Makefile | 5 +
arch/powerpc/boot/crt0.S | 4 +-
arch/powerpc/kernel/Makefile | 3 +
arch/powerpc/kernel/signal_32.c | 20 +-
arch/powerpc/kernel/signal_64.c | 44 +-
arch/powerpc/mm/dump_linuxpagetables.c | 1 +
arch/powerpc/xmon/Makefile | 5 +-
arch/x86/include/asm/pgtable_64_types.h | 5 +
arch/x86/mm/dump_pagetables.c | 15 +-
arch/x86/xen/mmu_pv.c | 11 +-
drivers/block/zram/zram_drv.c | 4 +-
drivers/gpio/gpio-mvebu.c | 6 +-
drivers/gpu/drm/vc4/vc4_plane.c | 1 +
drivers/hid/hid-ids.h | 3 +
drivers/hid/hid-ite.c | 1 +
drivers/hv/Kconfig | 2 +-
drivers/hwtracing/intel_th/msu.c | 3 +-
drivers/infiniband/sw/rxe/rxe_resp.c | 13 +-
drivers/input/keyboard/omap4-keypad.c | 16 +-
drivers/input/mouse/synaptics.c | 2 +
drivers/iommu/intel-iommu.c | 4 +-
drivers/md/dm-verity-target.c | 24 +-
drivers/md/dm-zoned-target.c | 122 ++---
drivers/md/raid10.c | 15 +-
drivers/misc/genwqe/card_utils.c | 2 +-
drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 3 -
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 1 +
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 48 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 4 +-
drivers/net/ethernet/cadence/macb_main.c | 14 +-
drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 3 +
drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 14 +-
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 15 +
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 503 ++++++++++++++-------
drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 13 +-
drivers/net/ethernet/hisilicon/hns/hns_enet.c | 43 +-
drivers/net/ethernet/ibm/ibmvnic.c | 2 +-
drivers/net/ethernet/intel/i40e/i40e_main.c | 14 +-
drivers/net/ethernet/neterion/vxge/vxge-config.c | 2 +-
drivers/net/ethernet/nuvoton/w90p910_ether.c | 2 +-
.../net/ethernet/qlogic/netxen/netxen_nic_init.c | 3 +-
drivers/net/ethernet/qlogic/qed/qed_ll2.c | 1 +
drivers/net/ieee802154/ca8210.c | 4 +-
drivers/net/usb/lan78xx.c | 4 +
drivers/net/usb/qmi_wwan.c | 15 +-
drivers/net/wireless/broadcom/b43/phy_common.c | 2 +-
drivers/pinctrl/meson/pinctrl-meson.c | 3 +-
drivers/power/supply/olpc_battery.c | 4 +-
drivers/s390/scsi/zfcp_aux.c | 6 +-
drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +-
drivers/scsi/lpfc/lpfc_sli.c | 3 +-
drivers/target/iscsi/cxgbit/cxgbit_cm.c | 5 +-
drivers/target/iscsi/cxgbit/cxgbit_main.c | 1 +
drivers/tty/serial/sunsu.c | 31 +-
drivers/vhost/vsock.c | 2 +
fs/ceph/caps.c | 1 -
fs/dlm/lock.c | 17 +-
fs/dlm/lockspace.c | 2 +-
fs/gfs2/inode.c | 18 +-
fs/gfs2/rgrp.c | 2 +-
fs/lockd/clntproc.c | 2 +-
fs/lockd/xdr.c | 4 +-
fs/lockd/xdr4.c | 4 +-
include/linux/hmm.h | 4 +-
include/uapi/linux/input-event-codes.h | 9 +
kernel/fork.c | 13 +-
kernel/irq/affinity.c | 15 +-
kernel/memremap.c | 11 +-
kernel/sched/fair.c | 43 +-
lib/raid6/Makefile | 15 +
lib/test_debug_virtual.c | 1 +
mm/hmm.c | 131 ++----
mm/memory_hotplug.c | 16 +
mm/swapfile.c | 3 +-
net/9p/client.c | 21 +
net/mac80211/status.c | 5 +
net/netfilter/ipset/ip_set_list_set.c | 2 +-
net/netfilter/nf_conntrack_seqadj.c | 7 +-
net/netfilter/nf_nat_core.c | 3 +-
net/sunrpc/auth_gss/svcauth_gss.c | 8 +-
net/sunrpc/cache.c | 10 +-
net/sunrpc/xprtsock.c | 4 +-
net/xfrm/xfrm_input.c | 7 +-
net/xfrm/xfrm_output.c | 1 +
net/xfrm/xfrm_state.c | 2 +-
scripts/Makefile.build | 2 +-
scripts/checkstack.pl | 4 +-
security/selinux/ss/policydb.c | 51 ++-
sound/pci/cs46xx/dsp_spos.c | 3 +
sound/usb/mixer.c | 10 +-
sound/usb/quirks-table.h | 3 +
tools/cgroup/Makefile | 1 -
tools/gpio/Makefile | 2 -
tools/hv/Makefile | 1 -
tools/iio/Makefile | 2 -
tools/laptop/freefall/Makefile | 1 -
tools/leds/Makefile | 1 -
tools/perf/Makefile.perf | 6 -
tools/power/acpi/Makefile.config | 3 -
tools/scripts/Makefile.include | 18 +
tools/spi/Makefile | 2 -
tools/testing/nvdimm/test/iomap.c | 2 +-
tools/usb/Makefile | 1 -
tools/virtio/linux/kernel.h | 4 +
tools/vm/Makefile | 1 -
112 files changed, 1035 insertions(+), 666 deletions(-)
When building using GCC 4.7 or older, -ffunction-sections & the -pg flag
used by ftrace are incompatible. This causes warnings or build failures
(where -Werror applies) such as the following:
arch/mips/generic/init.c:
error: -ffunction-sections disabled; it makes profiling impossible
This used to be taken into account by the ordering of calls to cc-option
from within the top-level Makefile, which was introduced by commit
90ad4052e85c ("kbuild: avoid conflict between -ffunction-sections and
-pg on gcc-4.7"). Unfortunately this was broken when the
CONFIG_LD_DEAD_CODE_DATA_ELIMINATION cc-option check was moved to
Kconfig in commit e85d1d65cd8a ("kbuild: test dead code/data elimination
support in Kconfig"), because the flags used by this check no longer
include -pg.
Fix this by not allowing CONFIG_LD_DEAD_CODE_DATA_ELIMINATION to be
enabled at the same time as ftrace/CONFIG_FUNCTION_TRACER when building
using GCC 4.7 or older.
Signed-off-by: Paul Burton <paul.burton(a)mips.com>
Fixes: e85d1d65cd8a ("kbuild: test dead code/data elimination support in Kconfig")
Reported-by: Geert Uytterhoeven <geert(a)linux-m68k.org>
Cc: Masahiro Yamada <yamada.masahiro(a)socionext.com>
Cc: Nicholas Piggin <npiggin(a)gmail.com>
Cc: stable(a)vger.kernel.org # v4.19+
---
init/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/init/Kconfig b/init/Kconfig
index d47cb77a220e..c787f782148d 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1124,6 +1124,7 @@ config LD_DEAD_CODE_DATA_ELIMINATION
bool "Dead code and data elimination (EXPERIMENTAL)"
depends on HAVE_LD_DEAD_CODE_DATA_ELIMINATION
depends on EXPERT
+ depends on !FUNCTION_TRACER || !CC_IS_GCC || GCC_VERSION >= 40800
depends on $(cc-option,-ffunction-sections -fdata-sections)
depends on $(ld-option,--gc-sections)
help
--
2.20.1
This is the start of the stable review cycle for the 4.9.150 release.
There are 63 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 Sun Jan 13 13:10:03 UTC 2019.
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.150-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.150-rc1
Boris Brezillon <boris.brezillon(a)bootlin.com>
drm/vc4: Set ->is_yuv to false when num_planes == 1
Lubomir Rintel <lkundrak(a)v3.sk>
power: supply: olpc_battery: correct the temperature units
Alexander Shishkin <alexander.shishkin(a)linux.intel.com>
intel_th: msu: Fix an off-by-one in attribute store
Christian Borntraeger <borntraeger(a)de.ibm.com>
genwqe: Fix size check
Yan, Zheng <zyan(a)redhat.com>
ceph: don't update importing cap's mseq when handing cap export
Sohil Mehta <sohil.mehta(a)intel.com>
iommu/vt-d: Handle domain agaw being less than iommu agaw
Sagi Grimberg <sagi(a)grimberg.me>
rxe: fix error completion wr_id and qp_num
Dominique Martinet <dominique.martinet(a)cea.fr>
9p/net: put a lower bound on msize
Breno Leitao <leitao(a)debian.org>
powerpc/tm: Set MSR[TS] just prior to recheckpoint
Larry Finger <Larry.Finger(a)lwfinger.net>
b43: Fix error in cordic routine
Andreas Gruenbacher <agruenba(a)redhat.com>
gfs2: Fix loop in gfs2_rbm_find
Andreas Gruenbacher <agruenba(a)redhat.com>
gfs2: Get rid of potential double-freeing in gfs2_create_inode
Vasily Averin <vvs(a)virtuozzo.com>
dlm: memory leaks on error path in dlm_user_request()
Vasily Averin <vvs(a)virtuozzo.com>
dlm: lost put_lkb on error path in receive_convert() and receive_unlock()
Vasily Averin <vvs(a)virtuozzo.com>
dlm: possible memory leak on error path in create_lkb()
Vasily Averin <vvs(a)virtuozzo.com>
dlm: fixed memory leaks after failed ls_remove_names allocation
Hui Peng <benquike(a)163.com>
ALSA: usb-audio: Fix an out-of-bound read in create_composite_quirks
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Avoid access before bLength check in build_audio_procunit()
Dan Carpenter <dan.carpenter(a)oracle.com>
ALSA: cs46xx: Potential NULL dereference in probe
Michael J. Ruhl <michael.j.ruhl(a)intel.com>
IB/hfi1: Incorrect sizing of sge for PIO will OOPs
Stefan Hajnoczi <stefanha(a)redhat.com>
vhost/vsock: fix uninitialized vhost_vsock->guest_cid
Eric Biggers <ebiggers(a)google.com>
crypto: x86/chacha20 - avoid sleeping with preemption disabled
Paul Burton <paul.burton(a)mips.com>
MIPS: math-emu: Write-protect delay slot emulation pages
Vasily Averin <vvs(a)virtuozzo.com>
sunrpc: use SVC_NET() in svcauth_gss_* functions
Vasily Averin <vvs(a)virtuozzo.com>
sunrpc: fix cache_head leak due to queued request
Dan Williams <dan.j.williams(a)intel.com>
mm, devm_memremap_pages: kill mapping "System RAM" support
Dan Williams <dan.j.williams(a)intel.com>
mm, devm_memremap_pages: mark devm_memremap_pages() EXPORT_SYMBOL_GPL
Michal Hocko <mhocko(a)suse.com>
hwpoison, memory_hotplug: allow hwpoisoned pages to be offlined
David Herrmann <dh.herrmann(a)gmail.com>
fork: record start_time late
Ilya Dryomov <idryomov(a)gmail.com>
libceph: fix CEPH_FEATURE_CEPHX_V2 check in calc_signature()
Steffen Maier <maier(a)linux.ibm.com>
scsi: zfcp: fix posting too many status read buffers leading to adapter shutdown
Yangtao Li <tiny.windzz(a)gmail.com>
serial/sunsu: fix refcount leak
Kangjie Lu <kjlu(a)umn.edu>
net: netxen: fix a missing check and an uninitialized use
Colin Ian King <colin.king(a)canonical.com>
vxge: ensure data0 is initialized in when fetching firmware version information
Jason Martinsen <jasonmartinsen(a)msn.com>
lan78xx: Resolve issue with changing MAC address
Trond Myklebust <trond.myklebust(a)hammerspace.com>
SUNRPC: Fix a race with XPRT_CONNECTING
Yonglong Liu <liuyonglong(a)huawei.com>
net: hns: Add mac pcs config when enable|disable mac
Yonglong Liu <liuyonglong(a)huawei.com>
net: hns: Fix ntuple-filters status error.
Yonglong Liu <liuyonglong(a)huawei.com>
net: hns: Avoid net reset caused by pause frames storm
Yonglong Liu <liuyonglong(a)huawei.com>
net: hns: Free irq when exit from abnormal branch
Yonglong Liu <liuyonglong(a)huawei.com>
net: hns: Clean rx fbd when ae stopped.
Yonglong Liu <liuyonglong(a)huawei.com>
net: hns: Fixed bug that netdev was opened twice
Yonglong Liu <liuyonglong(a)huawei.com>
net: hns: Some registers use wrong address according to the datasheet.
Yonglong Liu <liuyonglong(a)huawei.com>
net: hns: All ports can not work when insmod hns ko after rmmod.
Yonglong Liu <liuyonglong(a)huawei.com>
net: hns: Incorrect offset address used for some registers.
Arnd Bergmann <arnd(a)arndb.de>
w90p910_ether: remove incorrect __init annotation
Nathan Chancellor <natechancellor(a)gmail.com>
drivers: net: xgene: Remove unnecessary forward declarations
Varun Prakash <varun(a)chelsio.com>
scsi: target: iscsi: cxgbit: add missing spin_lock_init()
Varun Prakash <varun(a)chelsio.com>
scsi: target: iscsi: cxgbit: fix csk leak
Sudarsana Reddy Kalluru <sudarsana.kalluru(a)cavium.com>
bnx2x: Send update-svid ramrod with retry/poll flags enabled
Sudarsana Reddy Kalluru <sudarsana.kalluru(a)cavium.com>
bnx2x: Remove configured vlans as part of unload sequence.
Sudarsana Reddy Kalluru <sudarsana.kalluru(a)cavium.com>
bnx2x: Clear fip MAC when fcoe offload support is disabled
Pan Bian <bianpan2016(a)163.com>
netfilter: ipset: do not call ipset_nest_end after nla_nest_cancel
Tony Lindgren <tony(a)atomide.com>
Input: omap-keypad - fix idle configuration to not block SoC idle states
Dan Carpenter <dan.carpenter(a)oracle.com>
scsi: bnx2fc: Fix NULL dereference in error handling
Florian Westphal <fw(a)strlen.de>
netfilter: seqadj: re-load tcp header pointer after possible head reallocation
Benjamin Poirier <bpoirier(a)suse.com>
xfrm: Fix bucket count reported to userspace
Qian Cai <cai(a)lca.pw>
checkstack.pl: fix for aarch64
Peter Hutterer <peter.hutterer(a)who-t.net>
Input: restore EV_ABS ABS_RESERVED
Fabio Estevam <festevam(a)gmail.com>
ARM: dts: imx7d-nitrogen7: Fix the description of the Wifi clock
Anson Huang <anson.huang(a)nxp.com>
ARM: imx: update the cpu power up timing setting on i.mx6sx
Paul Mackerras <paulus(a)ozlabs.org>
powerpc: Fix COFF zImage booting on old powermacs
Jerome Brunet <jbrunet(a)baylibre.com>
pinctrl: meson: fix pull enable register calculation
-------------
Diffstat:
Makefile | 4 +-
arch/arm/boot/dts/imx7d-nitrogen7.dts | 9 +-
arch/arm/mach-imx/cpuidle-imx6sx.c | 2 +-
arch/mips/kernel/vdso.c | 4 +-
arch/mips/math-emu/dsemul.c | 38 ++--
arch/powerpc/boot/crt0.S | 4 +-
arch/powerpc/kernel/signal_32.c | 20 +-
arch/powerpc/kernel/signal_64.c | 44 ++--
arch/x86/crypto/chacha20_glue.c | 1 +
drivers/gpu/drm/vc4/vc4_plane.c | 1 +
drivers/hwtracing/intel_th/msu.c | 3 +-
drivers/infiniband/hw/hfi1/verbs.c | 2 +
drivers/infiniband/sw/rxe/rxe_resp.c | 13 +-
drivers/input/keyboard/omap4-keypad.c | 16 +-
drivers/iommu/intel-iommu.c | 4 +-
drivers/misc/genwqe/card_utils.c | 2 +-
drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 3 -
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 1 +
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 48 +++-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 4 +-
drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 3 +
drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 14 +-
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 15 ++
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 246 ++++++++++-----------
drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 13 +-
drivers/net/ethernet/hisilicon/hns/hns_enet.c | 43 +++-
drivers/net/ethernet/neterion/vxge/vxge-config.c | 2 +-
drivers/net/ethernet/nuvoton/w90p910_ether.c | 2 +-
.../net/ethernet/qlogic/netxen/netxen_nic_init.c | 3 +-
drivers/net/usb/lan78xx.c | 4 +
drivers/net/wireless/broadcom/b43/phy_common.c | 2 +-
drivers/pinctrl/meson/pinctrl-meson.c | 3 +-
drivers/power/supply/olpc_battery.c | 4 +-
drivers/s390/scsi/zfcp_aux.c | 6 +-
drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +-
drivers/target/iscsi/cxgbit/cxgbit_cm.c | 5 +-
drivers/target/iscsi/cxgbit/cxgbit_main.c | 1 +
drivers/tty/serial/sunsu.c | 31 ++-
drivers/vhost/vsock.c | 2 +
fs/ceph/caps.c | 1 -
fs/dlm/lock.c | 17 +-
fs/dlm/lockspace.c | 2 +-
fs/gfs2/inode.c | 18 +-
fs/gfs2/rgrp.c | 2 +-
include/uapi/linux/input-event-codes.h | 9 +
kernel/fork.c | 13 +-
kernel/memremap.c | 11 +-
mm/memory_hotplug.c | 16 ++
net/9p/client.c | 21 ++
net/ceph/auth_x.c | 2 +-
net/netfilter/ipset/ip_set_list_set.c | 2 +-
net/netfilter/nf_conntrack_seqadj.c | 7 +-
net/sunrpc/auth_gss/svcauth_gss.c | 8 +-
net/sunrpc/cache.c | 10 +-
net/sunrpc/xprtsock.c | 4 +-
net/xfrm/xfrm_state.c | 2 +-
scripts/checkstack.pl | 4 +-
sound/pci/cs46xx/dsp_spos.c | 3 +
sound/usb/mixer.c | 10 +-
sound/usb/quirks-table.h | 3 +
tools/testing/nvdimm/test/iomap.c | 2 +-
61 files changed, 517 insertions(+), 274 deletions(-)
This is the start of the stable review cycle for the 4.4.170 release.
There are 88 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 Sun Jan 13 13:09:58 UTC 2019.
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.170-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.170-rc1
Lubomir Rintel <lkundrak(a)v3.sk>
power: supply: olpc_battery: correct the temperature units
Alexander Shishkin <alexander.shishkin(a)linux.intel.com>
intel_th: msu: Fix an off-by-one in attribute store
Christian Borntraeger <borntraeger(a)de.ibm.com>
genwqe: Fix size check
Yan, Zheng <zyan(a)redhat.com>
ceph: don't update importing cap's mseq when handing cap export
Sohil Mehta <sohil.mehta(a)intel.com>
iommu/vt-d: Handle domain agaw being less than iommu agaw
Dominique Martinet <dominique.martinet(a)cea.fr>
9p/net: put a lower bound on msize
Larry Finger <Larry.Finger(a)lwfinger.net>
b43: Fix error in cordic routine
Andreas Gruenbacher <agruenba(a)redhat.com>
gfs2: Fix loop in gfs2_rbm_find
Vasily Averin <vvs(a)virtuozzo.com>
dlm: memory leaks on error path in dlm_user_request()
Vasily Averin <vvs(a)virtuozzo.com>
dlm: lost put_lkb on error path in receive_convert() and receive_unlock()
Vasily Averin <vvs(a)virtuozzo.com>
dlm: possible memory leak on error path in create_lkb()
Vasily Averin <vvs(a)virtuozzo.com>
dlm: fixed memory leaks after failed ls_remove_names allocation
Hui Peng <benquike(a)163.com>
ALSA: usb-audio: Fix an out-of-bound read in create_composite_quirks
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Avoid access before bLength check in build_audio_procunit()
Dan Carpenter <dan.carpenter(a)oracle.com>
ALSA: cs46xx: Potential NULL dereference in probe
Ming Lei <ming.lei(a)redhat.com>
block: don't deal with discard limit in blkdev_issue_discard()
Jens Axboe <axboe(a)kernel.dk>
block: break discard submissions into the user defined size
Eric Biggers <ebiggers(a)google.com>
crypto: x86/chacha20 - avoid sleeping with preemption disabled
Vasily Averin <vvs(a)virtuozzo.com>
sunrpc: use SVC_NET() in svcauth_gss_* functions
Vasily Averin <vvs(a)virtuozzo.com>
sunrpc: fix cache_head leak due to queued request
Dan Williams <dan.j.williams(a)intel.com>
mm, devm_memremap_pages: kill mapping "System RAM" support
Dan Williams <dan.j.williams(a)intel.com>
mm, devm_memremap_pages: mark devm_memremap_pages() EXPORT_SYMBOL_GPL
Michal Hocko <mhocko(a)suse.com>
hwpoison, memory_hotplug: allow hwpoisoned pages to be offlined
David Herrmann <dh.herrmann(a)gmail.com>
fork: record start_time late
Steffen Maier <maier(a)linux.ibm.com>
scsi: zfcp: fix posting too many status read buffers leading to adapter shutdown
Tony Lindgren <tony(a)atomide.com>
Input: omap-keypad - fix idle configuration to not block SoC idle states
Dan Carpenter <dan.carpenter(a)oracle.com>
scsi: bnx2fc: Fix NULL dereference in error handling
Benjamin Poirier <bpoirier(a)suse.com>
xfrm: Fix bucket count reported to userspace
Qian Cai <cai(a)lca.pw>
checkstack.pl: fix for aarch64
Peter Hutterer <peter.hutterer(a)who-t.net>
Input: restore EV_ABS ABS_RESERVED
Anson Huang <anson.huang(a)nxp.com>
ARM: imx: update the cpu power up timing setting on i.mx6sx
Paul Mackerras <paulus(a)ozlabs.org>
powerpc: Fix COFF zImage booting on old powermacs
Lukas Wunner <lukas(a)wunner.de>
spi: bcm2835: Unbreak the build of esoteric configs
Vitaly Kuznetsov <vkuznets(a)redhat.com>
x86/kvm/vmx: do not use vm-exit instruction length for fast MMIO when running nested
Georgy A Bystrenin <gkot(a)altlinux.org>
CIFS: Fix error mapping for SMB2_LOCK command which caused OFD lock problem
Huacai Chen <chenhc(a)lemote.com>
MIPS: Align kernel load address to 64KB
Huacai Chen <chenhc(a)lemote.com>
MIPS: Ensure pmd_present() returns false after pmd_mknotpresent()
Hans Verkuil <hverkuil-cisco(a)xs4all.nl>
media: vivid: free bitmap_cap when updating std/timings/etc.
Macpaul Lin <macpaul.lin(a)mediatek.com>
cdc-acm: fix abnormal DATA RX issue for Mediatek Preloader.
Lukas Wunner <lukas(a)wunner.de>
spi: bcm2835: Avoid finishing transfer prematurely in IRQ mode
Lukas Wunner <lukas(a)wunner.de>
spi: bcm2835: Fix book-keeping of DMA termination
Lukas Wunner <lukas(a)wunner.de>
spi: bcm2835: Fix race on DMA termination
Theodore Ts'o <tytso(a)mit.edu>
ext4: force inode writes when nfsd calls commit_metadata()
ruippan (潘睿) <ruippan(a)tencent.com>
ext4: fix EXT4_IOC_GROUP_ADD ioctl
Maurizio Lombardi <mlombard(a)redhat.com>
ext4: missing unlock/put_page() in ext4_try_to_write_inline_data()
Pan Bian <bianpan2016(a)163.com>
ext4: fix possible use after free in ext4_quota_enable
Ben Hutchings <ben(a)decadent.org.uk>
perf pmu: Suppress potential format-truncation warning
Sean Christopherson <sean.j.christopherson(a)intel.com>
KVM: x86: Use jmp to invoke kvm_spurious_fault() from .fixup
Patrick Dreyer <Patrick(a)Dreyer.name>
Input: elan_i2c - add ACPI ID for touchpad in ASUS Aspire F5-573G
Jia-Ju Bai <baijiaju1990(a)gmail.com>
usb: r8a66597: Fix a possible concurrency use-after-free bug in r8a66597_endpoint_disable()
Jörgen Storvist <jorgen.storvist(a)gmail.com>
USB: serial: option: add Fibocom NL678 series
Scott Chen <scott(a)labau.com.tw>
USB: serial: pl2303: add ids for Hewlett-Packard HP POS pole displays
Sameer Pujar <spujar(a)nvidia.com>
ALSA: hda/tegra: clear pending irq handlers
Mantas Mikulėnas <grawity(a)gmail.com>
ALSA: hda: add mute LED support for HP EliteBook 840 G4
Gustavo A. R. Silva <gustavo(a)embeddedor.com>
ALSA: emux: Fix potential Spectre v1 vulnerabilities
Gustavo A. R. Silva <gustavo(a)embeddedor.com>
ALSA: pcm: Fix potential Spectre v1 vulnerability
Gustavo A. R. Silva <gustavo(a)embeddedor.com>
ALSA: emu10k1: Fix potential Spectre v1 vulnerabilities
Gustavo A. R. Silva <gustavo(a)embeddedor.com>
ALSA: rme9652: Fix potential Spectre v1 vulnerability
Deepa Dinamani <deepa.kernel(a)gmail.com>
sock: Make sock->sk_stamp thread-safe
Lorenzo Bianconi <lorenzo.bianconi(a)redhat.com>
gro_cell: add napi_disable in gro_cells_destroy
Juergen Gross <jgross(a)suse.com>
xen/netfront: tolerate frags with no data
Jorgen Hansen <jhansen(a)vmware.com>
VSOCK: Send reset control packet when socket is partially bound
Jason Wang <jasowang(a)redhat.com>
vhost: make sure used idx is seen before log in vhost_add_used_n()
Xin Long <lucien.xin(a)gmail.com>
sctp: initialize sin6_flowinfo for ipv6 addrs in sctp_inet6addr_event
Willem de Bruijn <willemb(a)google.com>
packet: validate address length if non-zero
Willem de Bruijn <willemb(a)google.com>
packet: validate address length
Cong Wang <xiyou.wangcong(a)gmail.com>
netrom: fix locking in nr_find_socket()
Eric Dumazet <edumazet(a)google.com>
isdn: fix kernel-infoleak in capi_unlocked_ioctl
Cong Wang <xiyou.wangcong(a)gmail.com>
ipv6: explicitly initialize udp6_addr in udp_sock_create6()
Willem de Bruijn <willemb(a)google.com>
ieee802154: lowpan_header_create check must check daddr
Tyrel Datwyler <tyreld(a)linux.vnet.ibm.com>
ibmveth: fix DMA unmap error in ibmveth_xmit_start error path
Cong Wang <xiyou.wangcong(a)gmail.com>
ax25: fix a use-after-free in ax25_fillin_cb()
Gustavo A. R. Silva <gustavo(a)embeddedor.com>
ipv4: Fix potential Spectre v1 vulnerability
Gustavo A. R. Silva <gustavo(a)embeddedor.com>
ip6mr: Fix potential Spectre v1 vulnerability
Gustavo A. R. Silva <gustavo(a)embeddedor.com>
drm/ioctl: Fix Spectre v1 vulnerabilities
Colin Ian King <colin.king(a)canonical.com>
x86/mtrr: Don't copy uninitialized gentry fields back to userspace
Dexuan Cui <decui(a)microsoft.com>
Drivers: hv: vmbus: Return -EINVAL for the sys files for unopened channels
Christophe Leroy <christophe.leroy(a)c-s.fr>
gpio: max7301: fix driver for use with CONFIG_VMAP_STACK
Russell King <rmk+kernel(a)armlinux.org.uk>
mmc: omap_hsmmc: fix DMA API warning
Ulf Hansson <ulf.hansson(a)linaro.org>
mmc: core: Reset HPI enabled state during re-init and in case of errors
Jörgen Storvist <jorgen.storvist(a)gmail.com>
USB: serial: option: add Telit LN940 series
Jörgen Storvist <jorgen.storvist(a)gmail.com>
USB: serial: option: add Fibocom NL668 series
Jörgen Storvist <jorgen.storvist(a)gmail.com>
USB: serial: option: add Simcom SIM7500/SIM7600 (MBIM mode)
Tore Anderson <tore(a)fud.no>
USB: serial: option: add HP lt4132
Jörgen Storvist <jorgen.storvist(a)gmail.com>
USB: serial: option: add GosunCn ZTE WeLink ME3630
Mathias Nyman <mathias.nyman(a)linux.intel.com>
xhci: Don't prevent USB2 bus suspend in state check intended for USB3 only
Hui Peng <benquike(a)gmail.com>
USB: hso: Fix OOB memory access in hso_probe/hso_get_config_data
-------------
Diffstat:
Makefile | 4 +-
arch/arm/mach-imx/cpuidle-imx6sx.c | 2 +-
arch/mips/boot/compressed/calc_vmlinuz_load_addr.c | 7 ++-
arch/mips/include/asm/pgtable-64.h | 5 ++
arch/powerpc/boot/crt0.S | 4 +-
arch/x86/crypto/chacha20_glue.c | 1 +
arch/x86/include/asm/kvm_host.h | 2 +-
arch/x86/kernel/cpu/mtrr/if.c | 2 +
arch/x86/kvm/vmx.c | 19 +++++-
arch/x86/kvm/x86.c | 3 +-
block/blk-lib.c | 26 ++-------
drivers/gpio/gpio-max7301.c | 12 +---
drivers/gpu/drm/drm_ioctl.c | 10 +++-
drivers/hv/vmbus_drv.c | 20 +++++++
drivers/hwtracing/intel_th/msu.c | 3 +-
drivers/input/keyboard/omap4-keypad.c | 16 ++----
drivers/input/mouse/elan_i2c_core.c | 1 +
drivers/iommu/intel-iommu.c | 4 +-
drivers/isdn/capi/kcapi.c | 4 +-
drivers/media/platform/vivid/vivid-vid-cap.c | 2 +
drivers/misc/genwqe/card_utils.c | 2 +-
drivers/mmc/core/mmc.c | 4 +-
drivers/mmc/host/omap_hsmmc.c | 12 +++-
drivers/net/ethernet/ibm/ibmveth.c | 6 +-
drivers/net/usb/hso.c | 18 +++++-
drivers/net/wireless/b43/phy_common.c | 2 +-
drivers/net/xen-netfront.c | 2 +-
drivers/power/olpc_battery.c | 4 +-
drivers/s390/scsi/zfcp_aux.c | 6 +-
drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +-
drivers/spi/spi-bcm2835.c | 16 +++---
drivers/usb/class/cdc-acm.c | 10 ++++
drivers/usb/class/cdc-acm.h | 1 +
drivers/usb/host/r8a66597-hcd.c | 5 +-
drivers/usb/host/xhci-hub.c | 3 +-
drivers/usb/serial/option.c | 20 ++++++-
drivers/usb/serial/pl2303.c | 5 ++
drivers/usb/serial/pl2303.h | 5 ++
drivers/vhost/vhost.c | 2 +
fs/ceph/caps.c | 1 -
fs/cifs/smb2maperror.c | 4 +-
fs/dlm/lock.c | 17 +++---
fs/dlm/lockspace.c | 2 +-
fs/ext4/inline.c | 5 +-
fs/ext4/resize.c | 2 +-
fs/ext4/super.c | 13 ++++-
fs/gfs2/rgrp.c | 2 +-
include/net/gro_cells.h | 1 +
include/net/sock.h | 36 +++++++++++-
include/trace/events/ext4.h | 20 +++++++
include/uapi/linux/input-event-codes.h | 9 +++
kernel/fork.c | 13 ++++-
kernel/memremap.c | 11 ++--
mm/memory_hotplug.c | 16 ++++++
net/9p/client.c | 21 +++++++
net/ax25/af_ax25.c | 11 +++-
net/ax25/ax25_dev.c | 2 +
net/compat.c | 15 +++--
net/core/sock.c | 3 +
net/ieee802154/6lowpan/tx.c | 3 +
net/ipv4/ipmr.c | 2 +
net/ipv6/ip6_udp_tunnel.c | 3 +-
net/ipv6/ip6mr.c | 4 ++
net/netrom/af_netrom.c | 15 +++--
net/packet/af_packet.c | 8 ++-
net/sctp/ipv6.c | 1 +
net/sunrpc/auth_gss/svcauth_gss.c | 8 +--
net/sunrpc/cache.c | 10 +++-
net/sunrpc/svcsock.c | 2 +-
net/vmw_vsock/vmci_transport.c | 67 ++++++++++++++++------
net/xfrm/xfrm_state.c | 2 +-
scripts/checkstack.pl | 4 +-
sound/core/pcm.c | 2 +
sound/pci/cs46xx/dsp_spos.c | 3 +
sound/pci/emu10k1/emufx.c | 5 ++
sound/pci/hda/hda_tegra.c | 2 +
sound/pci/hda/patch_conexant.c | 1 +
sound/pci/rme9652/hdsp.c | 10 ++--
sound/synth/emux/emux_hwdep.c | 7 ++-
sound/usb/mixer.c | 10 +++-
sound/usb/quirks-table.h | 3 +
tools/perf/util/pmu.c | 8 +--
82 files changed, 489 insertions(+), 167 deletions(-)
Do you need to edit your photos?
Here are the editing service we mostly for the photos from our clients.
Photos cut out background , clipping path, and also retouching.
You may send some photos to us. we will let our editing staffs to work on
them.
Thanks,
Ruby
area->size can include adjacent guard page but get_vm_area_size()
returns actual size of the area.
This fixes possible kernel crash when userspace tries to map area
on 1 page bigger: size check passes but the following vmalloc_to_page()
returns NULL on last guard (non-existing) page.
Signed-off-by: Roman Penyaev <rpenyaev(a)suse.de>
Cc: Andrew Morton <akpm(a)linux-foundation.org>
Cc: Michal Hocko <mhocko(a)suse.com>
Cc: Andrey Ryabinin <aryabinin(a)virtuozzo.com>
Cc: Joe Perches <joe(a)perches.com>
Cc: "Luis R. Rodriguez" <mcgrof(a)kernel.org>
Cc: linux-mm(a)kvack.org
Cc: linux-kernel(a)vger.kernel.org
Cc: stable(a)vger.kernel.org
---
mm/vmalloc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 871e41c55e23..2cd24186ba84 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -2248,7 +2248,7 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
if (!(area->flags & VM_USERMAP))
return -EINVAL;
- if (kaddr + size > area->addr + area->size)
+ if (kaddr + size > area->addr + get_vm_area_size(area))
return -EINVAL;
do {
--
2.19.1
While mapping DMA for scatter list when a scsi command is queued the
existing call to dma_alloc_coherent() in our map_sg_data() function
passes zero for the gfp_flags parameter. We are most definitly in atomic
context at this point as queue_command() is called in softirq context
and further we have a spinlock holding the scsi host lock.
Fix this by passing GFP_ATOMIC to dma_alloc_coherent() to prevent any
sort of sleeping in atomic context deadlock.
Fixes: 4dddbc26c389 ("[SCSI] ibmvscsi: handle large scatter/gather lists")
Cc: stable(a)vger.kernel.org
Signed-off-by: Tyrel Datwyler <tyreld(a)linux.vnet.ibm.com>
---
drivers/scsi/ibmvscsi/ibmvscsi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index 1135e74..cb8535e 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -731,7 +731,7 @@ static int map_sg_data(struct scsi_cmnd *cmd,
evt_struct->ext_list = (struct srp_direct_buf *)
dma_alloc_coherent(dev,
SG_ALL * sizeof(struct srp_direct_buf),
- &evt_struct->ext_list_token, 0);
+ &evt_struct->ext_list_token, GFP_ATOMIC);
if (!evt_struct->ext_list) {
if (!firmware_has_feature(FW_FEATURE_CMO))
sdev_printk(KERN_ERR, cmd->device,
--
1.8.3.1
From: Bartosz Golaszewski <bgolaszewski(a)baylibre.com>
Nested interrupts run inside the calling thread's context and the top
half handler is never called which means that we never read the
timestamp.
This issue came up when trying to read line events from a gpiochip
using regmap_irq_chip for interrupts.
Fix it by reading the timestamp from the irq thread function if it's
still 0 by the time the second handler is called.
Fixes: d58f2bf261fd ("gpio: Timestamp events in hardirq handler")
Cc: stable(a)vger.kernel.org
Signed-off-by: Bartosz Golaszewski <bgolaszewski(a)baylibre.com>
---
v1 -> v2:
- add Fixes: to the commit message and Cc stable
- directly assing ktime_get_real_ns() to ge.timestamp
drivers/gpio/gpiolib.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 1651d7f0a303..d1adfdf50fb3 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -828,7 +828,14 @@ static irqreturn_t lineevent_irq_thread(int irq, void *p)
/* Do not leak kernel stack to userspace */
memset(&ge, 0, sizeof(ge));
- ge.timestamp = le->timestamp;
+ /*
+ * We may be running from a nested threaded interrupt in which case
+ * we didn't get the timestamp from lineevent_irq_handler().
+ */
+ if (!le->timestamp)
+ ge.timestamp = ktime_get_real_ns();
+ else
+ ge.timestamp = le->timestamp;
if (le->eflags & GPIOEVENT_REQUEST_RISING_EDGE
&& le->eflags & GPIOEVENT_REQUEST_FALLING_EDGE) {
--
2.19.1
This is a note to let you know that I've just added the patch titled
tty: Don't hold ldisc lock in tty_reopen() if ldisc present
to my tty git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
in the tty-linus branch.
The patch will show up in the next release of the linux-next tree
(usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the
next -rc kernel release.
If you have any questions about this process, please let me know.
>From d3736d82e8169768218ee0ef68718875918091a0 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima(a)arista.com>
Date: Wed, 9 Jan 2019 01:17:40 +0000
Subject: tty: Don't hold ldisc lock in tty_reopen() if ldisc present
Try to get reference for ldisc during tty_reopen().
If ldisc present, we don't need to do tty_ldisc_reinit() and lock the
write side for line discipline semaphore.
Effectively, it optimizes fast-path for tty_reopen(), but more
importantly it won't interrupt ongoing IO on the tty as no ldisc change
is needed.
Fixes user-visible issue when tty_reopen() interrupted login process for
user with a long password, observed and reported by Lukas.
Fixes: c96cf923a98d ("tty: Don't block on IO when ldisc change is pending")
Fixes: 83d817f41070 ("tty: Hold tty_ldisc_lock() during tty_reopen()")
Cc: Jiri Slaby <jslaby(a)suse.com>
Reported-by: Lukas F. Hartmann <lukas(a)mntmn.com>
Tested-by: Lukas F. Hartmann <lukas(a)mntmn.com>
Cc: stable <stable(a)vger.kernel.org>
Signed-off-by: Dmitry Safonov <dima(a)arista.com>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
---
drivers/tty/tty_io.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index bfe9ad85b362..23c6fd238422 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -1256,7 +1256,8 @@ static void tty_driver_remove_tty(struct tty_driver *driver, struct tty_struct *
static int tty_reopen(struct tty_struct *tty)
{
struct tty_driver *driver = tty->driver;
- int retval;
+ struct tty_ldisc *ld;
+ int retval = 0;
if (driver->type == TTY_DRIVER_TYPE_PTY &&
driver->subtype == PTY_TYPE_MASTER)
@@ -1268,13 +1269,18 @@ static int tty_reopen(struct tty_struct *tty)
if (test_bit(TTY_EXCLUSIVE, &tty->flags) && !capable(CAP_SYS_ADMIN))
return -EBUSY;
- retval = tty_ldisc_lock(tty, 5 * HZ);
- if (retval)
- return retval;
+ ld = tty_ldisc_ref_wait(tty);
+ if (ld) {
+ tty_ldisc_deref(ld);
+ } else {
+ retval = tty_ldisc_lock(tty, 5 * HZ);
+ if (retval)
+ return retval;
- if (!tty->ldisc)
- retval = tty_ldisc_reinit(tty, tty->termios.c_line);
- tty_ldisc_unlock(tty);
+ if (!tty->ldisc)
+ retval = tty_ldisc_reinit(tty, tty->termios.c_line);
+ tty_ldisc_unlock(tty);
+ }
if (retval == 0)
tty->count++;
--
2.20.1
The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
>From 283ac6d5fb2a47f12bcef7806b78acf6ad89907e Mon Sep 17 00:00:00 2001
From: Shuah Khan <shuah(a)kernel.org>
Date: Wed, 12 Dec 2018 20:25:14 -0700
Subject: [PATCH] selftests: Fix test errors related to lib.mk khdr target
Commit b2d35fa5fc80 ("selftests: add headers_install to lib.mk") added
khdr target to run headers_install target from the main Makefile. The
logic uses KSFT_KHDR_INSTALL and top_srcdir as controls to initialize
variables and include files to run headers_install from the top level
Makefile. There are a few problems with this logic.
1. Exposes top_srcdir to all tests
2. Common logic impacts all tests
3. Uses KSFT_KHDR_INSTALL, top_srcdir, and khdr in an adhoc way. Tests
add "khdr" dependency in their Makefiles to TEST_PROGS_EXTENDED in
some cases, and STATIC_LIBS in other cases. This makes this framework
confusing to use.
The common logic that runs for all tests even when KSFT_KHDR_INSTALL
isn't defined by the test. top_srcdir is initialized to a default value
when test doesn't initialize it. It works for all tests without a sub-dir
structure and tests with sub-dir structure fail to build.
e.g: make -C sparc64/drivers/ or make -C drivers/dma-buf
../../lib.mk:20: ../../../../scripts/subarch.include: No such file or directory
make: *** No rule to make target '../../../../scripts/subarch.include'. Stop.
There is no reason to require all tests to define top_srcdir and there is
no need to require tests to add khdr dependency using adhoc changes to
TEST_* and other variables.
Fix it with a consistent use of KSFT_KHDR_INSTALL and top_srcdir from tests
that have the dependency on headers_install.
Change common logic to include khdr target define and "all" target with
dependency on khdr when KSFT_KHDR_INSTALL is defined.
Only tests that have dependency on headers_install have to define just
the KSFT_KHDR_INSTALL, and top_srcdir variables and there is no need to
specify khdr dependency in the test Makefiles.
Fixes: b2d35fa5fc80 ("selftests: add headers_install to lib.mk")
Cc: stable(a)vger.kernel.org
Signed-off-by: Shuah Khan <shuah(a)kernel.org>
Reviewed-by: Khalid Aziz <khalid.aziz(a)oracle.com>
Reviewed-by: Anders Roxell <anders.roxell(a)linaro.org>
Signed-off-by: Shuah Khan <shuah(a)kernel.org>
diff --git a/tools/testing/selftests/android/Makefile b/tools/testing/selftests/android/Makefile
index d9a725478375..72c25a3cb658 100644
--- a/tools/testing/selftests/android/Makefile
+++ b/tools/testing/selftests/android/Makefile
@@ -6,7 +6,7 @@ TEST_PROGS := run.sh
include ../lib.mk
-all: khdr
+all:
@for DIR in $(SUBDIRS); do \
BUILD_TARGET=$(OUTPUT)/$$DIR; \
mkdir $$BUILD_TARGET -p; \
diff --git a/tools/testing/selftests/futex/functional/Makefile b/tools/testing/selftests/futex/functional/Makefile
index ad1eeb14fda7..30996306cabc 100644
--- a/tools/testing/selftests/futex/functional/Makefile
+++ b/tools/testing/selftests/futex/functional/Makefile
@@ -19,6 +19,7 @@ TEST_GEN_FILES := \
TEST_PROGS := run.sh
top_srcdir = ../../../../..
+KSFT_KHDR_INSTALL := 1
include ../../lib.mk
$(TEST_GEN_FILES): $(HEADERS)
diff --git a/tools/testing/selftests/gpio/Makefile b/tools/testing/selftests/gpio/Makefile
index f22b22aef7bf..0bb80619db58 100644
--- a/tools/testing/selftests/gpio/Makefile
+++ b/tools/testing/selftests/gpio/Makefile
@@ -16,8 +16,6 @@ TEST_PROGS_EXTENDED := gpio-mockup-chardev
GPIODIR := $(realpath ../../../gpio)
GPIOOBJ := gpio-utils.o
-include ../lib.mk
-
all: $(TEST_PROGS_EXTENDED)
override define CLEAN
@@ -25,7 +23,9 @@ override define CLEAN
$(MAKE) -C $(GPIODIR) OUTPUT=$(GPIODIR)/ clean
endef
-$(TEST_PROGS_EXTENDED):| khdr
+KSFT_KHDR_INSTALL := 1
+include ../lib.mk
+
$(TEST_PROGS_EXTENDED): $(GPIODIR)/$(GPIOOBJ)
$(GPIODIR)/$(GPIOOBJ):
diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile
index 01a219229238..52bfe5e76907 100644
--- a/tools/testing/selftests/kvm/Makefile
+++ b/tools/testing/selftests/kvm/Makefile
@@ -1,6 +1,7 @@
all:
top_srcdir = ../../../..
+KSFT_KHDR_INSTALL := 1
UNAME_M := $(shell uname -m)
LIBKVM = lib/assert.c lib/elf.c lib/io.c lib/kvm_util.c lib/ucall.c lib/sparsebit.c
@@ -44,7 +45,6 @@ $(OUTPUT)/libkvm.a: $(LIBKVM_OBJ)
all: $(STATIC_LIBS)
$(TEST_GEN_PROGS): $(STATIC_LIBS)
-$(STATIC_LIBS):| khdr
cscope: include_paths = $(LINUX_TOOL_INCLUDE) $(LINUX_HDR_PATH) include lib ..
cscope:
diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk
index 0a8e75886224..8b0f16409ed7 100644
--- a/tools/testing/selftests/lib.mk
+++ b/tools/testing/selftests/lib.mk
@@ -16,18 +16,18 @@ TEST_GEN_PROGS := $(patsubst %,$(OUTPUT)/%,$(TEST_GEN_PROGS))
TEST_GEN_PROGS_EXTENDED := $(patsubst %,$(OUTPUT)/%,$(TEST_GEN_PROGS_EXTENDED))
TEST_GEN_FILES := $(patsubst %,$(OUTPUT)/%,$(TEST_GEN_FILES))
+ifdef KSFT_KHDR_INSTALL
top_srcdir ?= ../../../..
include $(top_srcdir)/scripts/subarch.include
ARCH ?= $(SUBARCH)
-all: $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES)
-
.PHONY: khdr
khdr:
make ARCH=$(ARCH) -C $(top_srcdir) headers_install
-ifdef KSFT_KHDR_INSTALL
-$(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES):| khdr
+all: khdr $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES)
+else
+all: $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES)
endif
.ONESHELL:
diff --git a/tools/testing/selftests/networking/timestamping/Makefile b/tools/testing/selftests/networking/timestamping/Makefile
index 14cfcf006936..c46c0eefab9e 100644
--- a/tools/testing/selftests/networking/timestamping/Makefile
+++ b/tools/testing/selftests/networking/timestamping/Makefile
@@ -6,6 +6,7 @@ TEST_PROGS := hwtstamp_config rxtimestamp timestamping txtimestamp
all: $(TEST_PROGS)
top_srcdir = ../../../../..
+KSFT_KHDR_INSTALL := 1
include ../../lib.mk
clean:
diff --git a/tools/testing/selftests/tc-testing/bpf/Makefile b/tools/testing/selftests/tc-testing/bpf/Makefile
index dc92eb271d9a..be5a5e542804 100644
--- a/tools/testing/selftests/tc-testing/bpf/Makefile
+++ b/tools/testing/selftests/tc-testing/bpf/Makefile
@@ -4,6 +4,7 @@ APIDIR := ../../../../include/uapi
TEST_GEN_FILES = action.o
top_srcdir = ../../../../..
+KSFT_KHDR_INSTALL := 1
include ../../lib.mk
CLANG ?= clang
diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile
index 6e67e726e5a5..e13eb6cc8901 100644
--- a/tools/testing/selftests/vm/Makefile
+++ b/tools/testing/selftests/vm/Makefile
@@ -25,6 +25,7 @@ TEST_GEN_FILES += virtual_address_range
TEST_PROGS := run_vmtests
+KSFT_KHDR_INSTALL := 1
include ../lib.mk
$(OUTPUT)/userfaultfd: LDLIBS += -lpthread
on i386 or x86_64:
Lots of build errors for drivers/pinctrl/mediatek/pinctrl-moore.c when
CONFIG_OF is not enabled (but COMPILE_TEST is).
first this:
WARNING: unmet direct dependencies detected for PINCTRL_MTK_MOORE
Depends on [n]: PINCTRL [=y] && (ARCH_MEDIATEK || COMPILE_TEST [=y]) && OF [=n]
Selected by [y]:
- PINCTRL_MT7623 [=y] && PINCTRL [=y] && (ARCH_MEDIATEK || COMPILE_TEST [=y]) && (MACH_MT7623 || COMPILE_TEST [=y])
and then:
../drivers/pinctrl/mediatek/pinctrl-moore.c:22:44: error: array type has incomplete element type
static const struct pinconf_generic_params mtk_custom_bindings[] = {
^
../drivers/pinctrl/mediatek/pinctrl-moore.c: In function 'mtk_pinmux_set_mux':
../drivers/pinctrl/mediatek/pinctrl-moore.c:46:2: error: implicit declaration of function 'pinmux_generic_get_function' [-Werror=implicit-function-declaration]
func = pinmux_generic_get_function(pctldev, selector);
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:46:7: warning: assignment makes pointer from integer without a cast [enabled by default]
func = pinmux_generic_get_function(pctldev, selector);
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:50:2: error: implicit declaration of function 'pinctrl_generic_get_group' [-Werror=implicit-function-declaration]
grp = pinctrl_generic_get_group(pctldev, group);
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:50:6: warning: assignment makes pointer from integer without a cast [enabled by default]
grp = pinctrl_generic_get_group(pctldev, group);
^
In file included from ../include/linux/printk.h:331:0,
from ../include/linux/kernel.h:14,
from ../include/linux/list.h:9,
from ../include/linux/kobject.h:19,
from ../include/linux/device.h:16,
from ../include/linux/gpio/driver.h:5,
from ../drivers/pinctrl/mediatek/pinctrl-moore.c:11:
../drivers/pinctrl/mediatek/pinctrl-moore.c:55:7: error: dereferencing pointer to incomplete type
func->name, grp->name);
^
../include/linux/dynamic_debug.h:136:9: note: in definition of macro 'dynamic_dev_dbg'
##__VA_ARGS__); \
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:54:2: note: in expansion of macro 'dev_dbg'
dev_dbg(pctldev->dev, "enable function %s group %s\n",
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:55:18: error: dereferencing pointer to incomplete type
func->name, grp->name);
^
../include/linux/dynamic_debug.h:136:9: note: in definition of macro 'dynamic_dev_dbg'
##__VA_ARGS__); \
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:54:2: note: in expansion of macro 'dev_dbg'
dev_dbg(pctldev->dev, "enable function %s group %s\n",
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:57:21: error: dereferencing pointer to incomplete type
for (i = 0; i < grp->num_pins; i++) {
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:59:23: error: dereferencing pointer to incomplete type
int *pin_modes = grp->data;
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:60:16: error: dereferencing pointer to incomplete type
int pin = grp->pins[i];
^
../drivers/pinctrl/mediatek/pinctrl-moore.c: In function 'mtk_pinconf_group_get':
../drivers/pinctrl/mediatek/pinctrl-moore.c:357:2: error: implicit declaration of function 'pinctrl_generic_get_group_pins' [-Werror=implicit-function-declaration]
ret = pinctrl_generic_get_group_pins(pctldev, group, &pins, &npins);
^
../drivers/pinctrl/mediatek/pinctrl-moore.c: At top level:
../drivers/pinctrl/mediatek/pinctrl-moore.c:397:22: error: 'pinctrl_generic_get_group_count' undeclared here (not in a function)
.get_groups_count = pinctrl_generic_get_group_count,
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:398:20: error: 'pinctrl_generic_get_group_name' undeclared here (not in a function)
.get_group_name = pinctrl_generic_get_group_name,
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:399:20: error: 'pinctrl_generic_get_group_pins' undeclared here (not in a function)
.get_group_pins = pinctrl_generic_get_group_pins,
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:400:20: error: 'pinconf_generic_dt_node_to_map_all' undeclared here (not in a function)
.dt_node_to_map = pinconf_generic_dt_node_to_map_all,
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:401:17: error: 'pinconf_generic_dt_free_map' undeclared here (not in a function)
.dt_free_map = pinconf_generic_dt_free_map,
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:405:25: error: 'pinmux_generic_get_function_count' undeclared here (not in a function)
.get_functions_count = pinmux_generic_get_function_count,
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:406:23: error: 'pinmux_generic_get_function_name' undeclared here (not in a function)
.get_function_name = pinmux_generic_get_function_name,
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:407:25: error: 'pinmux_generic_get_function_groups' undeclared here (not in a function)
.get_function_groups = pinmux_generic_get_function_groups,
^
../drivers/pinctrl/mediatek/pinctrl-moore.c: In function 'mtk_build_gpiochip':
../drivers/pinctrl/mediatek/pinctrl-moore.c:521:6: error: 'struct gpio_chip' has no member named 'of_node'
chip->of_node = np;
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:522:6: error: 'struct gpio_chip' has no member named 'of_gpio_n_cells'
chip->of_gpio_n_cells = 2;
^
../drivers/pinctrl/mediatek/pinctrl-moore.c: In function 'mtk_build_groups':
../drivers/pinctrl/mediatek/pinctrl-moore.c:552:16: error: invalid use of undefined type 'struct group_desc'
const struct group_desc *group = hw->soc->grps + i;
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:554:3: error: implicit declaration of function 'pinctrl_generic_add_group' [-Werror=implicit-function-declaration]
err = pinctrl_generic_add_group(hw->pctrl, group->name,
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:554:51: error: dereferencing pointer to incomplete type
err = pinctrl_generic_add_group(hw->pctrl, group->name,
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:555:12: error: dereferencing pointer to incomplete type
group->pins, group->num_pins,
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:555:25: error: dereferencing pointer to incomplete type
group->pins, group->num_pins,
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:556:12: error: dereferencing pointer to incomplete type
group->data);
^
In file included from ../include/linux/gpio/driver.h:5:0,
from ../drivers/pinctrl/mediatek/pinctrl-moore.c:11:
../drivers/pinctrl/mediatek/pinctrl-moore.c:559:10: error: dereferencing pointer to incomplete type
group->name);
^
../include/linux/device.h:1463:32: note: in definition of macro 'dev_err'
_dev_err(dev, dev_fmt(fmt), ##__VA_ARGS__)
^
../drivers/pinctrl/mediatek/pinctrl-moore.c: In function 'mtk_build_functions':
../drivers/pinctrl/mediatek/pinctrl-moore.c:572:16: error: invalid use of undefined type 'struct function_desc'
const struct function_desc *func = hw->soc->funcs + i;
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:574:3: error: implicit declaration of function 'pinmux_generic_add_function' [-Werror=implicit-function-declaration]
err = pinmux_generic_add_function(hw->pctrl, func->name,
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:574:52: error: dereferencing pointer to incomplete type
err = pinmux_generic_add_function(hw->pctrl, func->name,
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:575:13: error: dereferencing pointer to incomplete type
func->group_names,
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:576:13: error: dereferencing pointer to incomplete type
func->num_group_names,
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:577:13: error: dereferencing pointer to incomplete type
func->data);
^
In file included from ../include/linux/gpio/driver.h:5:0,
from ../drivers/pinctrl/mediatek/pinctrl-moore.c:11:
../drivers/pinctrl/mediatek/pinctrl-moore.c:580:9: error: dereferencing pointer to incomplete type
func->name);
^
../include/linux/device.h:1463:32: note: in definition of macro 'dev_err'
_dev_err(dev, dev_fmt(fmt), ##__VA_ARGS__)
^
In file included from ../include/linux/kernel.h:15:0,
from ../include/linux/list.h:9,
from ../include/linux/kobject.h:19,
from ../include/linux/device.h:16,
from ../include/linux/gpio/driver.h:5,
from ../drivers/pinctrl/mediatek/pinctrl-moore.c:11:
../drivers/pinctrl/mediatek/pinctrl-moore.c: In function 'mtk_moore_pinctrl_probe':
../include/linux/build_bug.h:16:45: error: bit-field '<anonymous>' width not an integer constant
#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:(-!!(e)); }))
^
../include/linux/compiler.h:349:28: note: in expansion of macro 'BUILD_BUG_ON_ZERO'
#define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
^
../include/linux/kernel.h:72:59: note: in expansion of macro '__must_be_array'
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
^
../drivers/pinctrl/mediatek/pinctrl-moore.c:643:31: note: in expansion of macro 'ARRAY_SIZE'
mtk_desc.num_custom_params = ARRAY_SIZE(mtk_custom_bindings);
^
../drivers/pinctrl/mediatek/pinctrl-moore.c: At top level:
../drivers/pinctrl/mediatek/pinctrl-moore.c:22:44: warning: 'mtk_custom_bindings' defined but not used [-Wunused-variable]
static const struct pinconf_generic_params mtk_custom_bindings[] = {
^
cc1: some warnings being treated as errors
../scripts/Makefile.build:276: recipe for target 'drivers/pinctrl/mediatek/pinctrl-moore.o' failed
make[4]: *** [drivers/pinctrl/mediatek/pinctrl-moore.o] Error 1
Fixes: b5af33df50e9 ("pinctrl: mediatek: improve Kconfig dependencies")
Cc: stable(a)vger.kernel.org
Reported-by: Randy Dunlap <rdunlap(a)infradead.org>
Signed-off-by: Ryder Lee <ryder.lee(a)mediatek.com>
---
drivers/pinctrl/mediatek/Kconfig | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/pinctrl/mediatek/Kconfig b/drivers/pinctrl/mediatek/Kconfig
index 1817786..a005cbc 100644
--- a/drivers/pinctrl/mediatek/Kconfig
+++ b/drivers/pinctrl/mediatek/Kconfig
@@ -45,12 +45,14 @@ config PINCTRL_MT2701
config PINCTRL_MT7623
bool "Mediatek MT7623 pin control with generic binding"
depends on MACH_MT7623 || COMPILE_TEST
+ depends on OF
default MACH_MT7623
select PINCTRL_MTK_MOORE
config PINCTRL_MT7629
bool "Mediatek MT7629 pin control"
depends on MACH_MT7629 || COMPILE_TEST
+ depends on OF
default MACH_MT7629
select PINCTRL_MTK_MOORE
@@ -92,6 +94,7 @@ config PINCTRL_MT6797
config PINCTRL_MT7622
bool "MediaTek MT7622 pin control"
+ depends on OF
depends on ARM64 || COMPILE_TEST
default ARM64 && ARCH_MEDIATEK
select PINCTRL_MTK_MOORE
--
1.9.1
Hi,
Here is a series of kprobes blacklist bugfix and improvements mainly
on x86 (since I started testing on qemu-x86).
This has been started from discussion about KPROBE_ENENTS_ON_NOTRACE
configuration. I tried to find notrace functions which can cause kernel
crash with kprobes using following script.
====
#!/bin/sh
i=0;
cat notrace_functions | while read f ; do
if echo p:event$i $f >> /sys/kernel/debug/tracing/kprobe_events; then
echo "Probing on $f"
echo 1 > /sys/kernel/debug/tracing/events/kprobes/event$i/enable
fi
i=$((i+1))
done
====
And I found several functions which must be blacklisted.
- optprobe template code, which is just a template code and
never be executed. Moreover, since it can be copied and
reused, if we probe it, it modifies the template code and
can cause a crash. ([1/9][2/9])
- functions which is called before kprobe_int3_handler()
handles kprobes. This can cause a breakpoint recursion. ([3/9])
- IRQ entry text, which should not be probed since register/pagetable
status has not been stable at that point. ([4/9])
- Suffixed symbols, like .constprop, .part etc. Those suffixed
symbols never be blacklisted even if the non-suffixed version
has been blacklisted. ([5/9])
- hardirq tracer also works before int3 handling. ([6/9])
- preempt_check debug function also is involved in int3 handling.
([7/9])
- RCU debug routine is also called before kprobe_int3_handler().
([8/9])
- Some lockdep functions are also involved in int3 handling.
([9/9])
Of course there still may be some functions which can be called
by configuration change, I'll continue to test it.
Thank you,
---
Masami Hiramatsu (9):
x86/kprobes: Prohibit probing on optprobe template code
x86/kprobes: Move trampoline code into RODATA
x86/kprobes: Prohibit probing on functions before kprobe_int3_handler()
x86/kprobes: Prohibit probing on IRQ handlers directly
kprobes: Search non-suffixed symbol in blacklist
kprobes: Prohibit probing on hardirq tracers
kprobes: Prohibit probing on preempt_check debug functions
kprobes: Prohibit probing on RCU debug routine
kprobes: Prohibit probing on lockdep functions
arch/x86/kernel/alternative.c | 3 ++-
arch/x86/kernel/ftrace.c | 3 ++-
arch/x86/kernel/kprobes/core.c | 7 +++++++
arch/x86/kernel/kprobes/opt.c | 4 ++--
arch/x86/kernel/traps.c | 1 +
kernel/kprobes.c | 21 ++++++++++++++++++++-
kernel/locking/lockdep.c | 7 ++++++-
kernel/rcu/tree.c | 2 ++
kernel/rcu/update.c | 2 ++
kernel/trace/trace_irqsoff.c | 9 +++++++--
kernel/trace/trace_preemptirq.c | 5 +++++
lib/smp_processor_id.c | 7 +++++--
12 files changed, 61 insertions(+), 10 deletions(-)
--
Masami Hiramatsu (Linaro) <mhiramat(a)kernel.org>
The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
>From 4eda776c3cefcb1f01b2d85bd8753f67606282b5 Mon Sep 17 00:00:00 2001
From: Enric Balletbo i Serra <enric.balletbo(a)collabora.com>
Date: Sat, 13 Oct 2018 12:56:54 +0200
Subject: [PATCH] drm/rockchip: psr: do not dereference encoder before it is
null checked.
'encoder' is dereferenced before it is null sanity checked, hence we
potentially have a null pointer dereference bug. Instead, initialise
drm_drv from encoder->dev->dev_private after we are sure 'encoder' is
not null.
Fixes: 5182c1a556d7f ("drm/rockchip: add an common abstracted PSR driver")
Cc: stable(a)vger.kernel.org
Signed-off-by: Enric Balletbo i Serra <enric.balletbo(a)collabora.com>
Signed-off-by: Heiko Stuebner <heiko(a)sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20181013105654.11827-1-enric.…
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_psr.c b/drivers/gpu/drm/rockchip/rockchip_drm_psr.c
index 79d00d861a31..01ff3c858875 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_psr.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_psr.c
@@ -189,12 +189,14 @@ EXPORT_SYMBOL(rockchip_drm_psr_flush_all);
int rockchip_drm_psr_register(struct drm_encoder *encoder,
int (*psr_set)(struct drm_encoder *, bool enable))
{
- struct rockchip_drm_private *drm_drv = encoder->dev->dev_private;
+ struct rockchip_drm_private *drm_drv;
struct psr_drv *psr;
if (!encoder || !psr_set)
return -EINVAL;
+ drm_drv = encoder->dev->dev_private;
+
psr = kzalloc(sizeof(struct psr_drv), GFP_KERNEL);
if (!psr)
return -ENOMEM;
The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
>From 4eda776c3cefcb1f01b2d85bd8753f67606282b5 Mon Sep 17 00:00:00 2001
From: Enric Balletbo i Serra <enric.balletbo(a)collabora.com>
Date: Sat, 13 Oct 2018 12:56:54 +0200
Subject: [PATCH] drm/rockchip: psr: do not dereference encoder before it is
null checked.
'encoder' is dereferenced before it is null sanity checked, hence we
potentially have a null pointer dereference bug. Instead, initialise
drm_drv from encoder->dev->dev_private after we are sure 'encoder' is
not null.
Fixes: 5182c1a556d7f ("drm/rockchip: add an common abstracted PSR driver")
Cc: stable(a)vger.kernel.org
Signed-off-by: Enric Balletbo i Serra <enric.balletbo(a)collabora.com>
Signed-off-by: Heiko Stuebner <heiko(a)sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20181013105654.11827-1-enric.…
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_psr.c b/drivers/gpu/drm/rockchip/rockchip_drm_psr.c
index 79d00d861a31..01ff3c858875 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_psr.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_psr.c
@@ -189,12 +189,14 @@ EXPORT_SYMBOL(rockchip_drm_psr_flush_all);
int rockchip_drm_psr_register(struct drm_encoder *encoder,
int (*psr_set)(struct drm_encoder *, bool enable))
{
- struct rockchip_drm_private *drm_drv = encoder->dev->dev_private;
+ struct rockchip_drm_private *drm_drv;
struct psr_drv *psr;
if (!encoder || !psr_set)
return -EINVAL;
+ drm_drv = encoder->dev->dev_private;
+
psr = kzalloc(sizeof(struct psr_drv), GFP_KERNEL);
if (!psr)
return -ENOMEM;
The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
>From 211929fd3f7c8de4d541b1cc243b82830e5ea1e8 Mon Sep 17 00:00:00 2001
From: Shuah Khan <shuah(a)kernel.org>
Date: Wed, 12 Dec 2018 20:25:14 -0700
Subject: [PATCH] selftests: Fix test errors related to lib.mk khdr target
Commit b2d35fa5fc80 ("selftests: add headers_install to lib.mk") added
khdr target to run headers_install target from the main Makefile. The
logic uses KSFT_KHDR_INSTALL and top_srcdir as controls to initialize
variables and include files to run headers_install from the top level
Makefile. There are a few problems with this logic.
1. Exposes top_srcdir to all tests
2. Common logic impacts all tests
3. Uses KSFT_KHDR_INSTALL, top_srcdir, and khdr in an adhoc way. Tests
add "khdr" dependency in their Makefiles to TEST_PROGS_EXTENDED in
some cases, and STATIC_LIBS in other cases. This makes this framework
confusing to use.
The common logic that runs for all tests even when KSFT_KHDR_INSTALL
isn't defined by the test. top_srcdir is initialized to a default value
when test doesn't initialize it. It works for all tests without a sub-dir
structure and tests with sub-dir structure fail to build.
e.g: make -C sparc64/drivers/ or make -C drivers/dma-buf
../../lib.mk:20: ../../../../scripts/subarch.include: No such file or directory
make: *** No rule to make target '../../../../scripts/subarch.include'. Stop.
There is no reason to require all tests to define top_srcdir and there is
no need to require tests to add khdr dependency using adhoc changes to
TEST_* and other variables.
Fix it with a consistent use of KSFT_KHDR_INSTALL and top_srcdir from tests
that have the dependency on headers_install.
Change common logic to include khdr target define and "all" target with
dependency on khdr when KSFT_KHDR_INSTALL is defined.
Only tests that have dependency on headers_install have to define just
the KSFT_KHDR_INSTALL, and top_srcdir variables and there is no need to
specify khdr dependency in the test Makefiles.
Fixes: b2d35fa5fc80 ("selftests: add headers_install to lib.mk")
Cc: stable(a)vger.kernel.org
Signed-off-by: Shuah Khan <shuah(a)kernel.org>
diff --git a/tools/testing/selftests/android/Makefile b/tools/testing/selftests/android/Makefile
index d9a725478375..72c25a3cb658 100644
--- a/tools/testing/selftests/android/Makefile
+++ b/tools/testing/selftests/android/Makefile
@@ -6,7 +6,7 @@ TEST_PROGS := run.sh
include ../lib.mk
-all: khdr
+all:
@for DIR in $(SUBDIRS); do \
BUILD_TARGET=$(OUTPUT)/$$DIR; \
mkdir $$BUILD_TARGET -p; \
diff --git a/tools/testing/selftests/futex/functional/Makefile b/tools/testing/selftests/futex/functional/Makefile
index ad1eeb14fda7..30996306cabc 100644
--- a/tools/testing/selftests/futex/functional/Makefile
+++ b/tools/testing/selftests/futex/functional/Makefile
@@ -19,6 +19,7 @@ TEST_GEN_FILES := \
TEST_PROGS := run.sh
top_srcdir = ../../../../..
+KSFT_KHDR_INSTALL := 1
include ../../lib.mk
$(TEST_GEN_FILES): $(HEADERS)
diff --git a/tools/testing/selftests/gpio/Makefile b/tools/testing/selftests/gpio/Makefile
index 46648427d537..07f572a1bd3f 100644
--- a/tools/testing/selftests/gpio/Makefile
+++ b/tools/testing/selftests/gpio/Makefile
@@ -10,8 +10,6 @@ TEST_PROGS_EXTENDED := gpio-mockup-chardev
GPIODIR := $(realpath ../../../gpio)
GPIOOBJ := gpio-utils.o
-include ../lib.mk
-
all: $(TEST_PROGS_EXTENDED)
override define CLEAN
@@ -19,7 +17,9 @@ override define CLEAN
$(MAKE) -C $(GPIODIR) OUTPUT=$(GPIODIR)/ clean
endef
-$(TEST_PROGS_EXTENDED):| khdr
+KSFT_KHDR_INSTALL := 1
+include ../lib.mk
+
$(TEST_PROGS_EXTENDED): $(GPIODIR)/$(GPIOOBJ)
$(GPIODIR)/$(GPIOOBJ):
diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile
index 01a219229238..52bfe5e76907 100644
--- a/tools/testing/selftests/kvm/Makefile
+++ b/tools/testing/selftests/kvm/Makefile
@@ -1,6 +1,7 @@
all:
top_srcdir = ../../../..
+KSFT_KHDR_INSTALL := 1
UNAME_M := $(shell uname -m)
LIBKVM = lib/assert.c lib/elf.c lib/io.c lib/kvm_util.c lib/ucall.c lib/sparsebit.c
@@ -44,7 +45,6 @@ $(OUTPUT)/libkvm.a: $(LIBKVM_OBJ)
all: $(STATIC_LIBS)
$(TEST_GEN_PROGS): $(STATIC_LIBS)
-$(STATIC_LIBS):| khdr
cscope: include_paths = $(LINUX_TOOL_INCLUDE) $(LINUX_HDR_PATH) include lib ..
cscope:
diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk
index 0a8e75886224..8b0f16409ed7 100644
--- a/tools/testing/selftests/lib.mk
+++ b/tools/testing/selftests/lib.mk
@@ -16,18 +16,18 @@ TEST_GEN_PROGS := $(patsubst %,$(OUTPUT)/%,$(TEST_GEN_PROGS))
TEST_GEN_PROGS_EXTENDED := $(patsubst %,$(OUTPUT)/%,$(TEST_GEN_PROGS_EXTENDED))
TEST_GEN_FILES := $(patsubst %,$(OUTPUT)/%,$(TEST_GEN_FILES))
+ifdef KSFT_KHDR_INSTALL
top_srcdir ?= ../../../..
include $(top_srcdir)/scripts/subarch.include
ARCH ?= $(SUBARCH)
-all: $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES)
-
.PHONY: khdr
khdr:
make ARCH=$(ARCH) -C $(top_srcdir) headers_install
-ifdef KSFT_KHDR_INSTALL
-$(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES):| khdr
+all: khdr $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES)
+else
+all: $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES)
endif
.ONESHELL:
diff --git a/tools/testing/selftests/networking/timestamping/Makefile b/tools/testing/selftests/networking/timestamping/Makefile
index 14cfcf006936..c46c0eefab9e 100644
--- a/tools/testing/selftests/networking/timestamping/Makefile
+++ b/tools/testing/selftests/networking/timestamping/Makefile
@@ -6,6 +6,7 @@ TEST_PROGS := hwtstamp_config rxtimestamp timestamping txtimestamp
all: $(TEST_PROGS)
top_srcdir = ../../../../..
+KSFT_KHDR_INSTALL := 1
include ../../lib.mk
clean:
diff --git a/tools/testing/selftests/tc-testing/bpf/Makefile b/tools/testing/selftests/tc-testing/bpf/Makefile
index dc92eb271d9a..be5a5e542804 100644
--- a/tools/testing/selftests/tc-testing/bpf/Makefile
+++ b/tools/testing/selftests/tc-testing/bpf/Makefile
@@ -4,6 +4,7 @@ APIDIR := ../../../../include/uapi
TEST_GEN_FILES = action.o
top_srcdir = ../../../../..
+KSFT_KHDR_INSTALL := 1
include ../../lib.mk
CLANG ?= clang
diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile
index 6e67e726e5a5..e13eb6cc8901 100644
--- a/tools/testing/selftests/vm/Makefile
+++ b/tools/testing/selftests/vm/Makefile
@@ -25,6 +25,7 @@ TEST_GEN_FILES += virtual_address_range
TEST_PROGS := run_vmtests
+KSFT_KHDR_INSTALL := 1
include ../lib.mk
$(OUTPUT)/userfaultfd: LDLIBS += -lpthread
On Wed, 2019-01-09 at 15:52 +0000, Sasha Levin wrote:
> Hi,
>
> [This is an automated email]
>
> This commit has been processed because it contains a "Fixes:" tag,
> fixing commit: 79e539453b34 DRM: i915: add mode setting support.
>
> The bot has tested the following trees: v4.20.0, v4.19.13, v4.14.91, v4.9.148, v4.4.169, v3.18.131.
>
> v4.20.0: Failed to apply! Possible dependencies:
> 042bf753842d ("drm/fourcc: Add char_per_block, block_w and block_h in drm_format_info")
> 9c71a6686bfa ("drm: fourcc: Convert drm_format_info kerneldoc to in-line member documentation")
>
> v4.19.13: Failed to apply! Possible dependencies:
> 042bf753842d ("drm/fourcc: Add char_per_block, block_w and block_h in drm_format_info")
> 9c71a6686bfa ("drm: fourcc: Convert drm_format_info kerneldoc to in-line member documentation")
> c76abab59b3c ("drm: Use horizontal and vertical chroma subsampling factor while calculating offsets in the physical address of framebuffer")
>
> v4.14.91: Failed to apply! Possible dependencies:
> 042bf753842d ("drm/fourcc: Add char_per_block, block_w and block_h in drm_format_info")
> 4cc4e1b40f3f ("drm/fourcc: Add a alpha field to drm_format_info")
> 9c71a6686bfa ("drm: fourcc: Convert drm_format_info kerneldoc to in-line member documentation")
> c76abab59b3c ("drm: Use horizontal and vertical chroma subsampling factor while calculating offsets in the physical address of framebuffer")
> ce2d54619a10 ("drm/fourcc: Add is_yuv field to drm_format_info to denote if the format is yuv")
>
> v4.9.148: Failed to apply! Possible dependencies:
> 042bf753842d ("drm/fourcc: Add char_per_block, block_w and block_h in drm_format_info")
> 05fc03217e08 ("drm/mm: Some doc polish")
> 06df8ac682e6 ("drm: kselftest for drm_mm_debug()")
> 14d7f96f90fb ("drm/fb_cma_helper: Add drm_fb_cma_prepare_fb() helper")
> 2bd966d106e3 ("drm: kselftest for drm_mm_replace_node()")
> 2fba0de0a9ec ("drm: kselftest for drm_mm_insert_node_in_range()")
> 393b50f30566 ("drm: kselftest for drm_mm_init()")
> 4636ce93d5b2 ("drm/fb-cma-helper: Add drm_fb_cma_get_gem_addr()")
> 50f0033d1a0f ("drm: Add some kselftests for the DRM range manager (struct drm_mm)")
> 5628648df755 ("drm/fb-cma-helper: Use drm_gem_framebuffer_helper")
> 5705670d0463 ("drm: Track drm_mm allocators and show leaks on shutdown")
> 6259a56ba0e1 ("drm: Add asserts to catch overflow in drm_mm_init() and drm_mm_init_scan()")
> 62a0d98a188c ("drm: allow to use mmuless SoC")
> 72a93e8dd52c ("drm: Take ownership of the dmabuf->obj when exporting")
> 7886692a5804 ("drm: kselftest for drm_mm_insert_node()")
> 900537dc3889 ("drm: kselftest for drm_mm_reserve_node()")
> 940eba2d58a7 ("drm/gem|prime|mm: Use recommened kerneldoc for struct member refs")
> 9a71e277888b ("drm: Extract struct drm_mm_scan from struct drm_mm")
> 9b26f2ed29f8 ("drm: kselftest for drm_mm and alignment")
> b112481bb327 ("drm/cma-helper: simplify setup for drivers with ->dirty callbacks")
> b3ee963fe41d ("drm: Compile time enabling for asserts in drm_mm")
> ba004e39b199 ("drm: Fix kerneldoc for drm_mm_scan_remove_block()")
> c76abab59b3c ("drm: Use horizontal and vertical chroma subsampling factor while calculating offsets in the physical address of framebuffer")
> e6b62714e87c ("drm: Introduce drm_gem_object_{get,put}()")
>
> v4.4.169: Failed to apply! Possible dependencies:
> 042bf753842d ("drm/fourcc: Add char_per_block, block_w and block_h in drm_format_info")
> 14d7f96f90fb ("drm/fb_cma_helper: Add drm_fb_cma_prepare_fb() helper")
> 199c77179c87 ("drm/fb-cma-helper: Add fb_deferred_io support")
> 1eb83451ba55 ("drm: Pass the user drm_mode_fb_cmd2 as const to .fb_create()")
> 4636ce93d5b2 ("drm/fb-cma-helper: Add drm_fb_cma_get_gem_addr()")
> 5628648df755 ("drm/fb-cma-helper: Use drm_gem_framebuffer_helper")
> 70c0616d5a84 ("drm/fb_cma_helper: remove duplicate const from drm_fb_cma_alloc")
> b112481bb327 ("drm/cma-helper: simplify setup for drivers with ->dirty callbacks")
> c76abab59b3c ("drm: Use horizontal and vertical chroma subsampling factor while calculating offsets in the physical address of framebuffer")
> ce0c57576810 ("drm/fb_cma_helper: Implement fb_mmap callback")
> fdce184609ee ("drm/fb-cma-helper: Use const for drm_framebuffer_funcs argument")
>
> v3.18.131: Failed to apply! Possible dependencies:
> 042bf753842d ("drm/fourcc: Add char_per_block, block_w and block_h in drm_format_info")
> 14d7f96f90fb ("drm/fb_cma_helper: Add drm_fb_cma_prepare_fb() helper")
> 199c77179c87 ("drm/fb-cma-helper: Add fb_deferred_io support")
> 1a396789f65a ("drm: add Atmel HLCDC Display Controller support")
> 1eb83451ba55 ("drm: Pass the user drm_mode_fb_cmd2 as const to .fb_create()")
> 2a8cb4894540 ("drm/exynos: merge exynos_drm_buf.c to exynos_drm_gem.c")
> 2b8376c803c4 ("drm/exynos: remove struct exynos_drm_encoder layer")
> 39a839f2e651 ("drm/exynos: s/exynos_gem_obj/obj in exynos_drm_fbdev.c")
> 421ee18d4e04 ("drm/exynos: fix null pointer dereference issue")
> 4636ce93d5b2 ("drm/fb-cma-helper: Add drm_fb_cma_get_gem_addr()")
> 4846e4520849 ("drm/exynos: clean up machine compatible string check")
> 5628648df755 ("drm/fb-cma-helper: Use drm_gem_framebuffer_helper")
> 5cbb37df378d ("drm/exynos: resolve infinite loop issue on multi-platform")
> 70c0616d5a84 ("drm/fb_cma_helper: remove duplicate const from drm_fb_cma_alloc")
> 7239067795dc ("drm/exynos: remove ifdeferry from initialization code")
> 7ded85885d49 ("drm/exynos: remove superfluous error messages")
> 813fd67b57ff ("drm/exynos: cleanup name of gem object for exynos_drm")
> 820687befec4 ("drm/exynos: move Exynos platform drivers registration to init")
> 94e30d93f936 ("drm/exynos: remove exynos_drm_fb_set_buf_cnt()")
> 96976c3d9aff ("drm/exynos: Add DECON driver")
> b74ea6a97e82 ("drm/exynos: remove DRM_EXYNOS_DMABUF config")
> c76abab59b3c ("drm: Use horizontal and vertical chroma subsampling factor while calculating offsets in the physical address of framebuffer")
> ce0c57576810 ("drm/fb_cma_helper: Implement fb_mmap callback")
> cf67cc9a29ac ("drm/exynos: remove struct exynos_drm_display")
> d38ceaf99ed0 ("drm/amdgpu: add core driver (v4)")
> d56125afcbdf ("drm/exynos: update exynos_drm_framebuffer_init() for multiple buffers")
> e9fbdcb45a36 ("drm/exynos: fix possible infinite loop issue")
>
>
> How should we proceed with this patch?
>
> --
> Thanks,
> Sasha
Hi,
I'm new to kernel development, so: what exactly I'm supposed to do in
such case? Rebase my patch on top of older versions and then resend
patches somewhere?
Just checked the v3.18.131. Apparently code in question was not changed
since then, so manual rebase would be trivial.
On 29/11/2018 02:22, Hans van Kranenburg wrote:
> Hi,
>
> As also seen at:
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=914951
>
> Attached there are two serial console output logs. One is starting with
> Xen 4.11 (from debian unstable) as dom0, and the other one without Xen.
>
> [ 2.085543] BUG: unable to handle kernel paging request at
> ffff888d9fffc000
> [ 2.085610] PGD 200c067 P4D 200c067 PUD 0
> [ 2.085674] Oops: 0000 [#1] SMP NOPTI
> [ 2.085736] CPU: 1 PID: 1 Comm: swapper/0 Not tainted
> 4.19.0-trunk-amd64 #1 Debian 4.19.5-1~exp1+pvh1
> [ 2.085823] Hardware name: HP ProLiant DL360 G7, BIOS P68 05/21/2018
> [ 2.085895] RIP: e030:ptdump_walk_pgd_level_core+0x1fd/0x490
> [...]
The offending stable commit is 4074ca7d8a1832921c865d250bbd08f3441b3657
("x86/mm: Move LDT remap out of KASLR region on 5-level paging"), this
is commit d52888aa2753e3063a9d3a0c9f72f94aa9809c15 upstream.
Current upstream kernel is booting fine under Xen, so in general the
patch should be fine. Using an upstream kernel built from above commit
(with the then needed Xen fixup patch 1457d8cf7664f34c4ba534) is fine,
too.
Kirill, are you aware of any prerequisite patch from 4.20 which could be
missing in 4.19.5?
Juergen
Hi,
please pick commit 9aec30371fb095a0c9415f3f0146ae269c3713d8 (leds: pwm:
silently error out on EPROBE_DEFER) from the 4.20 release to the stable
LTS version 4.19.
I own a Odroid HC1 and run Debian testing (with kernel 4.19) on it. It
produces these kernel warnings:
[ 14.718000] leds_pwm pwmleds: unable to request PWM for blue:heartbeat: -517
[ 14.752948] leds_pwm pwmleds: unable to request PWM for blue:heartbeat: -517
[ 14.771394] leds_pwm pwmleds: unable to request PWM for blue:heartbeat: -517
[ 14.799319] leds_pwm pwmleds: unable to request PWM for blue:heartbeat: -517
These messages were misleading me thinking that the blue heartbeat LED
isn't work (it works, but it is off by default).
--
Benjamin Drung
Debian & Ubuntu Developer
Hi Greg and Sasha,
Would you mind picking up this lone patch for 4.19 and 4.14 stable branches?
Attached are backports for 4.19 (applied cleanly) and 4.14 (needed to
be manually backported). Let me know if you'd prefer me to just send
2 emails (one for each patch). I considered using mbox files, but
seems like kind of a waste for a lone patch.
(Note that Autosel already picked up Upstream commit
3bbd3db86470c701091fb1d67f1fab6621debf50 which I would have included
with this one otherwise).
--
Thanks,
~Nick Desaulniers
Hi Greg and Sasha,
Attached is an mbox with a series of patches to allow building the
powerpc kernel with Clang. We have been running continuous integration
that builds and boots the kernel in QEMU for almost two months now with
no regressions. This is on top of 4.19.14, there should be no conflicts
but let me know if I messed something up.
I will send a series for 4.14 in a little bit as well.
Thank you,
Nathan