Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/134170/?format=api
{ "id": 134170, "url": "http://patches.dpdk.org/api/patches/134170/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20231113161519.242272-5-stephen@networkplumber.org/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20231113161519.242272-5-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20231113161519.242272-5-stephen@networkplumber.org", "date": "2023-11-13T16:15:18", "name": "[v6,4/5] pcapng: avoid using alloca()", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "4a9887fd194b2ed3e806bf014a9a0fdf77c54dac", "submitter": { "id": 27, "url": "http://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20231113161519.242272-5-stephen@networkplumber.org/mbox/", "series": [ { "id": 30275, "url": "http://patches.dpdk.org/api/series/30275/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=30275", "date": "2023-11-13T16:15:14", "name": "dumpcap and pcapng fixes", "version": 6, "mbox": "http://patches.dpdk.org/series/30275/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/134170/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/134170/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id C265E4331C;\n\tMon, 13 Nov 2023 17:15:58 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id C330240A89;\n\tMon, 13 Nov 2023 17:15:39 +0100 (CET)", "from mail-pg1-f175.google.com (mail-pg1-f175.google.com\n [209.85.215.175])\n by mails.dpdk.org (Postfix) with ESMTP id 468D1402D6\n for <dev@dpdk.org>; Mon, 13 Nov 2023 17:15:36 +0100 (CET)", "by mail-pg1-f175.google.com with SMTP id\n 41be03b00d2f7-5bd306f86a8so3004376a12.0\n for <dev@dpdk.org>; Mon, 13 Nov 2023 08:15:36 -0800 (PST)", "from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141])\n by smtp.gmail.com with ESMTPSA id\n hq11-20020a056a00680b00b006c69bbf03e2sm3350043pfb.192.2023.11.13.08.15.34\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Mon, 13 Nov 2023 08:15:34 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1699892135;\n x=1700496935; darn=dpdk.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=N2r/H5v/jMSX7aFlXgmw6wyhS0CLdclJuU10KJ1gaU0=;\n b=s/sj/v6CNc1SZY9jaOpzjGk52n0An3OSi6SCOvZCCvxG87IsuNbc8xc4AaMeEk3jc3\n gLzibf0ViHDlIbQF3wTZzRnIZfseA0WrWYaflQKHMtA4Qspkj62jNyM0sQZXPUZlWxIt\n xmUfbWgMMXYa5ljQy8Udljy+bSowH9wa3UyQmDVSuQT3PwVWkSJ55JCIr77NswBrCz6v\n cDi6lFfjAVlaX00EWsByTBsdNH5PZwXGkVftW4yNxNW4+Q8gGqvc6Llrnry97ARHx/O/\n NEvVDOz0Z9wFWRyxtLNgkw1i2rcY4MyRFn57uzOIRIbsYElED4gQWSm85LHLvDebwCQZ\n 5+3A==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1699892135; x=1700496935;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n :subject:date:message-id:reply-to;\n bh=N2r/H5v/jMSX7aFlXgmw6wyhS0CLdclJuU10KJ1gaU0=;\n b=lzBa4r4ZYUujsTx5ifCR/7xQ/kgLpxdVQXDW7KQY+3rS4qnXEeEqTyoa1XBH5O1pQs\n 5590RvTUjQd58q+VhAiHd5sJv1XSHV1L8E230QDCCnjZ+MnTpajt2NtxX6H6AgUff3Mo\n n7wVPAALm/V2e+ODHh0yXsVx4g8QQbpROtWrhvoQcrxRitAkqJlscsof7bGn3VlLaSBx\n Oa+nXKGQDaFQ4ji3+kjx0/cXOUd2bt0E2C8vVfQTHI1kad+4q3LNTCuo3otrohUK2KLb\n VWV8sRpKkKTpV+7uj+J+rL1YPpt93Uqjp6pgRLCinfD4U9dua4r2DNADB9diuAyKsJmj\n oWgw==", "X-Gm-Message-State": "AOJu0YxQIFFgi0jkomEAtSzo9Zu4/alBqHSsnSWt82xEAeLpdQMUrYRQ\n n2tUYidclpMcsEdrGVUym8Tbsu+brnxMso327BA=", "X-Google-Smtp-Source": "\n AGHT+IGuEwmWd75jahvN3/FWTkz3T+RtE31LQSGZ5VB+X3qE282Kmv3J0iFfcZ4x4VaYjlN4gm+kow==", "X-Received": "by 2002:a05:6a21:3296:b0:181:9b65:b4b5 with SMTP id\n yt22-20020a056a21329600b001819b65b4b5mr5668735pzb.3.1699892135155;\n Mon, 13 Nov 2023 08:15:35 -0800 (PST)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>, =?utf-8?q?Morten_Br?=\n\t=?utf-8?q?=C3=B8rup?= <mb@smartsharesystems.com>,\n Reshma Pattan <reshma.pattan@intel.com>", "Subject": "[PATCH v6 4/5] pcapng: avoid using alloca()", "Date": "Mon, 13 Nov 2023 08:15:18 -0800", "Message-Id": "<20231113161519.242272-5-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.39.2", "In-Reply-To": "<20231113161519.242272-1-stephen@networkplumber.org>", "References": "<20230921042349.104150-1-stephen@networkplumber.org>\n <20231113161519.242272-1-stephen@networkplumber.org>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "The function alloca() like VLA's has problems if the caller\npasses a large value. Instead use a fixed size buffer (2K)\nwhich will be more than sufficient for the info related blocks\nin the file. Add bounds checks as well.\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\nAcked-by: Morten Brørup <mb@smartsharesystems.com>\n---\n lib/pcapng/rte_pcapng.c | 37 ++++++++++++++++---------------------\n 1 file changed, 16 insertions(+), 21 deletions(-)", "diff": "diff --git a/lib/pcapng/rte_pcapng.c b/lib/pcapng/rte_pcapng.c\nindex 13fd2b97fb80..f74ec939a9f8 100644\n--- a/lib/pcapng/rte_pcapng.c\n+++ b/lib/pcapng/rte_pcapng.c\n@@ -33,6 +33,9 @@\n /* conversion from DPDK speed to PCAPNG */\n #define PCAPNG_MBPS_SPEED 1000000ull\n \n+/* upper bound for section, stats and interface blocks */\n+#define PCAPNG_BLKSIZ\t2048\n+\n /* Format of the capture file handle */\n struct rte_pcapng {\n \tint outfd;\t\t/* output file */\n@@ -140,9 +143,8 @@ pcapng_section_block(rte_pcapng_t *self,\n {\n \tstruct pcapng_section_header *hdr;\n \tstruct pcapng_option *opt;\n-\tvoid *buf;\n+\tuint8_t buf[PCAPNG_BLKSIZ];\n \tuint32_t len;\n-\tssize_t cc;\n \n \tlen = sizeof(*hdr);\n \tif (hw)\n@@ -158,8 +160,7 @@ pcapng_section_block(rte_pcapng_t *self,\n \tlen += pcapng_optlen(0);\n \tlen += sizeof(uint32_t);\n \n-\tbuf = calloc(1, len);\n-\tif (!buf)\n+\tif (len > sizeof(buf))\n \t\treturn -1;\n \n \thdr = (struct pcapng_section_header *)buf;\n@@ -193,10 +194,7 @@ pcapng_section_block(rte_pcapng_t *self,\n \t/* clone block_length after option */\n \tmemcpy(opt, &hdr->block_length, sizeof(uint32_t));\n \n-\tcc = write(self->outfd, buf, len);\n-\tfree(buf);\n-\n-\treturn cc;\n+\treturn write(self->outfd, buf, len);\n }\n \n /* Write an interface block for a DPDK port */\n@@ -213,7 +211,7 @@ rte_pcapng_add_interface(rte_pcapng_t *self, uint16_t port,\n \tstruct pcapng_option *opt;\n \tconst uint8_t tsresol = 9;\t/* nanosecond resolution */\n \tuint32_t len;\n-\tvoid *buf;\n+\tuint8_t buf[PCAPNG_BLKSIZ];\n \tchar ifname_buf[IF_NAMESIZE];\n \tchar ifhw[256];\n \tuint64_t speed = 0;\n@@ -267,8 +265,7 @@ rte_pcapng_add_interface(rte_pcapng_t *self, uint16_t port,\n \tlen += pcapng_optlen(0);\n \tlen += sizeof(uint32_t);\n \n-\tbuf = alloca(len);\n-\tif (!buf)\n+\tif (len > sizeof(buf))\n \t\treturn -1;\n \n \thdr = (struct pcapng_interface_block *)buf;\n@@ -296,17 +293,16 @@ rte_pcapng_add_interface(rte_pcapng_t *self, uint16_t port,\n \t\topt = pcapng_add_option(opt, PCAPNG_IFB_HARDWARE,\n \t\t\t\t\t ifhw, strlen(ifhw));\n \tif (filter) {\n-\t\t/* Encoding is that the first octet indicates string vs BPF */\n \t\tsize_t len;\n-\t\tchar *buf;\n \n \t\tlen = strlen(filter) + 1;\n-\t\tbuf = alloca(len);\n-\t\t*buf = '\\0';\n-\t\tmemcpy(buf + 1, filter, len);\n+\t\topt->code = PCAPNG_IFB_FILTER;\n+\t\topt->length = len;\n+\t\t/* Encoding is that the first octet indicates string vs BPF */\n+\t\topt->data[0] = 0;\n+\t\tmemcpy(opt->data + 1, filter, strlen(filter));\n \n-\t\topt = pcapng_add_option(opt, PCAPNG_IFB_FILTER,\n-\t\t\t\t\tbuf, len);\n+\t\topt = (struct pcapng_option *)((uint8_t *)opt + pcapng_optlen(len));\n \t}\n \n \topt = pcapng_add_option(opt, PCAPNG_OPT_END, NULL, 0);\n@@ -333,7 +329,7 @@ rte_pcapng_write_stats(rte_pcapng_t *self, uint16_t port_id,\n \tuint64_t start_time = self->offset_ns;\n \tuint64_t sample_time;\n \tuint32_t optlen, len;\n-\tuint8_t *buf;\n+\tuint8_t buf[PCAPNG_BLKSIZ];\n \n \tRTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);\n \n@@ -353,8 +349,7 @@ rte_pcapng_write_stats(rte_pcapng_t *self, uint16_t port_id,\n \t\toptlen += pcapng_optlen(0);\n \n \tlen = sizeof(*hdr) + optlen + sizeof(uint32_t);\n-\tbuf = alloca(len);\n-\tif (buf == NULL)\n+\tif (len > sizeof(buf))\n \t\treturn -1;\n \n \thdr = (struct pcapng_statistics *)buf;\n", "prefixes": [ "v6", "4/5" ] }