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] firewire: fix potential uaf in outbound_phy_packet_callback()
Date:   Thu,  4 Nov 2021 08:32:53 -0700
Message-Id: <20211104153253.23941-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?adwzjGNpdOw2NcmSnpW876iKrb8pvtpmduvS2LBe3qKJ62OSu6MHEMSKEXzh?=
 =?us-ascii?Q?0HzJtwmEPQw6uO3MkyAYA1V78DGxhovsUqqy1htdN9sE2D0YJKpHLXhoIc65?=
 =?us-ascii?Q?qy36yobiWYbug6z3dwsLtL1CTjYD73T3iJAm85j001B720RgAgLYQ/5ybtKf?=
 =?us-ascii?Q?o9JPwA0t156bd1AFXJpFmDvpqhaMKdbYCwgauS6YsC4bCFuVZpFWhqyEPbG6?=
 =?us-ascii?Q?/cnTpZJbyzqWj63PMmoFkSEzjJNWMGTiChp/4fQjbDtmfE3pMCFOQfBQyWY7?=
 =?us-ascii?Q?lL6rvitkDWjqWKbkf+cOmsTjDe/gLBD766To7+X/gZYMjbgem+9kLATPqHh6?=
 =?us-ascii?Q?pEClchmXXzpttygoWHOyQpNU3ofSS4Spu5RETdjtuq/KbGtPWsJg1GnWkyc8?=
 =?us-ascii?Q?ptNziz7l8BQAMSe7XccKSh/kCxfzmjI1bekaUWnm3DuK6RFhISmVufRTPz69?=
 =?us-ascii?Q?oCPYAePSW4Xjcy0pcWeMLUpO2AuxvJNQSlzPN0MrBO4k7pixmppQJHx+6/LF?=
 =?us-ascii?Q?5cffq6B4FHm6T/gSC7fd15oOFWHCBQzFyOlZkReMP6jzSDCVkVoa/kmU92q7?=
 =?us-ascii?Q?fzh7aP532e3p8kMruP5/lD4KECwbz83XNIc3pyrKH1Za7bb9/aU2pMHiMGL4?=
 =?us-ascii?Q?dxJYKsoNGCOfJbNinFmp8ueHc1ee8mMR9tSMsYH5tbHgV6ENGVaD8stoZQKg?=
 =?us-ascii?Q?EGdoWH1iG2g3OfhnY1hP/RoaOBnWLOubNhvSzGiX18Bf1YETsbtVxcwvvifS?=
 =?us-ascii?Q?P7y337nNYfR977pSH7vW14507d9qx1iKHfPxEYPMOmQmuV6uqeZdkrCFuyo3?=
 =?us-ascii?Q?OfygGuTTgpj6FPzLs3Livdpc/VEzpGcaoFPRMr24bmt/aSvLftrdQD91Dmxh?=
 =?us-ascii?Q?d5b/dSXBkNI0jrrkAhapJUQmq1DnubEydFmbsnDXZVdHqah4SXZs766zi8ei?=
 =?us-ascii?Q?nIy9k++9D/9yR97+1skcYEui3lOc+md8W1mfCRDN6cNXZyv/UKK2QPwWY8Ia?=
 =?us-ascii?Q?rP2veh013GJDq3SZyubpup4HUSJg7LuyAocNsRHuVfUY+1Ge6+s2WZcb9Zd3?=
 =?us-ascii?Q?jP55f2t5WBAJv8zYL7ogOq7eYYPCdPSt1fXAiRErOsxOft2mOX1DkVlSTo56?=
 =?us-ascii?Q?c5x5ILaq6uroPfKca9dteBGaDKdhgmrUW7Iw4Poa0ZMPHDJ9ycq2nuRv8AaW?=
 =?us-ascii?Q?X8fDxyt9XNCU+Q6/DAdvrRHSXkNiKY2KPcVmYwshZhsFTTBxVlLQRz6grwJP?=
 =?us-ascii?Q?+UdjB0ZQhhhHmwZSeS8XjV3idaEUV9PankBDkU8+3BHIuPAg2mz2DdqFhP4U?=
 =?us-ascii?Q?UKSSkxIcMaeoKRkpCW44liwLTAaoqIbfGhNZAHRN4bY2f/V79qjHfXiJsVxQ?=
 =?us-ascii?Q?yW13fHzP00+GU9NorYehPpV5OA68VZBG161r2z/LGqcA5u6XCpLSSlk1sumE?=
 =?us-ascii?Q?zt4v5EskQ9/VdZr9o5qRRVWdfwv2NxhRi/Fh4/EyAhgx0vKz+nxOk5ADoFl9?=
 =?us-ascii?Q?QkJVK1K84rrBqC6NwFhjg5URtEO/8C8TSvBDOz5b7mF7yv1p0lcBFXTHqTqK?=
 =?us-ascii?Q?yfikE6UUMUPuzk0dvgBkK3sFQBGz8TMYAsfl1VSXb8LePAEI5Wb3yhCW3uuO?=
 =?us-ascii?Q?d2YJfDomYDnaXcTdZvAXvQk=3D?=
X-OriginatorOrg: connect.ust.hk
X-MS-Exchange-CrossTenant-Network-Message-Id: 6c6f8ffd-faf6-4355-e411-08d99fa8640f
X-MS-Exchange-CrossTenant-AuthSource: TYCP286MB1188.JPNP286.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2021 15:33:03.4538
 (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: oTIt/dIA0xrSW0i4F7J4wKesARc9a7wUrZLPUGGv09BfilFXhZ2azQimwfZcuAyKgrVIOJZrPtgeuIq6IGB/1g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYAP286MB0427
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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
index 9f89c17730b1..2f47e31918f0 100644
--- a/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
@@ -1516,9 +1516,10 @@ static void outbound_phy_packet_callback(struct fw_packet *packet,
 	}
 	e->phy_packet.data[0] = packet->timestamp;
 
+	struct client *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