From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87FDCC433E0 for ; Tue, 7 Jul 2020 15:24:56 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3C57D20663 for ; Tue, 7 Jul 2020 15:24:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="ALwou+oN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3C57D20663 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id DA3738D0023; Tue, 7 Jul 2020 11:24:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D538B8D0014; Tue, 7 Jul 2020 11:24:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C45A98D0023; Tue, 7 Jul 2020 11:24:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0109.hostedemail.com [216.40.44.109]) by kanga.kvack.org (Postfix) with ESMTP id ADDD58D0014 for ; Tue, 7 Jul 2020 11:24:55 -0400 (EDT) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 73B582DFD for ; Tue, 7 Jul 2020 15:24:55 +0000 (UTC) X-FDA: 77011652550.20.river88_250e55c26eb5 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin20.hostedemail.com (Postfix) with ESMTP id 3B76F180C07AF for ; Tue, 7 Jul 2020 15:24:46 +0000 (UTC) X-HE-Tag: river88_250e55c26eb5 X-Filterd-Recvd-Size: 8932 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf17.hostedemail.com (Postfix) with ESMTP for ; Tue, 7 Jul 2020 15:24:45 +0000 (UTC) Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8958F2065D; Tue, 7 Jul 2020 15:24:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594135485; bh=rRXiU78KDvuBb/JrO05R2ZW8iH0rjwIBTr1mfcTJFfg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ALwou+oNpruTVCDkziMukj/5VQjipMeBhSh3GfGEdD51njlwmM1jJcgw/1D6KRf5d l/q6bHr2prBw1uVcOLOfx9dD7zvIXKL8nFNAUPW4jGCcsmGopns45qHByKSiUg+pGN jzlZKOcj7PGZMSo4dY2ruOUUfPUkt/dpyI+vVgy4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Steven Rostedt (VMware)" , Andrew Morton , Jaewon Lim , Jiri Olsa , Kees Kook , linux-mm@kvack.org, linux-trace-devel@vger.kernel.org, Namhyung Kim , Vlastimil Babka , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 5.7 030/112] tools lib traceevent: Add append() function helper for appending strings Date: Tue, 7 Jul 2020 17:16:35 +0200 Message-Id: <20200707145802.418650708@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200707145800.925304888@linuxfoundation.org> References: <20200707145800.925304888@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Rspamd-Queue-Id: 3B76F180C07AF X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Steven Rostedt (VMware) [ Upstream commit 27d4d336f2872193e90ee5450559e1699fae0f6d ] There's several locations that open code realloc and strcat() to append text to strings. Add an append() function that takes a delimiter and a string to append to another string. Signed-off-by: Steven Rostedt (VMware) Cc: Andrew Morton Cc: Jaewon Lim Cc: Jiri Olsa Cc: Kees Kook Cc: linux-mm@kvack.org Cc: linux-trace-devel@vger.kernel.org Cc: Namhyung Kim Cc: Vlastimil Babka Link: http://lore.kernel.org/lkml/20200324200956.515118403@goodmis.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/lib/traceevent/event-parse.c | 98 ++++++++++++------------------ 1 file changed, 40 insertions(+), 58 deletions(-) diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/ev= ent-parse.c index e1bd2a93c6db8..eec96c31ea9e5 100644 --- a/tools/lib/traceevent/event-parse.c +++ b/tools/lib/traceevent/event-parse.c @@ -1425,6 +1425,19 @@ static unsigned int type_size(const char *name) return 0; } =20 +static int append(char **buf, const char *delim, const char *str) +{ + char *new_buf; + + new_buf =3D realloc(*buf, strlen(*buf) + strlen(delim) + strlen(str) + = 1); + if (!new_buf) + return -1; + strcat(new_buf, delim); + strcat(new_buf, str); + *buf =3D new_buf; + return 0; +} + static int event_read_fields(struct tep_event *event, struct tep_format_= field **fields) { struct tep_format_field *field =3D NULL; @@ -1432,6 +1445,7 @@ static int event_read_fields(struct tep_event *even= t, struct tep_format_field ** char *token; char *last_token; int count =3D 0; + int ret; =20 do { unsigned int size_dynamic =3D 0; @@ -1490,24 +1504,15 @@ static int event_read_fields(struct tep_event *ev= ent, struct tep_format_field ** field->flags |=3D TEP_FIELD_IS_POINTER; =20 if (field->type) { - char *new_type; - new_type =3D realloc(field->type, - strlen(field->type) + - strlen(last_token) + 2); - if (!new_type) { - free(last_token); - goto fail; - } - field->type =3D new_type; - strcat(field->type, " "); - strcat(field->type, last_token); + ret =3D append(&field->type, " ", last_token); free(last_token); + if (ret < 0) + goto fail; } else field->type =3D last_token; last_token =3D token; continue; } - break; } =20 @@ -1523,8 +1528,6 @@ static int event_read_fields(struct tep_event *even= t, struct tep_format_field ** if (strcmp(token, "[") =3D=3D 0) { enum tep_event_type last_type =3D type; char *brackets =3D token; - char *new_brackets; - int len; =20 field->flags |=3D TEP_FIELD_IS_ARRAY; =20 @@ -1536,29 +1539,27 @@ static int event_read_fields(struct tep_event *ev= ent, struct tep_format_field ** field->arraylen =3D 0; =20 while (strcmp(token, "]") !=3D 0) { + const char *delim; + if (last_type =3D=3D TEP_EVENT_ITEM && type =3D=3D TEP_EVENT_ITEM) - len =3D 2; + delim =3D " "; else - len =3D 1; + delim =3D ""; + last_type =3D type; =20 - new_brackets =3D realloc(brackets, - strlen(brackets) + - strlen(token) + len); - if (!new_brackets) { + ret =3D append(&brackets, delim, token); + if (ret < 0) { free(brackets); goto fail; } - brackets =3D new_brackets; - if (len =3D=3D 2) - strcat(brackets, " "); - strcat(brackets, token); /* We only care about the last token */ field->arraylen =3D strtoul(token, NULL, 0); free_token(token); type =3D read_token(&token); if (type =3D=3D TEP_EVENT_NONE) { + free(brackets); do_warning_event(event, "failed to find token"); goto fail; } @@ -1566,13 +1567,11 @@ static int event_read_fields(struct tep_event *ev= ent, struct tep_format_field ** =20 free_token(token); =20 - new_brackets =3D realloc(brackets, strlen(brackets) + 2); - if (!new_brackets) { + ret =3D append(&brackets, "", "]"); + if (ret < 0) { free(brackets); goto fail; } - brackets =3D new_brackets; - strcat(brackets, "]"); =20 /* add brackets to type */ =20 @@ -1582,34 +1581,23 @@ static int event_read_fields(struct tep_event *ev= ent, struct tep_format_field ** * the format: type [] item; */ if (type =3D=3D TEP_EVENT_ITEM) { - char *new_type; - new_type =3D realloc(field->type, - strlen(field->type) + - strlen(field->name) + - strlen(brackets) + 2); - if (!new_type) { + ret =3D append(&field->type, " ", field->name); + if (ret < 0) { free(brackets); goto fail; } - field->type =3D new_type; - strcat(field->type, " "); - strcat(field->type, field->name); + ret =3D append(&field->type, "", brackets); + size_dynamic =3D type_size(field->name); free_token(field->name); - strcat(field->type, brackets); field->name =3D field->alias =3D token; type =3D read_token(&token); } else { - char *new_type; - new_type =3D realloc(field->type, - strlen(field->type) + - strlen(brackets) + 1); - if (!new_type) { + ret =3D append(&field->type, "", brackets); + if (ret < 0) { free(brackets); goto fail; } - field->type =3D new_type; - strcat(field->type, brackets); } free(brackets); } @@ -2046,19 +2034,16 @@ process_op(struct tep_event *event, struct tep_pr= int_arg *arg, char **tok) /* could just be a type pointer */ if ((strcmp(arg->op.op, "*") =3D=3D 0) && type =3D=3D TEP_EVENT_DELIM && (strcmp(token, ")") =3D=3D 0)) { - char *new_atom; + int ret; =20 if (left->type !=3D TEP_PRINT_ATOM) { do_warning_event(event, "bad pointer type"); goto out_free; } - new_atom =3D realloc(left->atom.atom, - strlen(left->atom.atom) + 3); - if (!new_atom) + ret =3D append(&left->atom.atom, " ", "*"); + if (ret < 0) goto out_warn_free; =20 - left->atom.atom =3D new_atom; - strcat(left->atom.atom, " *"); free(arg->op.op); *arg =3D *left; free(left); @@ -3151,18 +3136,15 @@ process_arg_token(struct tep_event *event, struct= tep_print_arg *arg, } /* atoms can be more than one token long */ while (type =3D=3D TEP_EVENT_ITEM) { - char *new_atom; - new_atom =3D realloc(atom, - strlen(atom) + strlen(token) + 2); - if (!new_atom) { + int ret; + + ret =3D append(&atom, " ", token); + if (ret < 0) { free(atom); *tok =3D NULL; free_token(token); return TEP_EVENT_ERROR; } - atom =3D new_atom; - strcat(atom, " "); - strcat(atom, token); free_token(token); type =3D read_token_item(&token); } --=20 2.25.1