Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Francesco Dolcini <francesco.dolcini@toradex.com>
To:     Richard Zhu <hongxing.zhu@nxp.com>,
        Lucas Stach <l.stach@pengutronix.de>,
        Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
        Rob Herring <robh@kernel.org>,
        =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= <kw@linux.com>,
        Sascha Hauer <s.hauer@pengutronix.de>,
        Pengutronix Kernel Team <kernel@pengutronix.de>,
        Fabio Estevam <festevam@gmail.com>,
        NXP Linux Team <linux-imx@nxp.com>,
        Jason Liu <jason.hui.liu@nxp.com>
Cc:     linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        linux-kernel@vger.kernel.org, Bjorn Helgaas <bhelgaas@google.com>,
        Shawn Guo <shawnguo@kernel.org>,
        Francesco Dolcini <francesco.dolcini@toradex.com>
Subject: [PATCH v1] PCI: imx6: Handle the abort from user-space
Date:   Mon, 31 Jan 2022 08:52:35 +0100
Message-Id: <20220131075235.787432-1-francesco.dolcini@toradex.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?q5xudGt88kvPOnDKUjAU4Uv7ImGpJfI47K0HqsFa3mMf8C7V4YrW9SNFGIDh?=
 =?us-ascii?Q?kCgkr9/oWFZDfLmrIj9Qp6DMqjFiGQcRJiQWBl1uWFn6SmdTFuRFGVgp5pfi?=
 =?us-ascii?Q?IbcVJveZ1GzPw49vK8aXStDSkQlokRFImLWcFCEwhM+zPgfU6g5vJoHIxyUE?=
 =?us-ascii?Q?I8b6Gtn1Hw0gpQi2+F5tDMVJBcHRE8prX/pG8hgbq1sc5AK/omzaQtR6IYx8?=
 =?us-ascii?Q?blrWIFJHGMdR/ZrRH5zbwp+28cSdHolMRX/h8HeqEijBLYws/l+wv1G1mkHC?=
 =?us-ascii?Q?CbB1ySUSOkKieV3r1I97bwYfZ8ZY1y1WQkpSbU5eHb5PIu0wT5Rwz+TMevnz?=
 =?us-ascii?Q?I45FLd1ZYeKj3E5WOkOglOOyG2pP7Xi+2NXpvs352gSLAh7ew13qksVJYnRs?=
 =?us-ascii?Q?tRA2k7KeT5EXl7bgBBfCWPdcu+LoFygmo8oO2onqpL1bnr5HCp6N6J4/M0DP?=
 =?us-ascii?Q?mT18Kj5ms+yWm3tsSt2RLbJc607btsdmiZui/e7Smc1tn7/VHwdsfuPAF+aN?=
 =?us-ascii?Q?CoN6xSmj6yfaF9hTkUNWAy2QOzWSCfNGlTk+TA8Wfm/A7QzWCNburCA1GoI+?=
 =?us-ascii?Q?Y6azQcmAIS+xNqBVLkr1KexNvWNeb2ZMp5HQ7wAGvgqqTqsD5475BiBxs7/C?=
 =?us-ascii?Q?D/Ecue/nfUm4ol0+GOrx17+BRit2wjWCN9JFqfTWMOOEIJWHSboH9rQ6nbTb?=
 =?us-ascii?Q?yn/vkoYSXM5leva0ndQOzYpRfOK1QFOxN6Muog6CmJjzw89K6PWTyGxqr6DS?=
 =?us-ascii?Q?7IunzEXfYL5YamoLHhcvEcq4aBc/mSY9jtQ+tuOWKYoZERZbZcJmCO6t+EyU?=
 =?us-ascii?Q?2GkwrU1JAiHDigT53R6xLWG1Wbw2a2jD0gDUgJxfMTY1ggV8oYe0+CwOptQj?=
 =?us-ascii?Q?dNgj2lLvBx0f9PCjpbUzCZzzTHS9Gbg+m/7ZshBjm9x/f+hoACIwEDDYPXZw?=
 =?us-ascii?Q?FlPV72WESyHHii2zzxk0YD3VnYDpAtKNnwhJOoCuUZCgYHhiol1jN++TGLdC?=
 =?us-ascii?Q?XWQ4BE2ZnxDTMedQj14+HgUNCZkwRRPklVeVbS6RWKV6tbqC7iBBObg8/8Aq?=
 =?us-ascii?Q?+3ZGYnsw7CLPHbgKh5TXI4rbF/cBDOZIx1gPT4H25pB+iFE/UHXbeXWchsP/?=
 =?us-ascii?Q?KrnfGyvR8Vc9iwqkxZWjrVkEKSEGIqLoaGEjwnajcthiRmoZQK35cR/6RXvJ?=
 =?us-ascii?Q?4nOYwrSxrO6Es77/fa8OMJz66QSyBDnBE0qa4x4KwuJTXZ3iAfGp0KkUJDab?=
 =?us-ascii?Q?em+rAPB85zuU/g57KiEFl7hWDRzywCkKUz1D0y04XiIj9tYulbEwDEyjiqDl?=
 =?us-ascii?Q?XAJPTXgsbo70ZfJm7QevincTYB8yH5Pb/XNMH/bsQlSGIgICqAMYk6kl3b+f?=
 =?us-ascii?Q?mEc/MgIg+uq7EydZiU0ioo6pStULzxKqlmMqcyOvRvlakre5y5ti5lGj2ic6?=
 =?us-ascii?Q?a7fLVoyHvdorZUDtrvSWTpDjOoBWW0Zq99w3ag15XwaU09guQ5EHSCiBh6aK?=
 =?us-ascii?Q?cnn3uiVBMo7VfZhrv+yxYw4X4/VyTn2ITaN2fpnQrZ2khdqga1asTFVSj38h?=
 =?us-ascii?Q?QmlQBO7n8UFpgFOMZ5GDL2yO+VE2WayDa/Dsg0V/uka64Uq5HIt7lbKL/Y7R?=
 =?us-ascii?Q?3Geze4wenBcDELO2erGy19OzfwlRCOhw3aKveD6enAFthz8Khh2Blaknb6rd?=
 =?us-ascii?Q?TxFqGA=3D=3D?=
X-OriginatorOrg: toradex.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 45b91400-514d-4bf5-52c5-08d9e48ea8da
X-MS-Exchange-CrossTenant-AuthSource: ZRAP278MB0642.CHEP278.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2022 07:52:41.9786
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: d9995866-0d9b-4251-8315-093f062abab4
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: z0kjJUElJKCLduNDKJ/L4nWlxOJjv8p9D6r+pDlTHOALjukD2ixXkTXnG9HIuMVWSJIgGWqCx3qJzDYbD6OEMkoMnD51HwQBqqYt0LZgV9c=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV0P278MB0436
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Jason Liu <jason.hui.liu@nxp.com>

The driver install one hook to handle the external abort, but issue
is that if the abort introduced from user space code, the following
code unsigned long instr = *(unsigned long *)pc; which will created
another data-abort(page domain fault) if CONFIG_CPU_SW_DOMAIN_PAN.

The patch does not intent to use copy_from_user and then do the hack
due to the security consideration. In fact, we can just return and
report the external abort to user-space.

Link: https://lore.kernel.org/all/20220128082920.591115-1-francesco.dolcini@toradex.com
Signed-off-by: Jason Liu <jason.hui.liu@nxp.com>
Reviewed-by: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Acked-by: Lucas Stach <l.stach@pengutronix.de>
---
rfc -> v1:
 * added Acked-by Lucas Stach
 * include correct header for user_mode()
---
 drivers/pci/controller/dwc/pci-imx6.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index 6974bd5aa116..c47a05332a94 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -22,6 +22,7 @@
 #include <linux/of_address.h>
 #include <linux/pci.h>
 #include <linux/platform_device.h>
+#include <linux/ptrace.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
 #include <linux/resource.h>
@@ -297,8 +298,15 @@ static int imx6q_pcie_abort_handler(unsigned long addr,
 		unsigned int fsr, struct pt_regs *regs)
 {
 	unsigned long pc = instruction_pointer(regs);
-	unsigned long instr = *(unsigned long *)pc;
-	int reg = (instr >> 12) & 15;
+	unsigned long instr;
+	int reg;
+
+	/* if the abort from user-space, just return and report it */
+	if (user_mode(regs))
+		return 1;
+
+	instr = *(unsigned long *)pc;
+	reg = (instr >> 12) & 15;
 
 	/*
 	 * If the instruction being executed was a read,
-- 
2.25.1