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:   Chengfeng Ye <cyeaa@connect.ust.hk>
To:     stefanr@s5r6.in-berlin.de
Cc:     linux1394-devel@lists.sourceforge.net,
        linux-kernel@vger.kernel.org, Chengfeng Ye <cyeaa@connect.ust.hk>
Subject: [PATCH v2] firewire: fix potential uaf in outbound_phy_packet_callback()
Date:   Thu,  4 Nov 2021 22:57:00 -0700
Message-Id: <20211105055700.25661-1-cyeaa@connect.ust.hk>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?dhW0OUr2eOXGSm72mnTPtx4kKUzYgCOYa0YkWqrXPICIxey1Tf6LJyhLLf3d?=
 =?us-ascii?Q?oDseixmH+2QhyVOpgpM1KVn2CtWyeh1nM6YETW1ESvAbsHjv44H3DbfAm6d0?=
 =?us-ascii?Q?RlcwWzEdEEWZx/k7Qc3/tsn8EbuusyImIEka/eOJpnv3AqkCosJUJ9hUWG9j?=
 =?us-ascii?Q?L0BzgdNFAtlPcOW0W+EE5Cz6eRHT5Hv+yGvlJO1DFdNRb2FIGhpj6lsBTfO0?=
 =?us-ascii?Q?8UBJBJPP6mAOmnuWGy2NrRwzSRM4W4kOtiK2uVoQ9k02BDXAmknyfZuV5UvL?=
 =?us-ascii?Q?jDwN1XhZkiSBwOD586zBSMYi1Rift2j9rPx4v2H98SXimmpdkckmy2A1zsXX?=
 =?us-ascii?Q?j5u5wusdfdpK/juD/0QrvaZdOMala3U08HDiCqYiTpM7kShxsD/zJnu15Ptf?=
 =?us-ascii?Q?d6nRK1PVT54K4B8niHexWGc/7KRdfMkedjtjhQP10k9SmUFyJtINCCuxcj+J?=
 =?us-ascii?Q?tsT2yummTNaYN2yvlUv+OIZoU1gnnmPAnhoZkvW2gTAu70ie9h7X84V1el2D?=
 =?us-ascii?Q?4DADmeBGIODwBo11OUCeEwg6jSbW9Q0YgQIEvFmkZ98MiQMkqypwM6b6dAaZ?=
 =?us-ascii?Q?ibmLX63Rnf98WkVGZA9GR1g1S2Mpp6YfJvo3Z4K62R+Mx/gY3uudoo9vuZMb?=
 =?us-ascii?Q?gdhZ/v15r0Xf0LmbOnX58fjSXpeB5oaQY0578Z/9jr7gTZHJFRK1fxZbgAzA?=
 =?us-ascii?Q?8fT9eGbL8whp4vdBcA2PMFBah3kKLBlctAO1ZFabVu2TOGIteZ8lp0rYQGMQ?=
 =?us-ascii?Q?JmCy/ZgAFIqCvyveHopHWpav/cWySbqP+J2Ay1gpgOmPWhdD7UYS5T8lU6p9?=
 =?us-ascii?Q?cnlNT3bXFX7kxHZpMcTqRRJ5ZdLtM3sXZEiGnN9yX0+dtkRKpuTylHbVeljl?=
 =?us-ascii?Q?J5PQWv0Yn0BUR87Md2viVs1fmFzjAsDt9tgxONA47DADslXpT81loxEyicNO?=
 =?us-ascii?Q?h85iaUXB+M82FwuEHJ4ccILHsaT/qorfHYe0Qpq1qU+9khwtaHCH0ZBYhT7b?=
 =?us-ascii?Q?v4Ndsts2ScH1vt0JH3AixBypJYjGe/qVXjXhKaLvwBWy0In908t43gGf2rVB?=
 =?us-ascii?Q?W6uyjrpUzgQwAO71TWLMrIeJ6CPfWWrzEaYq6aflOgDp+S4bw0mgPl+vUJmp?=
 =?us-ascii?Q?l+nR8O1hudmpeD6gT22uRSUB8NEmBYQ0FMBPbJkNHYlcmH8BFXkXE3HL2wjP?=
 =?us-ascii?Q?7SdVo5Zg8CJfG2fGRaFaVEsjUUd7FwT/L1BbwdK2lJpzUM1ULHi+rUa6ijJR?=
 =?us-ascii?Q?o/TxkDpNbkerWJs656+s3Vrs2hNpSTI/KuJeH8O+ybMcqChIvrQA24xd4XV1?=
 =?us-ascii?Q?LvrACkkpdK3LRfJv0qDJrxnDcnchzoTJgIKwzhd1rBLScz7XtBK7Gbvi9jSv?=
 =?us-ascii?Q?YRbFs3TXnf9qk/29ttpMTTvuhFcKfYnHkHHBqW10ooL0UVUJ78cbinQA5DTk?=
 =?us-ascii?Q?1bLmM2N2iPMuhAywhgeRntWIEeEW7fb8SWMbKGJYj2NOAQZ7LbmFBURt+Ik6?=
 =?us-ascii?Q?2EVv/LeI+QqcVdFhVyyyOdoBzbdBPh3bbGeFdpVgVy4BOW17chWYPqtWk41+?=
 =?us-ascii?Q?Jd1vJk+klZ6P3WSsQ6nN36z5KnBYIh+0kFJAV8vMlXYC5j82zpXFi9/9DOsr?=
 =?us-ascii?Q?IM7dvsr67tmU3RYJolNSNrE=3D?=
X-OriginatorOrg: connect.ust.hk
X-MS-Exchange-CrossTenant-Network-Message-Id: 6c398826-fb8f-4c67-8d41-08d9a0211b3e
X-MS-Exchange-CrossTenant-AuthSource: TYCP286MB1188.JPNP286.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2021 05:57:10.3673
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 6c1d4152-39d0-44ca-88d9-b8d6ddca0708
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: sDNrevR9auCC5/WBVJzv6ehAJbOccuPkoO5CKJNviwZw3xUTtMbhxJ6kbtDrtnmg/Phbb/eGb+acjPY4PyT80w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCP286MB1281
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

&e->event and e point to the same address, and &e->event could
be freed in queue_event. So there is a potential uaf issue if
we dereference e after calling queue_event(). Fix this by adding
a temporary variable to maintain e->client in advance, this can
avoid the potential uaf issue.

Signed-off-by: Chengfeng Ye <cyeaa@connect.ust.hk>
---
 drivers/firewire/core-cdev.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
index 9f89c17730b1..708e417200f4 100644
--- a/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
@@ -1500,6 +1500,7 @@ static void outbound_phy_packet_callback(struct fw_packet *packet,
 {
 	struct outbound_phy_packet_event *e =
 		container_of(packet, struct outbound_phy_packet_event, p);
+	struct client *e_client;
 
 	switch (status) {
 	/* expected: */
@@ -1516,9 +1517,10 @@ static void outbound_phy_packet_callback(struct fw_packet *packet,
 	}
 	e->phy_packet.data[0] = packet->timestamp;
 
+	e_client = e->client;
 	queue_event(e->client, &e->event, &e->phy_packet,
 		    sizeof(e->phy_packet) + e->phy_packet.length, NULL, 0);
-	client_put(e->client);
+	client_put(e_client);
 }
 
 static int ioctl_send_phy_packet(struct client *client, union ioctl_arg *arg)
-- 
2.17.1