diff options
| author |   Lee Chee Yang <chee.yang.lee@intel.com> | 2021-03-04 22:44:06 +0800 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2021-03-24 04:30:32 -1000 |
| commit | b8d3e1754faea3ba0b6e07d5a830fbab12b5f53d (patch) | |
| tree | 2629c9e62a96b2e4e8a50cacf92455ad7b3c96a0 | |
| parent | 3be53035c567c06a09a36d68c41393482bd4789b (diff) | |
| download | openembedded-core-b8d3e1754faea3ba0b6e07d5a830fbab12b5f53d.tar.gz | |
cve-update-db-native: consider version suffix when update CVE db
some record from NVD can merge or split suffix from version, for
example:
CVE-2017-15906
"cpe23Uri" : "cpe:2.3:a:openbsd:openssh:5.0:p1:*:*:*:*:*:*"
"cpe23Uri" : "cpe:2.3:a:openbsd:openssh:4.7p1:*:*:*:*:*:*:*"
in such case include the suffix into version when update local CVE db.
Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 13cc68197f81bb7c76fa1abecc5dd720b8bdb8d5)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/recipes-core/meta/cve-update-db-native.bb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb index 9e8e006a32..5d9fb59cbc 100644 --- a/meta/recipes-core/meta/cve-update-db-native.bb +++ b/meta/recipes-core/meta/cve-update-db-native.bb @@ -137,9 +137,14 @@ def parse_node_and_insert(c, node, cveId): product = cpe23[4] version = cpe23[5] + if cpe23[6] == '*' or cpe23[6] == '-': + version_suffix = "" + else: + version_suffix = "_" + cpe23[6] + if version != '*' and version != '-': # Version is defined, this is a '=' match - yield [cveId, vendor, product, version, '=', '', ''] + yield [cveId, vendor, product, version + version_suffix, '=', '', ''] elif version == '-': # no version information is available yield [cveId, vendor, product, version, '', '', ''] |