lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xen/pvcalls-back: fix double frees with pvcalls_new_active_socket()

Browse Source 
commit 8fafac202d18230bb9926bda48e563fd2cce2a4f upstream.

In the pvcalls_new_active_socket() function, most error paths call
pvcalls_back_release_active(fedata->dev, fedata, map) which calls
sock_release() on "sock".  The bug is that the caller also frees sock.

Fix this by making every error path in pvcalls_new_active_socket()
release the sock, and don't free it in the caller.

Fixes: 5db4d286a8 ("xen/pvcalls: implement connect command")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Juergen Gross <jgross@suse.com>
Link: https://lore.kernel.org/r/e5f98dc2-0305-491f-a860-71bbd1398a2f@kili.mountain
Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dan Carpenter 2023-05-03 18:11:35 +03:00 committed by Greg Kroah-Hartman
parent 9b13972e4f
commit c60f38c9bd
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/xen/pvcalls-back.c
View File

@ -321,8 +321,10 @@ static struct sock_mapping *pvcalls_new_active_socket(
void *page; void *page;
map = kzalloc(sizeof(*map), GFP_KERNEL); map = kzalloc(sizeof(*map), GFP_KERNEL);
if (map == NULL) if (map == NULL) {
sock_release(sock);
return NULL; return NULL;
}
map->fedata = fedata; map->fedata = fedata;
map->sock = sock; map->sock = sock;
@ -414,10 +416,8 @@ static int pvcalls_back_connect(struct xenbus_device *dev,
req->u.connect.ref, req->u.connect.ref,
req->u.connect.evtchn, req->u.connect.evtchn,
sock); sock);
if (!map) { if (!map)
ret = -EFAULT; ret = -EFAULT;
sock_release(sock);
}
out: out:
rsp = RING_GET_RESPONSE(&fedata->ring, fedata->ring.rsp_prod_pvt++); rsp = RING_GET_RESPONSE(&fedata->ring, fedata->ring.rsp_prod_pvt++);
@ -558,7 +558,6 @@ static void __pvcalls_back_accept(struct work_struct *work)
sock); sock);
if (!map) { if (!map) {
ret = -EFAULT; ret = -EFAULT;
sock_release(sock);
goto out_error; goto out_error;
} }