summaryrefslogtreecommitdiff
path: root/drivers/firewire/core-cdev.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-02-06 10:48:49 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-02-06 10:48:49 +0100
commitf6b2ce79b5fbbb330f56262f0f4373d6af60b602 (patch)
tree1228dd9989b03011b9c5b5bd193283dfa8321ec4 /drivers/firewire/core-cdev.c
parentfbe7e38f3e57e38916ae7f248fd6efafeb9ecdd3 (diff)
parent4ec5183ec48656cec489c49f989c508b68b518e3 (diff)
Merge 6.2-rc7 into tty-next
We need the tty/serial fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/firewire/core-cdev.c')
-rw-r--r--drivers/firewire/core-cdev.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
index 9c89f7d53e99..958aa4662ccb 100644
--- a/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
@@ -819,8 +819,10 @@ static int ioctl_send_response(struct client *client, union ioctl_arg *arg)
r = container_of(resource, struct inbound_transaction_resource,
resource);
- if (is_fcp_request(r->request))
+ if (is_fcp_request(r->request)) {
+ kfree(r->data);
goto out;
+ }
if (a->length != fw_get_response_length(r->request)) {
ret = -EINVAL;