Re: [Qemu-devel] [PATCH v6 3/5] block/archipelago: Add support for creating images

[Stefan Hajnoczi <stefanha@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 3646 bytes --]

On Fri, Jun 27, 2014 at 11:24:10AM +0300, Chrysostomos Nanakos wrote:
> +static int qemu_archipelago_create_volume(Error **errp, const char *volname,
> +                                          char *segment_name,
> +                                          uint64_t size, xport mportno,
> +                                          xport vportno)
> +{
> +    int ret, targetlen;
> +    struct xseg *xseg = NULL;
> +    struct xseg_request *req;
> +    struct xseg_request_clone *xclone;
> +    struct xseg_port *port;
> +    xport srcport = NoPort, sport = NoPort;
> +    char *target;
> +
> +    /* Try default values if none has been set */
> +    if (mportno == (xport) -1) {
> +        mportno = 1001;
> +    }
> +
> +    if (vportno == (xport) -1) {
> +        vportno = 501;
> +    }
> +
> +    if (segment_name == NULL) {
> +        segment_name = g_strdup("archipelago");
> +    }
> +
> +    if (xseg_initialize()) {
> +        error_setg(errp, "Cannot initialize XSEG");
> +        return -1;

Leaks segment_name (if internally allocated)

> +    }
> +
> +    xseg = xseg_join((char *)"posix", segment_name,
> +                     (char *)"posixfd", NULL);
> +
> +    if (!xseg) {
> +        error_setg(errp, "Cannot join XSEG shared memory segment");
> +        return -1;

Leaks segment_name (if internally allocated)

> +    }
> +
> +    port = xseg_bind_dynport(xseg);
> +    srcport = port->portno;
> +    init_local_signal(xseg, sport, srcport);
> +
> +    req = xseg_get_request(xseg, srcport, mportno, X_ALLOC);
> +    if (!req) {
> +        error_setg(errp, "Cannot get XSEG request");
> +        return -1;

Leaks segment_name (if internally allocated)

> +    }
> +
> +    targetlen = strlen(volname);
> +    ret = xseg_prep_request(xseg, req, targetlen,
> +                            sizeof(struct xseg_request_clone));
> +    if (ret < 0) {
> +        error_setg(errp, "Cannot prepare XSEG request");
> +        goto err_exit;
> +    }
> +
> +    target = xseg_get_target(xseg, req);
> +    if (!target) {
> +        error_setg(errp, "Cannot get XSEG target.\n");
> +        goto err_exit;
> +    }
> +    memcpy(target, volname, targetlen);
> +    xclone = (struct xseg_request_clone *) xseg_get_data(xseg, req);
> +    memset(xclone->target, 0 , XSEG_MAX_TARGETLEN);
> +    xclone->targetlen = 0;
> +    xclone->size = size;
> +    req->offset = 0;
> +    req->size = req->datalen;
> +    req->op = X_CLONE;
> +
> +    xport p = xseg_submit(xseg, req, srcport, X_ALLOC);
> +    if (p == NoPort) {
> +        error_setg(errp, "Could not submit XSEG request");
> +        goto err_exit;
> +    }
> +    xseg_signal(xseg, p);
> +
> +    ret = wait_reply(xseg, srcport, port, req);
> +    if (ret < 0) {
> +        error_setg(errp, "wait_reply() error.");
> +    }
> +
> +    xseg_put_request(xseg, req, srcport);
> +    xseg_quit_local_signal(xseg, srcport);
> +    xseg_leave_dynport(xseg, port);
> +    xseg_leave(xseg);
> +    return ret;
> +
> +err_exit:
> +    xseg_put_request(xseg, req, srcport);
> +    xseg_quit_local_signal(xseg, srcport);
> +    xseg_leave_dynport(xseg, port);
> +    xseg_leave(xseg);
> +    return -1;

Leaks segment_name (if internally allocated)

> +    /* Create an Archipelago volume */
> +    ret = qemu_archipelago_create_volume(errp, volname, segment_name,
> +                                         total_size, mport,
> +                                         vport);
> +
> +    if (volname) {
> +        g_free(volname);
> +    }
> +    if (segment_name) {
> +        g_free(segment_name);
> +    }

g_free(NULL) is a nop.  The if statement isn't needed to check NULL
pointers.

[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]