From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A8855A04F1 for ; Mon, 6 Jan 2020 13:53:27 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 629711D60B; Mon, 6 Jan 2020 13:53:27 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 996E21D60B for ; Mon, 6 Jan 2020 13:53:25 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Jan 2020 04:53:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,402,1571727600"; d="scan'208";a="216822660" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga007.fm.intel.com with ESMTP; 06 Jan 2020 04:53:24 -0800 Received: from fmsmsx601.amr.corp.intel.com (10.18.126.81) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 6 Jan 2020 04:53:24 -0800 Received: from fmsmsx601.amr.corp.intel.com (10.18.126.81) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Mon, 6 Jan 2020 04:53:24 -0800 Received: from FMSEDG002.ED.cps.intel.com (10.1.192.134) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Mon, 6 Jan 2020 04:53:24 -0800 Received: from NAM04-BN3-obe.outbound.protection.outlook.com (104.47.46.59) by edgegateway.intel.com (192.55.55.69) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 6 Jan 2020 04:53:23 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ftUL9OS//+TONfc9rrfUJLyOZm4wpLadh341cqrHvCOnGCwlynJR4aRr8TZjRMdbmvzFyKFGGA3mHJUx11USrQTOYeDhnhikG7rWSZAtRIGgwW3Iefz79XUxYYob+3PEEQx48TbdDfmx0RM80XCla7yBL5v+dbPUgzI5nTBSTPx4kAIc4GqCVP9MOB2N+Fl8pBRo1UVkne731CzIGwcYB/na4ym/Yb44YOpjWd4q7CZUQbAvpO6qlEyMzvNxWSDu7PFuk3iIx0Y23TeNlcx1agqCa2bo/NaJZn9DD0ZHmjsmn1ZCp9al9k56lyPvE6oAlypRrXzi+cty4fQ/xpddsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/DZgE+SM8cmpkgwO2bPLJOMiWvtRkmDt39Ogg7zipsg=; b=IVVE10Zq7Haa34C646EfLDHJVKwf9edbnH8jNEc+WUwhi5WwjI4X9D+7RtDLcvC95Vc1VqR6KfEifcdKYJ6MWAtbTA+l4r0LdE+2XRX50hHdTN4IODcwTee7Ofd7k052iHqsF1yt0oRdbj7qhazyGD+ef8mbGT+Q7AcPL+1r1aCwl3LaChbV9UfBQrktvVeUqW/Umv9TJ9b1NdZZnvnVS1d4bXh7ioz9SvHK6FfA9CyGXxCQ1hS2IPZ62vH2+Tid2diwFdSxYpB9t0gjY31ONg5zrVTQwBpJVQpbaG0KUSDwcTgIwZxdUvTzYfjIl1U5Ft6KZqwhcPjN77jeVkRnuw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/DZgE+SM8cmpkgwO2bPLJOMiWvtRkmDt39Ogg7zipsg=; b=cDkoFgN7luUwjv+lVSu/FnM22o7OqOurtSRXqfNHTMtQhsMHRj4X154TmXdcnhVTEFVMFbAzJ9BCzTgC6+u4PzkPv1Alxbg/WzMUt13tn1D30kH7xx9Q265Mz9LMjoX4aHJrn/6WtarQaqh0NRJG5PIU29pzYEXOjpz6bsI7VhY= Received: from MN2PR11MB3806.namprd11.prod.outlook.com (20.178.254.82) by MN2PR11MB4205.namprd11.prod.outlook.com (52.135.39.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2602.15; Mon, 6 Jan 2020 12:53:20 +0000 Received: from MN2PR11MB3806.namprd11.prod.outlook.com ([fe80::6458:14f4:377b:dc56]) by MN2PR11MB3806.namprd11.prod.outlook.com ([fe80::6458:14f4:377b:dc56%7]) with mapi id 15.20.2602.015; Mon, 6 Jan 2020 12:53:20 +0000 From: "Tahhan, Maryam" To: "Power, Ciara" , "stable@dpdk.org" CC: "Pattan, Reshma" , "romanx.korynkevych@intel.com" Thread-Topic: [PATCH 17.11] app/proc_info: fix string copying to use strlcpy Thread-Index: AQHVxIdmUze89QS6l0CzxVWntzoQbafdlpTA Date: Mon, 6 Jan 2020 12:53:20 +0000 Message-ID: References: <20200106114254.54945-1-ciara.power@intel.com> In-Reply-To: <20200106114254.54945-1-ciara.power@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNTE0ZjI5NzQtYjliYi00ZmU5LWEyNGItNjU1MTM0OTFmZDRkIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiRWhZbEJjNHpod2MzcXB2ZHo2MnhxMndzUndpaFlMU0xOUDNKSGNQMGhlTE1tZzQ5YTlUVHFHM1ZuaExDUXJtTyJ9 dlp-version: 11.2.0.6 dlp-product: dlpe-windows x-ctpclassification: CTP_NT dlp-reaction: no-action authentication-results: spf=none (sender IP is ) smtp.mailfrom=maryam.tahhan@intel.com; x-originating-ip: [192.198.151.181] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 1503d8fc-3bd5-481e-e669-08d792a76840 x-ms-traffictypediagnostic: MN2PR11MB4205: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:120; x-forefront-prvs: 0274272F87 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(376002)(346002)(366004)(136003)(39860400002)(396003)(189003)(199004)(66476007)(66946007)(64756008)(66446008)(2906002)(5660300002)(8936002)(107886003)(4326008)(33656002)(76116006)(66556008)(26005)(6506007)(7696005)(186003)(52536014)(9686003)(55016002)(316002)(478600001)(54906003)(110136005)(86362001)(81166006)(81156014)(8676002)(71200400001)(156123004); DIR:OUT; SFP:1102; SCL:1; SRVR:MN2PR11MB4205; H:MN2PR11MB3806.namprd11.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: FCl3IggnU9QXH/AZsy5gbA2x18ROQTE989xeyWky+7KDpGnTOZyTHdbEPODzvDqfLJAV+CtCb4aNC9By/ideiYpdJM/CH7/3VUBqmSWENdNJVN08WFYu8NRSF02LyrX6Ysi5h4g7teyrwsymlRKrNaWAOcGQn3yu5yvwMKAKRfV68vo9AaxzxmiD6kScjMgp+wzk5RwzcENGtsNCgKSClri/PH+0/EitrCO3QQcfOfyOmJwIALyRd71yqXat+4gVlALQxtnRrRliaAABEAE8mm7aX215EzvSwVsTikFu4dep7Md1EilMB42ON56p1EMqIWyQkVtm9/mkj+zvOFP2zJUBFPATCJgyiTTw0NAF57Rdr3DZALNUdrTp2FIBC3LnI3g5MKo0mSm9sPLRzuRnCFynv3HfO2CJ9by0MLlI5q3tJrcrnwh7Fqi8TfVyPBAmpakBh1hcVBMu/usiIVSaCphNnBJk5D8Col3xLDsElRYu5dZ5H9phtnnZqMKwOlGh Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 1503d8fc-3bd5-481e-e669-08d792a76840 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Jan 2020 12:53:20.0643 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: L8sLMJY2unesxwZDzUru4wsoj4pVdMW1+xbSCiu7cGrHyM1YgB7uyBlA6Ept+fkVPXRJqBMnbq2lrSfTbazOFg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4205 X-OriginatorOrg: intel.com Subject: Re: [dpdk-stable] [PATCH 17.11] app/proc_info: fix string copying to use strlcpy X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" > [ upstream commit 7edbf7ddfd7d2453afaad3b72666491d30b616af ] >=20 > Replaced strncpy and strcpy with strlcpy. > Using strlcpy is safe practice when copying strings, as it will include a= null > terminator. >=20 > Cc: romanx.korynkevych@intel.com >=20 > Fixes: 2deb6b5246d7 ("app/procinfo: add collectd format and host id") > Reported-by: Reshma Pattan >=20 > Signed-off-by: Ciara Power > Acked-by: Bruce Richardson > --- > app/proc_info/main.c | 36 ++++++++++++++++++------------------ > 1 file changed, 18 insertions(+), 18 deletions(-) >=20 > diff --git a/app/proc_info/main.c b/app/proc_info/main.c index > 2893bec69..caf4e48c0 100644 > --- a/app/proc_info/main.c > +++ b/app/proc_info/main.c > @@ -196,7 +196,7 @@ proc_info_preparse_args(int argc, char **argv) > int err =3D gethostname(host_id, MAX_LONG_OPT_SZ-1); >=20 > if (err) > - strcpy(host_id, "unknown"); > + strlcpy(host_id, "unknown", sizeof(host_id)); > } >=20 > return 0; > @@ -363,50 +363,50 @@ static void collectd_resolve_cnt_type(char > *cnt_type, size_t cnt_type_len, > if ((type_end !=3D NULL) && > (strncmp(cnt_name, "rx_", strlen("rx_")) =3D=3D 0)) { > if (strncmp(type_end, "_errors", strlen("_errors")) =3D=3D 0) > - strncpy(cnt_type, "if_rx_errors", cnt_type_len); > + strlcpy(cnt_type, "if_rx_errors", cnt_type_len); > else if (strncmp(type_end, "_dropped", strlen("_dropped")) > =3D=3D 0) > - strncpy(cnt_type, "if_rx_dropped", cnt_type_len); > + strlcpy(cnt_type, "if_rx_dropped", cnt_type_len); > else if (strncmp(type_end, "_bytes", strlen("_bytes")) =3D=3D 0) > - strncpy(cnt_type, "if_rx_octets", cnt_type_len); > + strlcpy(cnt_type, "if_rx_octets", cnt_type_len); > else if (strncmp(type_end, "_packets", strlen("_packets")) > =3D=3D 0) > - strncpy(cnt_type, "if_rx_packets", cnt_type_len); > + strlcpy(cnt_type, "if_rx_packets", cnt_type_len); > else if (strncmp(type_end, "_placement", > strlen("_placement")) =3D=3D 0) > - strncpy(cnt_type, "if_rx_errors", cnt_type_len); > + strlcpy(cnt_type, "if_rx_errors", cnt_type_len); > else if (strncmp(type_end, "_buff", strlen("_buff")) =3D=3D 0) > - strncpy(cnt_type, "if_rx_errors", cnt_type_len); > + strlcpy(cnt_type, "if_rx_errors", cnt_type_len); > else > /* Does not fit obvious type: use a more generic one > */ > - strncpy(cnt_type, "derive", cnt_type_len); > + strlcpy(cnt_type, "derive", cnt_type_len); > } else if ((type_end !=3D NULL) && > (strncmp(cnt_name, "tx_", strlen("tx_"))) =3D=3D 0) { > if (strncmp(type_end, "_errors", strlen("_errors")) =3D=3D 0) > - strncpy(cnt_type, "if_tx_errors", cnt_type_len); > + strlcpy(cnt_type, "if_tx_errors", cnt_type_len); > else if (strncmp(type_end, "_dropped", strlen("_dropped")) > =3D=3D 0) > - strncpy(cnt_type, "if_tx_dropped", cnt_type_len); > + strlcpy(cnt_type, "if_tx_dropped", cnt_type_len); > else if (strncmp(type_end, "_bytes", strlen("_bytes")) =3D=3D 0) > - strncpy(cnt_type, "if_tx_octets", cnt_type_len); > + strlcpy(cnt_type, "if_tx_octets", cnt_type_len); > else if (strncmp(type_end, "_packets", strlen("_packets")) > =3D=3D 0) > - strncpy(cnt_type, "if_tx_packets", cnt_type_len); > + strlcpy(cnt_type, "if_tx_packets", cnt_type_len); > else > /* Does not fit obvious type: use a more generic one > */ > - strncpy(cnt_type, "derive", cnt_type_len); > + strlcpy(cnt_type, "derive", cnt_type_len); > } else if ((type_end !=3D NULL) && > (strncmp(cnt_name, "flow_", strlen("flow_"))) =3D=3D 0) { > if (strncmp(type_end, "_filters", strlen("_filters")) =3D=3D 0) > - strncpy(cnt_type, "operations", cnt_type_len); > + strlcpy(cnt_type, "operations", cnt_type_len); > else if (strncmp(type_end, "_errors", strlen("_errors")) =3D=3D 0) > - strncpy(cnt_type, "errors", cnt_type_len); > + strlcpy(cnt_type, "errors", cnt_type_len); > else if (strncmp(type_end, "_filters", strlen("_filters")) =3D=3D 0) > - strncpy(cnt_type, "filter_result", cnt_type_len); > + strlcpy(cnt_type, "filter_result", cnt_type_len); > } else if ((type_end !=3D NULL) && > (strncmp(cnt_name, "mac_", strlen("mac_"))) =3D=3D 0) { > if (strncmp(type_end, "_errors", strlen("_errors")) =3D=3D 0) > - strncpy(cnt_type, "errors", cnt_type_len); > + strlcpy(cnt_type, "errors", cnt_type_len); > } else { > /* Does not fit obvious type, or strrchr error: */ > /* use a more generic type */ > - strncpy(cnt_type, "derive", cnt_type_len); > + strlcpy(cnt_type, "derive", cnt_type_len); > } > } >=20 > -- > 2.17.1 Acked-by: Maryam Tahhan =20