From: Eugeniu Rosca <roscaeugeniu@gmail.com>
To: Geert Uytterhoeven <geert+renesas@glider.be>,
Simon Horman <horms+renesas@verge.net.au>,
Chris Brandt <chris.brandt@renesas.com>,
Wolfram Sang <wsa+renesas@sang-engineering.com>,
Ulrich Hecht <ulrich.hecht+renesas@gmail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "George G . Davis" <george_davis@mentor.com>,
Andy Lowe <andy_lowe@mentor.com>,
linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, Magnus Damm <magnus.damm@gmail.com>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Eugeniu Rosca <erosca@de.adit-jv.com>,
Eugeniu Rosca <roscaeugeniu@gmail.com>
Subject: [PATCH 1/6] serial: sh-sci: Reveal ptrval in dev_dbg
Date: Sat, 4 May 2019 02:42:53 +0200 [thread overview]
Message-ID: <20190504004258.23574-2-erosca@de.adit-jv.com> (raw)
In-Reply-To: <20190504004258.23574-1-erosca@de.adit-jv.com>
Starting with v4.15-rc2 commit ad67b74d2469d9 ("printk: hash addresses
printed with %p"), enabling debug prints in sh-sci.c would generate
output like below confusing the users who try to sneak into the
internals of the driver:
sh-sci e6e88000.serial: sci_request_dma: TX: got channel (____ptrval____)
sh-sci e6e88000.serial: sci_request_dma: mapped 4096@(____ptrval____) to 0x00000006798bf000
sh-sci e6e88000.serial: sci_request_dma: RX: got channel (____ptrval____)
sh-sci e6e88000.serial: sci_dma_tx_work_fn: (____ptrval____): 0...2, cookie 2
There are two possible fixes for that:
- get rid of '%p' prints if they don't reveal any useful information
- s/%p/%px/, since it is unlikely we have any concerns leaking the
pointer values when running a debug/non-production kernel
Go second route to preserve original debug output and minimize the diff.
Fixes: ad67b74d2469d9 ("printk: hash addresses printed with %p")
Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com>
---
drivers/tty/serial/sh-sci.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 3cd139752d3f..82660f8e6d86 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -1434,7 +1434,7 @@ static void sci_dma_tx_work_fn(struct work_struct *work)
goto switch_to_pio;
}
- dev_dbg(port->dev, "%s: %p: %d...%d, cookie %d\n",
+ dev_dbg(port->dev, "%s: %px: %d...%d, cookie %d\n",
__func__, xmit->buf, xmit->tail, xmit->head, s->cookie_tx);
dma_async_issue_pending(chan);
@@ -1570,7 +1570,7 @@ static void sci_request_dma(struct uart_port *port)
return;
chan = sci_request_dma_chan(port, DMA_MEM_TO_DEV);
- dev_dbg(port->dev, "%s: TX: got channel %p\n", __func__, chan);
+ dev_dbg(port->dev, "%s: TX: got channel %px\n", __func__, chan);
if (chan) {
/* UART circular tx buffer is an aligned page. */
s->tx_dma_addr = dma_map_single(chan->device->dev,
@@ -1581,7 +1581,7 @@ static void sci_request_dma(struct uart_port *port)
dev_warn(port->dev, "Failed mapping Tx DMA descriptor\n");
dma_release_channel(chan);
} else {
- dev_dbg(port->dev, "%s: mapped %lu@%p to %pad\n",
+ dev_dbg(port->dev, "%s: mapped %lu@%px to %pad\n",
__func__, UART_XMIT_SIZE,
port->state->xmit.buf, &s->tx_dma_addr);
@@ -1591,7 +1591,7 @@ static void sci_request_dma(struct uart_port *port)
}
chan = sci_request_dma_chan(port, DMA_DEV_TO_MEM);
- dev_dbg(port->dev, "%s: RX: got channel %p\n", __func__, chan);
+ dev_dbg(port->dev, "%s: RX: got channel %px\n", __func__, chan);
if (chan) {
unsigned int i;
dma_addr_t dma;
--
2.21.0
next prev parent reply other threads:[~2019-05-04 0:45 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-04 0:42 [PATCH 0/6] Zap SCIF2 DMA configuration in R-Car Gen3 DTS Eugeniu Rosca
2019-05-04 0:42 ` Eugeniu Rosca [this message]
2019-05-06 13:47 ` [PATCH 1/6] serial: sh-sci: Reveal ptrval in dev_dbg Simon Horman
2019-05-06 15:24 ` Eugeniu Rosca
2019-05-06 16:46 ` Geert Uytterhoeven
2019-05-06 17:12 ` Eugeniu Rosca
2019-05-04 0:42 ` [PATCH 2/6] Revert "arm64: dts: renesas: r8a7796: Enable DMA for SCIF2" Eugeniu Rosca
2019-05-06 10:02 ` Geert Uytterhoeven
2019-05-06 19:42 ` Eugeniu Rosca
[not found] ` <1557413011-1662-1-git-send-email-george_davis@mentor.com>
2019-05-10 17:10 ` [PATCH] serial: sh-sci: disable DMA for uart_console Eugeniu Rosca
2019-05-10 18:38 ` George G. Davis
2019-05-13 10:28 ` Eugeniu Rosca
2019-05-13 11:13 ` Geert Uytterhoeven
2019-05-13 11:42 ` Simon Horman
2019-05-13 13:51 ` Wolfram Sang
2019-05-13 15:43 ` George G. Davis
2019-05-20 2:18 ` [PATCH 2/6] Revert "arm64: dts: renesas: r8a7796: Enable DMA for SCIF2" Yoshihiro Shimoda
2019-05-20 7:37 ` Geert Uytterhoeven
2019-05-20 9:52 ` Yoshihiro Shimoda
2019-05-04 0:42 ` [PATCH 3/6] arm64: dts: renesas: r8a7795: zap dma configuration in scif2 Eugeniu Rosca
2019-05-04 0:42 ` [PATCH 4/6] Revert "arm64: dts: renesas: r8a77965: Enable DMA for SCIF2" Eugeniu Rosca
2019-05-04 0:42 ` [PATCH 5/6] Revert "arm64: dts: renesas: r8a77990: " Eugeniu Rosca
2019-05-04 0:42 ` [PATCH 6/6] Revert "arm64: dts: renesas: r8a77995: add " Eugeniu Rosca
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190504004258.23574-2-erosca@de.adit-jv.com \
--to=roscaeugeniu@gmail.com \
--cc=andy_lowe@mentor.com \
--cc=chris.brandt@renesas.com \
--cc=devicetree@vger.kernel.org \
--cc=erosca@de.adit-jv.com \
--cc=geert+renesas@glider.be \
--cc=george_davis@mentor.com \
--cc=gregkh@linuxfoundation.org \
--cc=horms+renesas@verge.net.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=magnus.damm@gmail.com \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=ulrich.hecht+renesas@gmail.com \
--cc=wsa+renesas@sang-engineering.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).