The boot loader version reported via sysfs is wrong in case of the
kernel being booted via the Xen PVH boot entry. it should be 2.12
(0x020c), but it is reported to be 2.18 (0x0212).
As the current way to set the version is error prone use the more
readable variant (2 << 8) | 12.
Cc: <stable(a)vger.kernel.org> # 4.12
Signed-off-by: Juergen Gross <jgross(a)suse.com>
---
arch/x86/xen/enlighten_pvh.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/xen/enlighten_pvh.c b/arch/x86/xen/enlighten_pvh.c
index c85d1a88f476..f7f77023288a 100644
--- a/arch/x86/xen/enlighten_pvh.c
+++ b/arch/x86/xen/enlighten_pvh.c
@@ -75,7 +75,7 @@ static void __init init_pvh_bootparams(void)
* Version 2.12 supports Xen entry point but we will use default x86/PC
* environment (i.e. hardware_subarch 0).
*/
- pvh_bootparams.hdr.version = 0x212;
+ pvh_bootparams.hdr.version = (2 << 8) | 12;
pvh_bootparams.hdr.type_of_loader = (9 << 4) | 0; /* Xen loader */
x86_init.acpi.get_root_pointer = pvh_get_root_pointer;
--
2.16.4
This is the start of the stable review cycle for the 4.9.132 release.
There are 59 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 Wed Oct 10 17:55:28 UTC 2018.
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.132-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.132-rc1
Ashish Samant <ashish.samant(a)oracle.com>
ocfs2: fix locking for res->tracking and dlm->tracking_list
Jann Horn <jannh(a)google.com>
proc: restrict kernel stack dumps to root
Ricardo Ribalda Delgado <ricardo.ribalda(a)gmail.com>
gpiolib: Free the last requested descriptor
Leonard Crestez <leonard.crestez(a)nxp.com>
crypto: mxs-dcp - Fix wait logic on chan threads
Waiman Long <longman(a)redhat.com>
crypto: qat - Fix KASAN stack-out-of-bounds bug in adf_probe()
Kai-Heng Feng <kai.heng.feng(a)canonical.com>
ALSA: hda/realtek - Cannot adjust speaker's volume on Dell XPS 27 7760
Aurelien Aptel <aaptel(a)suse.com>
smb2: fix missing files in root share directory listing
Andreas Gruenbacher <agruenba(a)redhat.com>
sysfs: Do not return POSIX ACL xattrs via listxattr
Josh Abraham <j.abraham1776(a)gmail.com>
xen: fix GCC warning and remove duplicate EVTCHN_ROW/EVTCHN_COL usage
Olaf Hering <olaf(a)aepfle.de>
xen: avoid crash in disable_hotplug_cpu
Vitaly Kuznetsov <vkuznets(a)redhat.com>
xen/manage: don't complain about an empty value in control/sysrq node
Dan Carpenter <dan.carpenter(a)oracle.com>
cifs: read overflow in is_valid_oplock_break()
Julian Wiedmann <jwi(a)linux.ibm.com>
s390/qeth: don't dump past end of unknown HW header
Wenjia Zhang <wenjia(a)linux.ibm.com>
s390/qeth: use vzalloc for QUERY OAT buffer
Kai-Heng Feng <kai.heng.feng(a)canonical.com>
r8169: Clear RTL_FLAG_TASK_*_PENDING when clearing RTL_FLAG_TASK_ENABLED
Miguel Ojeda <miguel.ojeda.sandonis(a)gmail.com>
arm64: jump_label.h: use asm_volatile_goto macro instead of "asm goto"
Randy Dunlap <rdunlap(a)infradead.org>
hexagon: modify ffs() and fls() to return int
Randy Dunlap <rdunlap(a)infradead.org>
arch/hexagon: fix kernel/dma.c build warning
Joe Thornber <ejt(a)redhat.com>
dm thin metadata: try to avoid ever aborting transactions
Jacek Tomaka <jacek.tomaka(a)poczta.fm>
perf/x86/intel: Add support/quirk for the MISPREDICT bit on Knights Landing CPUs
Netanel Belgazal <netanel(a)amazon.com>
net: ena: fix driver when PAGE_SIZE == 64kB
Stephen Rothwell <sfr(a)canb.auug.org.au>
fs/cifs: suppress a string overflow warning
Heinz Mauelshagen <heinzm(a)redhat.com>
dm raid: fix rebuild of specific devices by updating superblock
Ben Skeggs <bskeggs(a)redhat.com>
drm/nouveau/TBDdevinit: don't fail when PMU/PRE_OS is missing from VBIOS
Daniel Jurgens <danielj(a)mellanox.com>
net/mlx5: Consider PCI domain in search for next dev
Sagi Grimberg <sagi(a)grimberg.me>
nvmet-rdma: fix possible bogus dereference under heavy load
Ben Hutchings <ben.hutchings(a)codethink.co.uk>
USB: yurex: Check for truncation in yurex_read()
Jann Horn <jannh(a)google.com>
RDMA/ucma: check fd type in ucma_migrate_id()
Sandipan Das <sandipan(a)linux.ibm.com>
perf probe powerpc: Ignore SyS symbols irrespective of endianness
Hisao Tanabe <xtanabe(a)gmail.com>
perf evsel: Fix potential null pointer dereference in perf_evsel__new_idx()
Harry Mallon <hjmallon(a)gmail.com>
HID: hid-saitek: Add device ID for RAT 7 Contagion
Stephen Boyd <swboyd(a)chromium.org>
pinctrl: msm: Really mask level interrupts to prevent latching
Anton Vasilyev <vasilyev(a)ispras.ru>
usb: gadget: fotg210-udc: Fix memory leak of fotg210->ep[i]
Sean O'Brien <seobrien(a)chromium.org>
HID: add support for Apple Magic Keyboards
Daniel Black <daniel(a)linux.ibm.com>
mm: madvise(MADV_DODUMP): allow hugetlbfs pages
Naoya Horiguchi <n-horiguchi(a)ah.jp.nec.com>
tools/vm/page-types.c: fix "defined but not used" warning
Naoya Horiguchi <n-horiguchi(a)ah.jp.nec.com>
tools/vm/slabinfo.c: fix sign-compare warning
Emmanuel Grumbach <emmanuel.grumbach(a)intel.com>
mac80211: shorten the IBSS debug messages
Emmanuel Grumbach <emmanuel.grumbach(a)intel.com>
mac80211: don't Tx a deauth frame if the AP forbade Tx
Ilan Peer <ilan.peer(a)intel.com>
mac80211: Fix station bandwidth setting after channel switch
Emmanuel Grumbach <emmanuel.grumbach(a)intel.com>
mac80211: fix a race between restart and CSA flows
Dan Carpenter <dan.carpenter(a)oracle.com>
cfg80211: fix a type issue in ieee80211_chandef_to_operating_class()
Jon Kuhn <jkuhn(a)barracuda.com>
fs/cifs: don't translate SFM_SLASH (U+F026) to backslash
Jia-Ju Bai <baijiaju1990(a)gmail.com>
net: cadence: Fix a sleep-in-atomic-context bug in macb_halt_tx()
Masahiro Yamada <yamada.masahiro(a)socionext.com>
i2c: uniphier-f: issue STOP only for last message or I2C_M_STOP
Masahiro Yamada <yamada.masahiro(a)socionext.com>
i2c: uniphier: issue STOP only for last message or I2C_M_STOP
Xiao Ni <xni(a)redhat.com>
RAID10 BUG_ON in raise_barrier when force is true and conf->barrier is 0
Will Deacon <will.deacon(a)arm.com>
ARC: atomics: unbork atomic_fetch_##op()
Vincent Whitchurch <vincent.whitchurch(a)axis.com>
gpio: Fix crash due to registration race
Arunk Khandavalli <akhandav(a)codeaurora.org>
cfg80211: nl80211_update_ft_ies() to validate NL80211_ATTR_IE
Peng Li <lipeng321(a)huawei.com>
net: hns: add netif_carrier_off before change speed and duplex
Yuan-Chi Pang <fu3mo6goo(a)gmail.com>
mac80211: mesh: fix HWMP sequence numbering to follow standard
Michael Hennerich <michael.hennerich(a)analog.com>
gpio: adp5588: Fix sleep-in-atomic-context bug
Danek Duvall <duvall(a)comfychair.org>
mac80211_hwsim: correct use of IEEE80211_VHT_CAP_RXSTBC_X
Danek Duvall <duvall(a)comfychair.org>
mac80211: correct use of IEEE80211_VHT_CAP_RXSTBC_X
Paul Mackerras <paulus(a)ozlabs.org>
KVM: PPC: Book3S HV: Don't truncate HPTE index in xlate function
Toke Høiland-Jørgensen <toke(a)toke.dk>
mac80211: Run TXQ teardown code before de-registering interfaces
Frederic Weisbecker <fweisbec(a)gmail.com>
time: Introduce jiffies64_to_nsecs()
Jan Kiszka <jan.kiszka(a)siemens.com>
serial: mvebu-uart: Fix reporting of effective CSIZE to userspace
-------------
Diffstat:
Makefile | 4 +-
arch/arc/include/asm/atomic.h | 2 +-
arch/arm64/include/asm/jump_label.h | 4 +-
arch/hexagon/include/asm/bitops.h | 4 +-
arch/hexagon/kernel/dma.c | 2 +-
arch/powerpc/kvm/book3s_64_mmu_hv.c | 2 +-
arch/x86/events/intel/lbr.c | 4 ++
drivers/crypto/mxs-dcp.c | 53 +++++++++-------
drivers/crypto/qat/qat_c3xxx/adf_drv.c | 6 +-
drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 6 +-
drivers/crypto/qat/qat_c62x/adf_drv.c | 6 +-
drivers/crypto/qat/qat_c62xvf/adf_drv.c | 6 +-
drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 6 +-
drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 6 +-
drivers/gpio/gpio-adp5588.c | 24 +++++--
drivers/gpio/gpiolib-of.c | 1 +
drivers/gpio/gpiolib.c | 2 +-
.../gpu/drm/nouveau/nvkm/subdev/devinit/gm200.c | 3 +-
drivers/hid/hid-apple.c | 9 ++-
drivers/hid/hid-ids.h | 3 +
drivers/hid/hid-saitek.c | 2 +
drivers/i2c/busses/i2c-uniphier-f.c | 7 +--
drivers/i2c/busses/i2c-uniphier.c | 7 +--
drivers/infiniband/core/ucma.c | 6 ++
drivers/md/dm-raid.c | 5 ++
drivers/md/dm-thin-metadata.c | 36 ++++++++++-
drivers/md/dm-thin.c | 73 +++++++++++++++++++---
drivers/md/raid10.c | 5 +-
drivers/net/ethernet/amazon/ena/ena_netdev.c | 10 +--
drivers/net/ethernet/amazon/ena/ena_netdev.h | 11 ++++
drivers/net/ethernet/cadence/macb.c | 2 +-
drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 2 +
drivers/net/ethernet/mellanox/mlx5/core/dev.c | 7 ++-
drivers/net/ethernet/realtek/r8169.c | 9 ++-
drivers/net/wireless/mac80211_hwsim.c | 3 -
drivers/nvme/target/rdma.c | 27 +++++++-
drivers/pinctrl/qcom/pinctrl-msm.c | 24 +++++++
drivers/s390/net/qeth_core_main.c | 5 +-
drivers/s390/net/qeth_l2_main.c | 2 +-
drivers/s390/net/qeth_l3_main.c | 2 +-
drivers/tty/serial/mvebu-uart.c | 4 +-
drivers/usb/gadget/udc/fotg210-udc.c | 15 +++--
drivers/usb/misc/yurex.c | 3 +
drivers/xen/cpu_hotplug.c | 15 ++---
drivers/xen/events/events_base.c | 2 +-
drivers/xen/manage.c | 6 +-
fs/cifs/cifs_unicode.c | 3 -
fs/cifs/cifssmb.c | 11 +++-
fs/cifs/misc.c | 8 +++
fs/cifs/smb2ops.c | 2 +-
fs/ocfs2/dlm/dlmmaster.c | 4 +-
fs/proc/base.c | 14 +++++
fs/xattr.c | 24 +++----
include/linux/jiffies.h | 2 +
kernel/time/time.c | 10 +++
kernel/time/timeconst.bc | 6 ++
mm/madvise.c | 2 +-
net/mac80211/ibss.c | 22 +++----
net/mac80211/main.c | 28 +++++++--
net/mac80211/mesh_hwmp.c | 4 ++
net/mac80211/mlme.c | 70 ++++++++++++++++++++-
net/wireless/nl80211.c | 1 +
net/wireless/util.c | 2 +-
sound/pci/hda/patch_realtek.c | 1 +
tools/perf/arch/powerpc/util/sym-handling.c | 4 +-
tools/perf/util/evsel.c | 5 +-
tools/vm/page-types.c | 6 --
tools/vm/slabinfo.c | 4 +-
68 files changed, 510 insertions(+), 166 deletions(-)
When vc4_plane_state is duplicated ->is_yuv is left assigned to its
previous value, and we never set it back to false when switching to
a non-YUV format.
Fix that by setting ->is_yuv to false in the 'num_planes == 1' branch
of the vc4_plane_setup_clipping_and_scaling() function.
Fixes: fc04023fafecf ("drm/vc4: Add support for YUV planes.")
Cc: <stable(a)vger.kernel.org>
Signed-off-by: Boris Brezillon <boris.brezillon(a)bootlin.com>
---
drivers/gpu/drm/vc4/vc4_plane.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
index d04b3c3246ba..60d5ad19cedd 100644
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
@@ -321,6 +321,7 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state)
if (vc4_state->is_unity)
vc4_state->x_scaling[0] = VC4_SCALING_PPF;
} else {
+ vc4_state->is_yuv = false;
vc4_state->x_scaling[1] = VC4_SCALING_NONE;
vc4_state->y_scaling[1] = VC4_SCALING_NONE;
}
--
2.14.1
Current check for the last extra TRB for zero and unaligned transfers
does not account for isoc OUT. The last TRB of the Buffer Descriptor for
isoc OUT transfers will be retired with HWO=0. As a result, we won't
return early. The req->remaining will be updated to include the BUFSIZ
count of the extra TRB, and the actual number of transferred bytes
calculation will be wrong.
To fix this, check whether it's a short or zero packet and the last TRB
chain bit to return early.
Cc: stable(a)vger.kernel.org
Fixes: c6267a51639b ("usb: dwc3: gadget: align transfers to wMaxPacketSize")
Signed-off-by: Thinh Nguyen <thinhn(a)synopsys.com>
---
drivers/usb/dwc3/gadget.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 032ea7d709ba..c09e4f784810 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -2251,7 +2251,7 @@ static int dwc3_gadget_ep_reclaim_completed_trb(struct dwc3_ep *dep,
* with one TRB pending in the ring. We need to manually clear HWO bit
* from that TRB.
*/
- if ((req->zero || req->unaligned) && (trb->ctrl & DWC3_TRB_CTRL_HWO)) {
+ if ((req->zero || req->unaligned) && !(trb->ctrl & DWC3_TRB_CTRL_CHN)) {
trb->ctrl &= ~DWC3_TRB_CTRL_HWO;
return 1;
}
--
2.11.0