opencv: 4.1.0 -> 4.1.1
PATCH 1/3 opencv: 4.1.0 -> 4.1.1
---
.../opencv/{opencv_4.1.0.bb => opencv_4.1.1.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-oe/recipes-support/opencv/{opencv_4.1.0.bb => opencv_4.1.1.bb} (98%)meta-oe/recipes-support/opencv/opencv_4.1.1.bb renamed from meta-oe/recipes-support/opencv/opencv_4.1.0.bb +3 -3
@@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET_armv5 = "arm" DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" -SRCREV_opencv = "371bba8f54560b374fbcd47e7e02f015ac4969ad" -SRCREV_contrib = "2c32791a9c500343568a21ea34bf2daeac2adae7" +SRCREV_opencv = "ddbd10c0019f3ee5f43b7902d47e7fc4303a6574" +SRCREV_contrib = "0915b7eaddba3c06d83e201c9a7595e73801f417" SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4" SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
@@ -51,7 +51,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ file://0001-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-g.patch \ file://download.patch \ " -PV = "4.1.0" +PV = "4.1.1" S = "${WORKDIR}/git"
Signature · 1 line
2.17.1
PATCH 2/3 opencv: Fix CVE-2019-15939
Fixes a floating point exception
https://github.com/opencv/opencv/issues/15287
Upstream-Status: Backport
[https://github.com/opencv/opencv/commit/c05595e48274188e34a30d37ef22bdedc87c53ae]
CVE: CVE-2019-15939
--- .../opencv/opencv/CVE-2019-15939.patch | 67 +++++++++++++++++++ .../recipes-support/opencv/opencv_4.1.1.bb | 1 + 2 files changed, 68 insertions(+) create mode 100644 meta-oe/recipes-support/opencv/opencv/CVE-2019-15939.patch
meta-oe/recipes-support/opencv/opencv/CVE-2019-15939.patch new file +67 -0
@@ -0,0 +1,67 @@ +From 5a497077f109d543ab86dfdf8add1c76c0e47d29 Mon Sep 17 00:00:00 2001 +From: Alexander Alekhin <[email protected]> +Date: Fri, 23 Aug 2019 16:14:53 +0300 +Subject: [PATCH] objdetect: add input check in HOG detector + +--- + modules/objdetect/src/hog.cpp | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + +diff --git a/modules/objdetect/src/hog.cpp b/modules/objdetect/src/hog.cpp +index 9524851eebb..378bab30876 100644 +--- a/modules/objdetect/src/hog.cpp ++++ b/modules/objdetect/src/hog.cpp +@@ -68,6 +68,7 @@ enum {DESCR_FORMAT_COL_BY_COL, DESCR_FORMAT_ROW_BY_ROW}; + + static int numPartsWithin(int size, int part_size, int stride) + { ++ CV_Assert(stride != 0); + return (size - part_size + stride) / stride; + } + +@@ -80,13 +81,17 @@ static Size numPartsWithin(cv::Size size, cv::Size part_size, + + static size_t getBlockHistogramSize(Size block_size, Size cell_size, int nbins) + { ++ CV_Assert(!cell_size.empty()); + Size cells_per_block = Size(block_size.width / cell_size.width, +- block_size.height / cell_size.height); ++ block_size.height / cell_size.height); + return (size_t)(nbins * cells_per_block.area()); + } + + size_t HOGDescriptor::getDescriptorSize() const + { ++ CV_Assert(!cellSize.empty()); ++ CV_Assert(!blockStride.empty()); ++ + CV_Assert(blockSize.width % cellSize.width == 0 && + blockSize.height % cellSize.height == 0); + CV_Assert((winSize.width - blockSize.width) % blockStride.width == 0 && +@@ -144,20 +149,20 @@ bool HOGDescriptor::read(FileNode& obj) + if( !obj.isMap() ) + return false; + FileNodeIterator it = obj["winSize"].begin(); +- it >> winSize.width >> winSize.height; ++ it >> winSize.width >> winSize.height; CV_Assert(!winSize.empty()); + it = obj["blockSize"].begin(); +- it >> blockSize.width >> blockSize.height; ++ it >> blockSize.width >> blockSize.height; CV_Assert(!blockSize.empty()); + it = obj["blockStride"].begin(); +- it >> blockStride.width >> blockStride.height; ++ it >> blockStride.width >> blockStride.height; CV_Assert(!blockStride.empty()); + it = obj["cellSize"].begin(); +- it >> cellSize.width >> cellSize.height; +- obj["nbins"] >> nbins; ++ it >> cellSize.width >> cellSize.height; CV_Assert(!cellSize.empty()); ++ obj["nbins"] >> nbins; CV_Assert(nbins > 0); + obj["derivAperture"] >> derivAperture; + obj["winSigma"] >> winSigma; + obj["histogramNormType"] >> histogramNormType; + obj["L2HysThreshold"] >> L2HysThreshold; + obj["gammaCorrection"] >> gammaCorrection; +- obj["nlevels"] >> nlevels; ++ obj["nlevels"] >> nlevels; CV_Assert(nlevels > 0); + if (obj["signedGradient"].empty()) + signedGradient = false; + else
meta-oe/recipes-support/opencv/opencv_4.1.1.bb +1 -0
@@ -50,6 +50,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ file://0001-Dont-use-isystem.patch \ file://0001-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-g.patch \ file://download.patch \ + file://CVE-2019-15939.patch \ " PV = "4.1.1"
Signature · 1 line
2.17.1
PATCH 3/3 opencv: Fix CVE-2019-5063 and CVE-2019-5064
In reply to Gregory VimontUpstream-Status: Backport [https://github.com/opencv/opencv/commit/f42d5399aac80d371b17d689851406669c9b9111]
CVE: CVE-2019-5063
CVE: CVE-2019-5064
--- .../opencv/opencv/CVE-2019-5063.patch | 35 ++++++++++++++ .../opencv/opencv/CVE-2019-5064.patch | 47 +++++++++++++++++++ .../recipes-support/opencv/opencv_4.1.1.bb | 2 + 3 files changed, 84 insertions(+) create mode 100644 meta-oe/recipes-support/opencv/opencv/CVE-2019-5063.patch create mode 100644 meta-oe/recipes-support/opencv/opencv/CVE-2019-5064.patch
meta-oe/recipes-support/opencv/opencv/CVE-2019-5063.patch new file +35 -0
@@ -0,0 +1,35 @@ +From 161a6f06099f842dd4b5e499ddd6ce9daf643e40 Mon Sep 17 00:00:00 2001 +From: Alexander Alekhin <[email protected]> +Date: Thu, 7 Nov 2019 14:01:51 +0300 +Subject: [PATCH] core(persistence): add more checks for implementation + limitations + +--- + modules/core/src/persistence_xml.cpp | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/modules/core/src/persistence_xml.cpp b/modules/core/src/persistence_xml.cpp +index 89876dd3da..52b5374425 100644 +--- a/modules/core/src/persistence_xml.cpp ++++ b/modules/core/src/persistence_xml.cpp +@@ -627,6 +627,8 @@ public: + c = '\"'; + else + { ++ if (len + 2 + i >= CV_FS_MAX_LEN) ++ CV_PARSE_ERROR_CPP("string is too long"); + memcpy( strbuf + i, ptr-1, len + 2 ); + i += len + 2; + } +@@ -635,9 +637,9 @@ public: + CV_PERSISTENCE_CHECK_END_OF_BUFFER_BUG_CPP(); + } + } ++ if (i + 1 >= CV_FS_MAX_LEN) ++ CV_PARSE_ERROR_CPP("Too long string literal"); + strbuf[i++] = c; +- if( i >= CV_FS_MAX_LEN ) +- CV_PARSE_ERROR_CPP( "Too long string literal" ); + } + elem->setValue(FileNode::STRING, strbuf, i); + }
meta-oe/recipes-support/opencv/opencv/CVE-2019-5064.patch new file +47 -0
47 lines not on this page · raw message
meta-oe/recipes-support/opencv/opencv_4.1.1.bb +2 -0
@@ -51,6 +51,8 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ file://0001-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-g.patch \ file://download.patch \ file://CVE-2019-15939.patch \ + file://CVE-2019-5063.patch \ + file://CVE-2019-5064.patch \ " PV = "4.1.1"
Signature · 1 line
2.17.1
This fails on mips/glibc
https://errors.yoctoproject.org/Errors/Details/404685/
Quoted 38 lines · Gregory Vimont
Signed-off-by Gregory Vimont <[email protected]>--- .../opencv/{opencv_4.1.0.bb => opencv_4.1.1.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-oe/recipes-support/opencv/{opencv_4.1.0.bb => opencv_4.1.1.bb} (98%)meta-oe/recipes-support/opencv/opencv_4.1.1.bb renamed from meta-oe/recipes-support/opencv/opencv_4.1.0.bb +3
-4@@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET_armv5 = "arm" DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" -SRCREV_opencv = "371bba8f54560b374fbcd47e7e02f015ac4969ad" -SRCREV_contrib = "2c32791a9c500343568a21ea34bf2daeac2adae7" +SRCREV_opencv = "ddbd10c0019f3ee5f43b7902d47e7fc4303a6574" +SRCREV_contrib = "0915b7eaddba3c06d83e201c9a7595e73801f417" SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4" SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"@@ -51,7 +51,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ file://0001-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-g.patch \ file://download.patch \ " -PV = "4.1.0" +PV = "4.1.1" S = "${WORKDIR}/git" --2.17.1
Quoted 24 lines · Khem Raj
This fails on mips/glibc
https://errors.yoctoproject.org/Errors/Details/404685/
Quoted 18 lines · Gregory Vimont
Signed-off-by Gregory Vimont <[email protected]>--- .../opencv/{opencv_4.1.0.bb => opencv_4.1.1.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-oe/recipes-support/opencv/{opencv_4.1.0.bb => opencv_4.1.1.bb} (98%)meta-oe/recipes-support/opencv/opencv_4.1.1.bb renamed from meta-oe/recipes-support/opencv/opencv_4.1.0.bb +0
-0@@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET_armv5 = "arm" DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp"
Quoted 13 lines
meta-oe/recipes-support/opencv/opencv_4.1.1.bb SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ · line 54
Quoted 13 lines
meta-oe/recipes-support/opencv/opencv_4.1.1.bb renamed from meta-oe/recipes-support/opencv/opencv_4.1.0.bb +3
-3-SRCREV_opencv = "371bba8f54560b374fbcd47e7e02f015ac4969ad" -SRCREV_contrib = "2c32791a9c500343568a21ea34bf2daeac2adae7" +SRCREV_opencv = "ddbd10c0019f3ee5f43b7902d47e7fc4303a6574" +SRCREV_contrib = "0915b7eaddba3c06d83e201c9a7595e73801f417" SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4" SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"@@ -51,7 +51,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ file://0001-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-g.patch \ file://download.patch \ " -PV = "4.1.0" +PV = "4.1.1"
Gregory,
was there a reason for 4.1.1 + backports instead of 4.2.0 version released in December 2019?
Or 4.1.2 from Octobver 2019 if 4.2.x is breaking too many things.
Cheers,
Quoted 8 lines
Quoted 6 lines
meta-oe/recipes-support/opencv/opencv_4.1.1.bb renamed from meta-oe/recipes-support/opencv/opencv_4.1.0.bb +0
-1S = "${WORKDIR}/git" --2.17.1
I was working on minimal security fixes on my zeus branch. Later I will update the recipe for openCV 4.3.0.
Le jeu. 16 avr. 2020 à 21:06, Martin Jansa <[email protected]> a écrit :
Quoted 64 lines · Khem Raj
Quoted 6 lines
This fails on mips/glibc
https://errors.yoctoproject.org/Errors/Details/404685/
On Thu, Apr 16, 2020 at 7:17 AM Gregory Vimont <[email protected]>
Quoted 4 lines · wrote:
Quoted 4 lines
Signed-off-by Gregory Vimont <[email protected]>--- .../opencv/{opencv_4.1.0.bb => opencv_4.1.1.bb} | 6+++---
Quoted 2 lines
Quoted 2 lines
1 file changed, 3 insertions(+), 3 deletions(-) rename meta-oe/recipes-support/opencv/{opencv_4.1.0.bb =>opencv_4.1.1.bb} (98%)
Quoted 2 lines
Review
Quoted 2 lines
(quoted diff) +0
-0b/meta-oe/recipes-support/opencv/opencv_4.1.1.bb
Quoted 10 lines
Quoted 10 lines
similarity index 98%
rename from meta-oe/recipes-support/opencv/opencv_4.1.0.bb rename to meta-oe/recipes-support/opencv/opencv_4.1.1.bb indexd781da600..5074eb2fa100644meta-oe/recipes-support/opencv/opencv_4.1.1.bb renamed from meta-oe/recipes-support/opencv/opencv_4.1.0.bb +0
-0@@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET_armv5 = "arm" DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp"Quoted 8 lines
meta-oe/recipes-support/opencv/opencv_4.1.1.bb SRC_URI = "git://
Quoted 8 lines
meta-oe/recipes-support/opencv/opencv_4.1.1.bb renamed from meta-oe/recipes-support/opencv/opencv_4.1.0.bb +2
-2-SRCREV_opencv = "371bba8f54560b374fbcd47e7e02f015ac4969ad" -SRCREV_contrib = "2c32791a9c500343568a21ea34bf2daeac2adae7" +SRCREV_opencv = "ddbd10c0019f3ee5f43b7902d47e7fc4303a6574" +SRCREV_contrib = "0915b7eaddba3c06d83e201c9a7595e73801f417" SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4" SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"@@ -51,7 +51,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
Quoted 1 line
Quoted 1 line
file://0001-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-g.patch \
Quoted 4 lines
meta-oe/recipes-support/opencv/opencv_4.1.1.bb SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ · line 54
Quoted 4 lines
file://download.patch \ "meta-oe/recipes-support/opencv/opencv_4.1.1.bb renamed from meta-oe/recipes-support/opencv/opencv_4.1.0.bb +1
-1-PV = "4.1.0" +PV = "4.1.1"Gregory,
was there a reason for 4.1.1 + backports instead of 4.2.0 version released in December 2019?
Or 4.1.2 from Octobver 2019 if 4.2.x is breaking too many things.
Cheers,
Quoted 8 lines
Quoted 6 lines
S = "${WORKDIR}/git"
--
2.17.1
I don't know what went wrong, I see only Warnings there.
Quoted 50 lines · Khem Raj
This fails on mips/glibc
https://errors.yoctoproject.org/Errors/Details/404685/
Quoted 6 lines · Gregory Vimont
Signed-off-by Gregory Vimont <[email protected]>--- .../opencv/{opencv_4.1.0.bb => opencv_4.1.1.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-oe/recipes-support/opencv/{opencv_4.1.0.bb =>opencv_4.1.1.bb} (98%)
Review
Quoted 2 lines
(quoted diff) +0
-0b/meta-oe/recipes-support/opencv/opencv_4.1.1.bb
meta-oe/recipes-support/opencv/opencv_4.1.1.bb SRC_URI = "git://
Quoted 18 lines
similarity index 98%
rename from meta-oe/recipes-support/opencv/opencv_4.1.0.bb rename to meta-oe/recipes-support/opencv/opencv_4.1.1.bb indexd781da600..5074eb2fa100644meta-oe/recipes-support/opencv/opencv_4.1.1.bb renamed from meta-oe/recipes-support/opencv/opencv_4.1.0.bb +2
-2@@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET_armv5 = "arm" DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" -SRCREV_opencv = "371bba8f54560b374fbcd47e7e02f015ac4969ad" -SRCREV_contrib = "2c32791a9c500343568a21ea34bf2daeac2adae7" +SRCREV_opencv = "ddbd10c0019f3ee5f43b7902d47e7fc4303a6574" +SRCREV_contrib = "0915b7eaddba3c06d83e201c9a7595e73801f417" SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4" SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"@@ -51,7 +51,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
Quoted 1 line
file://0001-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-g.patch \
Quoted 11 lines
file://download.patch \ "meta-oe/recipes-support/opencv/opencv_4.1.1.bb renamed from meta-oe/recipes-support/opencv/opencv_4.1.0.bb +1
-2-PV = "4.1.0" +PV = "4.1.1" S = "${WORKDIR}/git" --2.17.1
Hello,
How can I reproduce this build configuration ?
Le ven. 17 avr. 2020 à 09:57, Grégory Vimont <[email protected]> a écrit :
Quoted 55 lines
I don't know what went wrong, I see only Warnings there.
Quoted 50 lines · Khem Raj
This fails on mips/glibc
https://errors.yoctoproject.org/Errors/Details/404685/
Quoted 6 lines · Gregory Vimont
Signed-off-by Gregory Vimont <[email protected]>--- .../opencv/{opencv_4.1.0.bb => opencv_4.1.1.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-oe/recipes-support/opencv/{opencv_4.1.0.bb =>opencv_4.1.1.bb} (98%)
Review
Quoted 2 lines
(quoted diff) +0
-0b/meta-oe/recipes-support/opencv/opencv_4.1.1.bb
meta-oe/recipes-support/opencv/opencv_4.1.1.bb SRC_URI = "git://
Quoted 18 lines
similarity index 98%
rename from meta-oe/recipes-support/opencv/opencv_4.1.0.bb rename to meta-oe/recipes-support/opencv/opencv_4.1.1.bb indexd781da600..5074eb2fa100644meta-oe/recipes-support/opencv/opencv_4.1.1.bb renamed from meta-oe/recipes-support/opencv/opencv_4.1.0.bb +2
-2@@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET_armv5 = "arm" DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" -SRCREV_opencv = "371bba8f54560b374fbcd47e7e02f015ac4969ad" -SRCREV_contrib = "2c32791a9c500343568a21ea34bf2daeac2adae7" +SRCREV_opencv = "ddbd10c0019f3ee5f43b7902d47e7fc4303a6574" +SRCREV_contrib = "0915b7eaddba3c06d83e201c9a7595e73801f417" SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4" SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"@@ -51,7 +51,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
Quoted 1 line
file://0001-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-g.patch \
Quoted 11 lines
file://download.patch \ "meta-oe/recipes-support/opencv/opencv_4.1.1.bb renamed from meta-oe/recipes-support/opencv/opencv_4.1.0.bb +1
-2-PV = "4.1.0" +PV = "4.1.1" S = "${WORKDIR}/git" --2.17.1
Quoted 4 lines · Grégory Vimont
Hello,
How can I reproduce this build configuration ?
MACHINE=qemumips bitbake opencv
Quoted 51 lines · Grégory Vimont
Quoted 49 lines
I don't know what went wrong, I see only Warnings there.
Quoted 45 lines · Khem Raj
This fails on mips/glibc
https://errors.yoctoproject.org/Errors/Details/404685/
Quoted 38 lines · Gregory Vimont
Signed-off-by Gregory Vimont <[email protected]>--- .../opencv/{opencv_4.1.0.bb => opencv_4.1.1.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-oe/recipes-support/opencv/{opencv_4.1.0.bb => opencv_4.1.1.bb} (98%)meta-oe/recipes-support/opencv/opencv_4.1.1.bb renamed from meta-oe/recipes-support/opencv/opencv_4.1.0.bb +3
-4@@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET_armv5 = "arm" DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" -SRCREV_opencv = "371bba8f54560b374fbcd47e7e02f015ac4969ad" -SRCREV_contrib = "2c32791a9c500343568a21ea34bf2daeac2adae7" +SRCREV_opencv = "ddbd10c0019f3ee5f43b7902d47e7fc4303a6574" +SRCREV_contrib = "0915b7eaddba3c06d83e201c9a7595e73801f417" SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4" SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"@@ -51,7 +51,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ file://0001-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-g.patch \ file://download.patch \ " -PV = "4.1.0" +PV = "4.1.1" S = "${WORKDIR}/git" --2.17.1