From: Greg Kroah-Hartman Date: Fri, 13 Aug 2021 10:39:05 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v4.4.281~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=304a2b486a0ea15bf2352ec790765b93f7adfc2a;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: net-xilinx_emaclite-do-not-print-real-iomem-pointer.patch --- diff --git a/queue-4.14/net-xilinx_emaclite-do-not-print-real-iomem-pointer.patch b/queue-4.14/net-xilinx_emaclite-do-not-print-real-iomem-pointer.patch new file mode 100644 index 00000000000..7cf35d9886f --- /dev/null +++ b/queue-4.14/net-xilinx_emaclite-do-not-print-real-iomem-pointer.patch @@ -0,0 +1,37 @@ +From d0d62baa7f505bd4c59cd169692ff07ec49dde37 Mon Sep 17 00:00:00 2001 +From: YueHaibing +Date: Wed, 19 May 2021 10:47:04 +0800 +Subject: net: xilinx_emaclite: Do not print real IOMEM pointer + +From: YueHaibing + +commit d0d62baa7f505bd4c59cd169692ff07ec49dde37 upstream. + +Printing kernel pointers is discouraged because they might leak kernel +memory layout. This fixes smatch warning: + +drivers/net/ethernet/xilinx/xilinx_emaclite.c:1191 xemaclite_of_probe() warn: + argument 4 to %08lX specifier is cast from pointer + +Signed-off-by: YueHaibing +Signed-off-by: David S. Miller +Signed-off-by: Pavel Machek (CIP) +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +--- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c ++++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c +@@ -1165,9 +1165,8 @@ static int xemaclite_of_probe(struct pla + } + + dev_info(dev, +- "Xilinx EmacLite at 0x%08X mapped to 0x%08X, irq=%d\n", +- (unsigned int __force)ndev->mem_start, +- (unsigned int __force)lp->base_addr, ndev->irq); ++ "Xilinx EmacLite at 0x%08X mapped to 0x%p, irq=%d\n", ++ (unsigned int __force)ndev->mem_start, lp->base_addr, ndev->irq); + return 0; + + error: diff --git a/queue-4.14/series b/queue-4.14/series index 052a2c62d9a..4e1810454a4 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -39,3 +39,4 @@ net-qla3xxx-fix-schedule-while-atomic-in-ql_wait_for.patch usb-ehci-fix-kunpeng920-ehci-hardware-problem.patch ppp-fix-generating-ppp-unit-id-when-ifname-is-not-specified.patch ovl-prevent-private-clone-if-bind-mount-is-not-allowed.patch +net-xilinx_emaclite-do-not-print-real-iomem-pointer.patch