This is a note to let you know that I've just added the patch titled
PCI: Fix unaligned accesses in VC code
to the 4.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
pci-fix-unaligned-accesses-in-vc-code.patch
and it can be found in the queue-4.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From ef0dab4aae14e25efddf1577736f8450132800c5 Mon Sep 17 00:00:00 2001
From: David Miller <davem@xxxxxxxxxxxxx>
Date: Sat, 18 Jun 2016 23:52:25 -0700
Subject: PCI: Fix unaligned accesses in VC code
From: David Miller <davem@xxxxxxxxxxxxx>
commit ef0dab4aae14e25efddf1577736f8450132800c5 upstream.
The save/restore buffers for VC state is first composed of a 2-byte control
register, then a bunch of 4-byte words.
This causes unaligned accesses which trap on platform such as sparc.
This is easy to fix by simply moving the buffer pointer forward by 4 bytes
instead of 2 after dealing with the control register. The length
adjustment needs to be changed likewise as well.
Fixes: 5f8fc43217a0 ("PCI: Include pci/pcie/Kconfig directly from pci/Kconfig")
Reported-by: Meelis Roos <mroos@xxxxxxxx>
Reported-by: Anatoly Pugachev <matorola@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/pci/vc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/pci/vc.c
+++ b/drivers/pci/vc.c
@@ -221,9 +221,9 @@ static int pci_vc_do_save_buffer(struct
else
pci_write_config_word(dev, pos + PCI_VC_PORT_CTRL,
*(u16 *)buf);
- buf += 2;
+ buf += 4;
}
- len += 2;
+ len += 4;
/*
* If we have any Low Priority VCs and a VC Arbitration Table Offset
Patches currently in stable-queue which might be from davem@xxxxxxxxxxxxx are
queue-4.6/pci-fix-unaligned-accesses-in-vc-code.patch
queue-4.6/cdc_ncm-workaround-for-em7455-silent-data-interface.patch
queue-4.6/macsec-set-actual-real-device-for-xmit-when-protect_frames.patch
queue-4.6/ipv6-fix-mem-leak-in-rt6i_pcpu.patch
queue-4.6/geneve-fix-max_mtu-setting.patch
queue-4.6/net_sched-fix-mirrored-packets-checksum.patch
queue-4.6/packet-use-symmetric-hash-for-packet_fanout_hash.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html