[oe-commits] [openembedded-core] branch rocko updated: classes: sanity-check LIC_FILES_CHKSUM

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch rocko
in repository openembedded-core.

The following commit(s) were added to refs/heads/rocko by this push:
     new f6f5415  classes: sanity-check LIC_FILES_CHKSUM
f6f5415 is described below

commit f6f54155420ae54a34f1ab87e76623c536adf2f9
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Mon Aug 13 18:20:54 2018 +0100

    classes: sanity-check LIC_FILES_CHKSUM
    
    We assume that LIC_FILES_CHKSUM is a file: URI but don't actually verify this,
    which can lead to problems if you have a URI that resolves to a path of / as
    Bitbake will then dutifully checksum / recursively.
    
    [ YOCTO #12883 ]
    
    (From OE-Core rev: e2b8a3d5a10868f9c0dec8d7b9f5f89fdd100fc8)
    
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/classes/base.bbclass    | 4 ++--
 meta/classes/license.bbclass | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index bd0d6e3..3014767 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -100,8 +100,8 @@ def get_lic_checksum_file_list(d):
         # We only care about items that are absolute paths since
         # any others should be covered by SRC_URI.
         try:
-            path = bb.fetch.decodeurl(url)[2]
-            if not path:
+            (method, host, path, user, pswd, parm) = bb.fetch.decodeurl(url)
+            if method != "file" or not path:
                 raise bb.fetch.MalformedUrl(url)
 
             if path[0] == '/':
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index d353110..82fab9c 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -482,7 +482,9 @@ def find_license_files(d):
 
     for url in lic_files.split():
         try:
-            (type, host, path, user, pswd, parm) = bb.fetch.decodeurl(url)
+            (method, host, path, user, pswd, parm) = bb.fetch.decodeurl(url)
+            if method != "file" or not path:
+                raise bb.fetch.MalformedUrl()
         except bb.fetch.MalformedUrl:
             bb.fatal("%s: LIC_FILES_CHKSUM contains an invalid URL:  %s" % (d.getVar('PF'), url))
         # We want the license filename and path

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.