github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 14:04:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

firewire: fix potential uaf in outbound_phy_packet_callback()

Browse Source 
commit b7c81f8024 upstream.

&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.

Cc: <stable@vger.kernel.org>
Signed-off-by: Chengfeng Ye <cyeaa@connect.ust.hk>
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20220409041243.603210-2-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Chengfeng Ye 2022-04-09 13:12:41 +09:00 committed by Greg Kroah-Hartman
parent 70d25d4fba
commit e757ff4bbc
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/firewire/core-cdev.c
View File

@ -1480,6 +1480,7 @@ static void outbound_phy_packet_callback(struct fw_packet *packet,
{ {
struct outbound_phy_packet_event *e = struct outbound_phy_packet_event *e =
container_of(packet, struct outbound_phy_packet_event, p); container_of(packet, struct outbound_phy_packet_event, p);
struct client *e_client;
switch (status) { switch (status) {
/* expected: */ /* expected: */
@ -1496,9 +1497,10 @@ static void outbound_phy_packet_callback(struct fw_packet *packet,
} }
e->phy_packet.data[0] = packet->timestamp; e->phy_packet.data[0] = packet->timestamp;
e_client = e->client;
queue_event(e->client, &e->event, &e->phy_packet, queue_event(e->client, &e->event, &e->phy_packet,
sizeof(e->phy_packet) + e->phy_packet.length, NULL, 0); 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) static int ioctl_send_phy_packet(struct client *client, union ioctl_arg *arg)