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 2D531A0524 for ; Mon, 24 Feb 2020 16:58:48 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D5FD01BFA5; Mon, 24 Feb 2020 16:58:47 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 7D5A41BFA5 for ; Mon, 24 Feb 2020 16:58:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582559925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=wMZdXMj9sFT/Jtj39hgxG/9WaPvlqxK/x9Uv26QEHZc=; b=bvP58mZgaZJB/8Gc8KUGlInkjFc/oE8uNzh6cvIazyh067+w/c5Q8KE3xH6luXjVwxHUtI Uy5kzJhnTCxkS4ou9Xc24QyTWZHRCMq5SVUsGQCPb9Cq8t80uiFdeiMF/aRTkjbIXTV7+7 S3fRSX1WWOxC0okKBTwYta5AlZhjK3k= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-229-ZtCh_zZJPNuStVBmR87vFg-1; Mon, 24 Feb 2020 10:58:42 -0500 X-MC-Unique: ZtCh_zZJPNuStVBmR87vFg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B7CE418C35DC; Mon, 24 Feb 2020 15:58:39 +0000 (UTC) Received: from [10.33.36.123] (unknown [10.33.36.123]) by smtp.corp.redhat.com (Postfix) with ESMTP id 79FAC85748; Mon, 24 Feb 2020 15:58:38 +0000 (UTC) To: Adam Dybkowski , stable@dpdk.org, fiona.trahe@intel.com, bluca@debian.org References: <20200224130849.3125-1-adamx.dybkowski@intel.com> From: Kevin Traynor Autocrypt: addr=ktraynor@redhat.com; keydata= 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 Message-ID: Date: Mon, 24 Feb 2020 15:58:37 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: <20200224130849.3125-1-adamx.dybkowski@intel.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Subject: Re: [dpdk-stable] [PATCH 18.11] cryptodev: fix missing device id range checking 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" On 24/02/2020 13:08, Adam Dybkowski wrote: > This patch adds range-checking of the device id passed from > the user app code. It prevents out-of-range array accesses > which in some situations resulted in an > application crash (segfault). >=20 > Fixes: 8db57afd7ab9 ("cryptodev: fix checks related to device id") >=20 > Signed-off-by: Adam Dybkowski Thanks for the backport Adam. Will take when the equivalent patch is in dpdk master and I will add the reference to master commit. > --- > lib/librte_cryptodev/rte_cryptodev.c | 41 +++++++++++++++++++++++++--- > 1 file changed, 37 insertions(+), 4 deletions(-) >=20 > diff --git a/lib/librte_cryptodev/rte_cryptodev.c b/lib/librte_cryptodev/= rte_cryptodev.c > index f7566fc30..180260a3b 100644 > --- a/lib/librte_cryptodev/rte_cryptodev.c > +++ b/lib/librte_cryptodev/rte_cryptodev.c > @@ -509,7 +509,8 @@ rte_cryptodev_pmd_get_named_dev(const char *name) > static inline uint8_t > rte_cryptodev_is_valid_device_data(uint8_t dev_id) > { > -=09if (rte_crypto_devices[dev_id].data =3D=3D NULL) > +=09if (dev_id >=3D RTE_CRYPTO_MAX_DEVS || > +=09=09=09rte_crypto_devices[dev_id].data =3D=3D NULL) > =09=09return 0; > =20 > =09return 1; > @@ -601,8 +602,9 @@ rte_cryptodev_devices_get(const char *driver_name, ui= nt8_t *devices, > void * > rte_cryptodev_get_sec_ctx(uint8_t dev_id) > { > -=09if (rte_crypto_devices[dev_id].feature_flags & > -=09=09=09RTE_CRYPTODEV_FF_SECURITY) > +=09if (dev_id < RTE_CRYPTO_MAX_DEVS && > +=09=09=09(rte_crypto_devices[dev_id].feature_flags & > +=09=09=09RTE_CRYPTODEV_FF_SECURITY)) > =09=09return rte_crypto_devices[dev_id].security_ctx; > =20 > =09return NULL; > @@ -741,6 +743,11 @@ rte_cryptodev_queue_pair_count(uint8_t dev_id) > { > =09struct rte_cryptodev *dev; > =20 > +=09if (!rte_cryptodev_is_valid_device_data(dev_id)) { > +=09=09CDEV_LOG_ERR("Invalid dev_id=3D%" PRIu8, dev_id); > +=09=09return 0; > +=09} > + > =09dev =3D &rte_crypto_devices[dev_id]; > =09return dev->data->nb_queue_pairs; > } > @@ -1169,6 +1176,11 @@ rte_cryptodev_sym_session_init(uint8_t dev_id, > =09uint8_t index; > =09int ret; > =20 > +=09if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) { > +=09=09CDEV_LOG_ERR("Invalid dev_id=3D%" PRIu8, dev_id); > +=09=09return -EINVAL; > +=09} > + > =09dev =3D rte_cryptodev_pmd_get_dev(dev_id); > =20 > =09if (sess =3D=3D NULL || xforms =3D=3D NULL || dev =3D=3D NULL) > @@ -1202,6 +1214,11 @@ rte_cryptodev_asym_session_init(uint8_t dev_id, > =09uint8_t index; > =09int ret; > =20 > +=09if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) { > +=09=09CDEV_LOG_ERR("Invalid dev_id=3D%" PRIu8, dev_id); > +=09=09return -EINVAL; > +=09} > + > =09dev =3D rte_cryptodev_pmd_get_dev(dev_id); > =20 > =09if (sess =3D=3D NULL || xforms =3D=3D NULL || dev =3D=3D NULL) > @@ -1271,6 +1288,11 @@ rte_cryptodev_sym_session_clear(uint8_t dev_id, > { > =09struct rte_cryptodev *dev; > =20 > +=09if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) { > +=09=09CDEV_LOG_ERR("Invalid dev_id=3D%" PRIu8, dev_id); > +=09=09return -EINVAL; > +=09} > + > =09dev =3D rte_cryptodev_pmd_get_dev(dev_id); > =20 > =09if (dev =3D=3D NULL || sess =3D=3D NULL) > @@ -1289,6 +1311,11 @@ rte_cryptodev_asym_session_clear(uint8_t dev_id, > { > =09struct rte_cryptodev *dev; > =20 > +=09if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) { > +=09=09CDEV_LOG_ERR("Invalid dev_id=3D%" PRIu8, dev_id); > +=09=09return -EINVAL; > +=09} > + > =09dev =3D rte_cryptodev_pmd_get_dev(dev_id); > =20 > =09if (dev =3D=3D NULL || sess =3D=3D NULL) > @@ -1594,8 +1621,14 @@ rte_cryptodev_driver_id_get(const char *name) > const char * > rte_cryptodev_name_get(uint8_t dev_id) > { > -=09struct rte_cryptodev *dev =3D rte_cryptodev_pmd_get_dev(dev_id); > +=09struct rte_cryptodev *dev; > =20 > +=09if (!rte_cryptodev_is_valid_device_data(dev_id)) { > +=09=09CDEV_LOG_ERR("Invalid dev_id=3D%" PRIu8, dev_id); > +=09=09return NULL; > +=09} > + > +=09dev =3D rte_cryptodev_pmd_get_dev(dev_id); > =09if (dev =3D=3D NULL) > =09=09return NULL; > =20 >=20