From patchwork Tue Jun 18 14:44:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Slavomir Kaslev X-Patchwork-Id: 11001905 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 692B714BB for ; Tue, 18 Jun 2019 14:45:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 595D72892E for ; Tue, 18 Jun 2019 14:45:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4D8D428991; Tue, 18 Jun 2019 14:45:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CDFE42895F for ; Tue, 18 Jun 2019 14:45:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726446AbfFROpG (ORCPT ); Tue, 18 Jun 2019 10:45:06 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:38472 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727105AbfFROpG (ORCPT ); Tue, 18 Jun 2019 10:45:06 -0400 Received: by mail-wm1-f65.google.com with SMTP id s15so3559718wmj.3 for ; Tue, 18 Jun 2019 07:45:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xxLCk7/1n3pRcs/scqet11MZA1mX/44RCBDQLxSkr/g=; b=OjDLnvo/dO/AHh08fb4UlkrrQNC+DahiqPbG65RemvTLqcVz6Q8MLxEY/W8AeYFg/6 kTMRkghPHndcipq5Akx5dg7UbyJlLzUkeVfWj9MASZPMO4SetBYlOhP5pCvPXDVZloL6 71b255AEQarkoj7wXbo/ZBHGrYV/iwaYOV0IVWOawJyQySssgw/GYIHU6iO0tP6IIrQC xMSBBdOBNN76jP309Bx/+trmVVxRrLOvn7UlZG3UoMNQzC9me9U5zL7MDF8BvsA950tp zOs1WDVYJ1JXiAMq6qpgGAJ9av8i2ejNLwzjEfQrc6sABRILKkMV5yNs0P5+qNDd5aL+ XYPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xxLCk7/1n3pRcs/scqet11MZA1mX/44RCBDQLxSkr/g=; b=S1ROZ5BP3noLVVDzCEeH0iRb/vpToi3S2q/Y1ffQasJ0FR6EUdlr3ft4VNa36QZ3A5 0/z4Az1ktXENMMxz3j0oCRFs2eqAUkziMTFHUMsKorgqVmV1GqRz9te9Y2u8enecfO9J Df1yg0dbW1NkFiCJcv89nTwtwc1ooB7svNpgAdQWzVRR983FRwfo1+UmV4bFhTx4OrON SS4EO8FxzJe9JhmyExXUyldGCB0AhC0dIr8tLfin5eXuCH/qlwi6YkPCELyWZRzjq99p obcoAtqPtL3TuHenqkwgGfxdDVRilQL7sSomsvapRgeht9ZoHSDTNstFNM/3Xx+fpD5A ZIJw== X-Gm-Message-State: APjAAAWitTpS9OihBd8y4LtzTi8Yrm/dOlphKm0NKmlbDLHpdcR7zKYI LpffMnfnOp8utiY7es+BDYXCTr0= X-Google-Smtp-Source: APXvYqwR4Y6DxFkaNbBk8XOKyK6u0LN5jHVzsFY8Uh8nViAlGWtNBI4qvXp/73EVfz11elAv8hl8qw== X-Received: by 2002:a7b:cae9:: with SMTP id t9mr3982760wml.126.1560869103265; Tue, 18 Jun 2019 07:45:03 -0700 (PDT) Received: from box.eng.vmware.com ([146.247.46.5]) by smtp.gmail.com with ESMTPSA id r3sm17686071wrr.61.2019.06.18.07.45.02 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 18 Jun 2019 07:45:02 -0700 (PDT) From: "Slavomir Kaslev (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH v12 01/13] trace-cmd: Make ports unsigned int Date: Tue, 18 Jun 2019 17:44:43 +0300 Message-Id: <20190618144455.3954-2-slavomir.kaslev@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190618144455.3954-1-slavomir.kaslev@gmail.com> References: <20190618144455.3954-1-slavomir.kaslev@gmail.com> MIME-Version: 1.0 Sender: linux-trace-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Slavomir Kaslev Switch ports data type to unsigned int since vsocket ports are 32 bit unsigned integers and sometimes cause overflow when stored in int variables. Signed-off-by: Slavomir Kaslev --- include/trace-cmd/trace-cmd.h | 2 +- tracecmd/trace-listen.c | 10 +++++----- tracecmd/trace-msg.c | 32 ++++++++++++++++++++++---------- 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/include/trace-cmd/trace-cmd.h b/include/trace-cmd/trace-cmd.h index 6f62ab9..923015e 100644 --- a/include/trace-cmd/trace-cmd.h +++ b/include/trace-cmd/trace-cmd.h @@ -328,7 +328,7 @@ int tracecmd_msg_wait_close(struct tracecmd_msg_handle *msg_handle); /* for server */ int tracecmd_msg_initial_setting(struct tracecmd_msg_handle *msg_handle); int tracecmd_msg_send_port_array(struct tracecmd_msg_handle *msg_handle, - int *ports); + unsigned *ports); int tracecmd_msg_read_data(struct tracecmd_msg_handle *msg_handle, int ofd); int tracecmd_msg_collect_data(struct tracecmd_msg_handle *msg_handle, int ofd); bool tracecmd_msg_done(struct tracecmd_msg_handle *msg_handle); diff --git a/tracecmd/trace-listen.c b/tracecmd/trace-listen.c index 3106022..e34df08 100644 --- a/tracecmd/trace-listen.c +++ b/tracecmd/trace-listen.c @@ -517,10 +517,10 @@ static int *create_all_readers(const char *node, const char *port, { int use_tcp = msg_handle->flags & TRACECMD_MSG_FL_USE_TCP; char buf[BUFSIZ]; - int *port_array; + unsigned int *port_array; int *pid_array; - int start_port; - int udp_port; + unsigned int start_port; + unsigned int udp_port; int cpus = msg_handle->cpu_count; int cpu; int pid; @@ -528,11 +528,11 @@ static int *create_all_readers(const char *node, const char *port, if (!pagesize) return NULL; - port_array = malloc(sizeof(int) * cpus); + port_array = malloc(sizeof(*port_array) * cpus); if (!port_array) return NULL; - pid_array = malloc(sizeof(int) * cpus); + pid_array = malloc(sizeof(*pid_array) * cpus); if (!pid_array) { free(port_array); return NULL; diff --git a/tracecmd/trace-msg.c b/tracecmd/trace-msg.c index e2dd188..74c0bc1 100644 --- a/tracecmd/trace-msg.c +++ b/tracecmd/trace-msg.c @@ -161,12 +161,26 @@ static int make_tinit(struct tracecmd_msg_handle *msg_handle, return 0; } -static int write_ints(char *buf, size_t buf_len, int *arr, int arr_len) +/* test a to u */ +static int tatou(const char *s, unsigned int *res) +{ + long r; + + r = atol(s); + if (r >= 0 && r <= UINT_MAX) { + *res = (unsigned int)r; + return 0; + } + return -1; +} + +static int write_uints(char *buf, size_t buf_len, + unsigned int *arr, int arr_len) { int i, ret, tot = 0; for (i = 0; i < arr_len; i++) { - ret = snprintf(buf, buf_len, "%d", arr[i]); + ret = snprintf(buf, buf_len, "%u", arr[i]); if (ret < 0) return ret; @@ -184,15 +198,15 @@ static int write_ints(char *buf, size_t buf_len, int *arr, int arr_len) return tot; } -static int make_rinit(struct tracecmd_msg *msg, int cpus, int *ports) +static int make_rinit(struct tracecmd_msg *msg, int cpus, unsigned int *ports) { int data_size; - data_size = write_ints(NULL, 0, ports, cpus); + data_size = write_uints(NULL, 0, ports, cpus); msg->buf = malloc(data_size); if (!msg->buf) return -ENOMEM; - write_ints(msg->buf, data_size, ports, cpus); + write_uints(msg->buf, data_size, ports, cpus); msg->rinit.cpus = htonl(cpus); msg->hdr.size = htonl(ntohl(msg->hdr.size) + data_size); @@ -442,7 +456,7 @@ int tracecmd_msg_send_init_data(struct tracecmd_msg_handle *msg_handle, } cpus = ntohl(msg.rinit.cpus); - ports = malloc_or_die(sizeof(*ports) * cpus); + ports = malloc(sizeof(*ports) * cpus); if (!ports) { ret = -ENOMEM; goto out; @@ -450,13 +464,11 @@ int tracecmd_msg_send_init_data(struct tracecmd_msg_handle *msg_handle, buf_end = msg.buf + buf_len; for (i = 0, p = msg.buf; i < cpus; i++, p++) { - if (p >= buf_end) { + if (p >= buf_end || tatou(p, &ports[i])) { free(ports); ret = -EINVAL; goto error; } - - ports[i] = atoi(p); p = strchr(p, '\0'); } @@ -588,7 +600,7 @@ error: } int tracecmd_msg_send_port_array(struct tracecmd_msg_handle *msg_handle, - int *ports) + unsigned int *ports) { struct tracecmd_msg msg; int ret;