From 187da931841dcb063f9980dad0131931b9fbd0ba Mon Sep 17 00:00:00 2001 From: Roger Pau Monne Date: Thu, 19 Jun 2014 13:06:04 +0200 Subject: [PATCH v5 27/29] xen: fix incorrectly accounted free Fix some frees incorrectly assigned to M_XENBUS when the memory is allocated with M_XENSTORE. Approved by: xxx Sponsored by: Citrix Systems R&D dev/xen/blkback/blkback.c: dev/xen/netback/netback.c: - Fix incorrect frees. --- sys/dev/xen/blkback/blkback.c | 6 +++--- sys/dev/xen/netback/netback.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/xen/blkback/blkback.c b/sys/dev/xen/blkback/blkback.c index f2f2698..654f307 100644 --- a/sys/dev/xen/blkback/blkback.c +++ b/sys/dev/xen/blkback/blkback.c @@ -3852,17 +3852,17 @@ xbb_detach(device_t dev) xbb_close_backend(xbb); if (xbb->dev_mode != NULL) { - free(xbb->dev_mode, M_XENBUS); + free(xbb->dev_mode, M_XENSTORE); xbb->dev_mode = NULL; } if (xbb->dev_type != NULL) { - free(xbb->dev_type, M_XENBUS); + free(xbb->dev_type, M_XENSTORE); xbb->dev_type = NULL; } if (xbb->dev_name != NULL) { - free(xbb->dev_name, M_XENBUS); + free(xbb->dev_name, M_XENSTORE); xbb->dev_name = NULL; } diff --git a/sys/dev/xen/netback/netback.c b/sys/dev/xen/netback/netback.c index 2fbcb74..9097140 100644 --- a/sys/dev/xen/netback/netback.c +++ b/sys/dev/xen/netback/netback.c @@ -2514,7 +2514,7 @@ xen_net_read_mac(device_t dev, uint8_t mac[]) } s = &e[1]; } - free(macstr, M_XENBUS); + free(macstr, M_XENSTORE); } return error; } -- 1.7.7.5 (Apple Git-26)