From patchwork Wed Apr 10 13:10:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 42175 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4F86CD128A for ; Wed, 10 Apr 2024 13:11:18 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web10.165497.1712754668941563471 for ; Wed, 10 Apr 2024 06:11:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=VpmEewNz; spf=softfail (domain: sakoman.com, ip: 209.85.210.174, mailfrom: steve@sakoman.com) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-6ed04c91c46so4747947b3a.0 for ; Wed, 10 Apr 2024 06:11:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1712754668; x=1713359468; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=YHEN3oP+JVIo//JYJZmATjArSNvN458jU5XoSoA2WfQ=; b=VpmEewNz5Ln8hxRVR0dz2O4mRnGrNaiOq4P3pEXwDMSgKoFQqMzJ3VqstBjgDaKF0v LqUYGPQLjC1nGWQ5m+4HA1k0EBchP+Q+gEZEOvqETvpN2XOv7F04SxJONVdxDv5KdYNY ULrY7+ldqXOttPwONSnHEnB+34O2e6jVif/pvkolHi0lZ8jV6x/EadyI24GvE5DVOtl2 RI3jOoCmZOYcm3DPPQCUR0cG54jZAK5Uv0+ZeFthUnQcmKY1sHF/kk8IQGMF25B5D9WS R8HG2l5QT7xZ9tlec4+aAM8ph5xEprB7WVhv/kETVXhyKSHhgoXANZct6eI+frCIXNGQ MgQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712754668; x=1713359468; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YHEN3oP+JVIo//JYJZmATjArSNvN458jU5XoSoA2WfQ=; b=Dcjk1GQX1oZIn7JvbXXifAafI/bl6xSI2qLXkk3jUC6fCUwxTFmB2K/7XVPMx2LV4N HQaAUY6eNfN2DmfpsU12XenFH8owgdxjJQQ/mN5Cdd5UUTdSPVt/gFr8OI8gB3Weefm2 krmw4dlh2ELK+bthkMZ31GtsDZff7tziqVfT6LsoEEVcskPp9qNfa5He6mu83ulwNMbM qxKao1L0PkHL0QEK6X0p9eTsN+otZyag39PS/nZRMvzg6Yivj5rlL4UBULtzErW3iZZf U6btU9yq3t7iZgVW00xN33oGyf6WqC82H1Tc44NJt8Fd6HmDKtfQ2FgU54gBam5NKlrv B8nQ== X-Gm-Message-State: AOJu0YxXgIZhjSjGD3YM6V5vZ2oMeZDFO7sosY3Db3dY9kibc313DgXO hGNjjPJrSugm2y3zLBPxoTvbwAPdKS7Z/j92nNu8yorCHQ0YZk2N+gwX4pQv51I3lTeAf9qyKrL zplc= X-Google-Smtp-Source: AGHT+IHQEe+qF+pkBCgaQmTtuh+gf1ZY3Vwyn8yWImOPUW+Qce0DpqNE1Jc90UFZgzxBvLtrvwEZgA== X-Received: by 2002:a05:6a00:9a3:b0:6ed:435f:ec9b with SMTP id u35-20020a056a0009a300b006ed435fec9bmr2943555pfg.20.1712754666697; Wed, 10 Apr 2024 06:11:06 -0700 (PDT) Received: from xps13.. ([199.58.97.236]) by smtp.gmail.com with ESMTPSA id c17-20020aa78c11000000b006ed0199bd57sm10054887pfd.177.2024.04.10.06.11.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Apr 2024 06:11:06 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 1/5] ncurses: Backport fix for CVE-2023-50495 Date: Wed, 10 Apr 2024 06:10:54 -0700 Message-Id: <530314b699a7ad53e6dcd96658873cef7014e483.1712754495.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 10 Apr 2024 13:11:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198094 From: Vijay Anusuri Upstream-Status: Backport from https://github.com/ThomasDickey/ncurses-snapshots/commit/efe9674ee14b14b788f9618941f97d31742f0adc Reference: https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230424.patch.gz Signed-off-by: Vijay Anusuri Signed-off-by: Steve Sakoman --- .../ncurses/files/CVE-2023-50495.patch | 79 +++++++++++++++++++ meta/recipes-core/ncurses/ncurses_6.2.bb | 1 + 2 files changed, 80 insertions(+) create mode 100644 meta/recipes-core/ncurses/files/CVE-2023-50495.patch diff --git a/meta/recipes-core/ncurses/files/CVE-2023-50495.patch b/meta/recipes-core/ncurses/files/CVE-2023-50495.patch new file mode 100644 index 0000000000..58c23866d1 --- /dev/null +++ b/meta/recipes-core/ncurses/files/CVE-2023-50495.patch @@ -0,0 +1,79 @@ +Fix for CVE-2023-50495 from upstream: +https://github.com/ThomasDickey/ncurses-snapshots/commit/efe9674ee14b14b788f9618941f97d31742f0adc + +Reference: +https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230424.patch.gz + +Upstream-Status: Backport [import from suse ftp.pbone.net/mirror/ftp.opensuse.org/update/leap-micro/5.3/sle/src/ncurses-6.1-150000.5.20.1.src.rpm +Upstream commit https://github.com/ThomasDickey/ncurses-snapshots/commit/efe9674ee14b14b788f9618941f97d31742f0adc] +CVE: CVE-2023-50495 +Signed-off-by: Vijay Anusuri +--- + ncurses/tinfo/parse_entry.c | 23 ++++++++++++++++------- + 1 file changed, 16 insertions(+), 7 deletions(-) + +diff --git a/ncurses/tinfo/parse_entry.c b/ncurses/tinfo/parse_entry.c +index 23574b66..56ba9ae6 100644 +--- a/ncurses/tinfo/parse_entry.c ++++ b/ncurses/tinfo/parse_entry.c +@@ -110,7 +110,7 @@ _nc_extend_names(ENTRY * entryp, const char *name, int token_type) + /* Well, we are given a cancel for a name that we don't recognize */ + return _nc_extend_names(entryp, name, STRING); + default: +- return 0; ++ return NULL; + } + + /* Adjust the 'offset' (insertion-point) to keep the lists of extended +@@ -142,6 +142,11 @@ _nc_extend_names(ENTRY * entryp, const char *name, int token_type) + for (last = (unsigned) (max - 1); last > tindex; last--) + + if (!found) { ++ char *saved; ++ ++ if ((saved = _nc_save_str(name)) == NULL) ++ return NULL; ++ + switch (token_type) { + case BOOLEAN: + tp->ext_Booleans++; +@@ -169,7 +174,7 @@ _nc_extend_names(ENTRY * entryp, const char *name, int token_type) + TYPE_REALLOC(char *, actual, tp->ext_Names); + while (--actual > offset) + tp->ext_Names[actual] = tp->ext_Names[actual - 1]; +- tp->ext_Names[offset] = _nc_save_str(name); ++ tp->ext_Names[offset] = saved; + } + + temp.nte_name = tp->ext_Names[offset]; +@@ -337,6 +342,8 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent) + bool is_use = (strcmp(_nc_curr_token.tk_name, "use") == 0); + bool is_tc = !is_use && (strcmp(_nc_curr_token.tk_name, "tc") == 0); + if (is_use || is_tc) { ++ char *saved; ++ + if (!VALID_STRING(_nc_curr_token.tk_valstring) + || _nc_curr_token.tk_valstring[0] == '\0') { + _nc_warning("missing name for use-clause"); +@@ -350,11 +357,13 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent) + _nc_curr_token.tk_valstring); + continue; + } +- entryp->uses[entryp->nuses].name = _nc_save_str(_nc_curr_token.tk_valstring); +- entryp->uses[entryp->nuses].line = _nc_curr_line; +- entryp->nuses++; +- if (entryp->nuses > 1 && is_tc) { +- BAD_TC_USAGE ++ if ((saved = _nc_save_str(_nc_curr_token.tk_valstring)) != NULL) { ++ entryp->uses[entryp->nuses].name = saved; ++ entryp->uses[entryp->nuses].line = _nc_curr_line; ++ entryp->nuses++; ++ if (entryp->nuses > 1 && is_tc) { ++ BAD_TC_USAGE ++ } + } + } else { + /* normal token lookup */ +-- +2.25.1 + diff --git a/meta/recipes-core/ncurses/ncurses_6.2.bb b/meta/recipes-core/ncurses/ncurses_6.2.bb index 33285bcb5b..dbff149f55 100644 --- a/meta/recipes-core/ncurses/ncurses_6.2.bb +++ b/meta/recipes-core/ncurses/ncurses_6.2.bb @@ -6,6 +6,7 @@ SRC_URI += "file://0001-tic-hang.patch \ file://CVE-2021-39537.patch \ file://CVE-2022-29458.patch \ file://CVE-2023-29491.patch \ + file://CVE-2023-50495.patch \ " # commit id corresponds to the revision in package version SRCREV = "a669013cd5e9d6434e5301348ea51baf306c93c4" From patchwork Wed Apr 10 13:10:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 42176 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A64E6CD1299 for ; Wed, 10 Apr 2024 13:11:18 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web11.166618.1712754669818273202 for ; Wed, 10 Apr 2024 06:11:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=JYT5mSlE; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-6ed11782727so3382961b3a.1 for ; Wed, 10 Apr 2024 06:11:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1712754669; x=1713359469; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=AjvKPorppMI48KmCvz7YfwotXn+RLcJyM7FuVVzVcPg=; b=JYT5mSlEVDUM95I84RrOBSjkBdG1Sj9BeJbiNIConPtsnFnvFX+/ShnNCP/vzZn+9D 4hzneiEc6Te6HISgy59sjSpbFgPO9rtOF2KznrHbQVAAGvMV0CkP2M554nv/9nShuysP 0anF7OiYSg2WraxuQlL7Q/MFiZjsKlb1iZRDf/YvqOAfaxFOHuxk6PmPahFsQj6LxZfp mH/OvUbPOpVqYQw4Uw/jPU2hCmN0sZzsjUAUrqrJdbSWUq80hrakZyWwoQMgmYgMvwXC kA/dd8U75fao3nJW12h+UNg8K99P/Tg8tsgGxynG9cPnDbr7OSnf5L1yKkGRfLkRekqU djgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712754669; x=1713359469; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AjvKPorppMI48KmCvz7YfwotXn+RLcJyM7FuVVzVcPg=; b=dxcmu+K5iIlCITH5XBQyQyPg83XLJH3qFEKvwfKzFk/GqmEKN8COoV+D9Ae1mgE2uc 8LaVE9EJKp/s7C9zK5GKUcIcsqdEcqKr4vzLpisLe2iBaZntt6nsJjEsGS/5AHlkTKH+ d2Wr5StUVxCef1xZF5h99odY7Vfc/3lE1nEJDU2bPJCUZ872LzQRWWTgOXElDM57P4XS c9noYmhq9w/z84Y3c36l7TB9+zYzCbRIplvUFMu5ROArOvRyhmO8fuTI9n15M4bj6T1M OUqahLwBQ37kqzdfdAtEhbm2uWyAnBw2WouQKlfjnzHtfdBHYLYNrpgHRArUjkBecQu2 pzYA== X-Gm-Message-State: AOJu0YycpN9DvI4BJA3Xet1dhRXrk5uCUW222PUHyAmFuHFXPgbnLgf9 DN74otJsPNF8ZmOHMF3fu1Lav+EnDSaZbD8u85roxsrRRaPI95XqEqd0nE9+FtgWJMfUHSsPGG7 /02Y= X-Google-Smtp-Source: AGHT+IHWLhPF7cPXt3E7Y4qxIwv8CD/J8KB0juESu9YruJDBzw6k9a2ng0CFpQZbNsAC9sLjYypzOw== X-Received: by 2002:a05:6a00:1989:b0:6eb:2b:43b4 with SMTP id d9-20020a056a00198900b006eb002b43b4mr2611108pfl.27.1712754668399; Wed, 10 Apr 2024 06:11:08 -0700 (PDT) Received: from xps13.. ([199.58.97.236]) by smtp.gmail.com with ESMTPSA id c17-20020aa78c11000000b006ed0199bd57sm10054887pfd.177.2024.04.10.06.11.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Apr 2024 06:11:08 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 2/5] go: Backport fix for CVE-2024-24784 Date: Wed, 10 Apr 2024 06:10:55 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 10 Apr 2024 13:11:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198095 From: Ashish Sharma Upstream-Status: Backport [https://github.com/golang/go/commit/5330cd225ba54c7dc78c1b46dcdf61a4671a632c] Signed-off-by: Ashish Sharma Signed-off-by: Steve Sakoman --- meta/recipes-devtools/go/go-1.14.inc | 1 + .../go/go-1.14/CVE-2024-24784.patch | 205 ++++++++++++++++++ 2 files changed, 206 insertions(+) create mode 100644 meta/recipes-devtools/go/go-1.14/CVE-2024-24784.patch diff --git a/meta/recipes-devtools/go/go-1.14.inc b/meta/recipes-devtools/go/go-1.14.inc index 69b65f3eb2..9c7ceda891 100644 --- a/meta/recipes-devtools/go/go-1.14.inc +++ b/meta/recipes-devtools/go/go-1.14.inc @@ -91,6 +91,7 @@ SRC_URI += "\ file://CVE-2023-45289.patch \ file://CVE-2023-45290.patch \ file://CVE-2024-24785.patch \ + file://CVE-2024-24784.patch \ " SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch" diff --git a/meta/recipes-devtools/go/go-1.14/CVE-2024-24784.patch b/meta/recipes-devtools/go/go-1.14/CVE-2024-24784.patch new file mode 100644 index 0000000000..e9d9d972b9 --- /dev/null +++ b/meta/recipes-devtools/go/go-1.14/CVE-2024-24784.patch @@ -0,0 +1,205 @@ +From 5330cd225ba54c7dc78c1b46dcdf61a4671a632c Mon Sep 17 00:00:00 2001 +From: Roland Shoemaker +Date: Wed, 10 Jan 2024 11:02:14 -0800 +Subject: [PATCH] [release-branch.go1.22] net/mail: properly handle special + characters in phrase and obs-phrase + +Fixes a couple of misalignments with RFC 5322 which introduce +significant diffs between (mostly) conformant parsers. + +This change reverts the changes made in CL50911, which allowed certain +special RFC 5322 characters to appear unquoted in the "phrase" syntax. +It is unclear why this change was made in the first place, and created +a divergence from comformant parsers. In particular this resulted in +treating comments in display names incorrectly. + +Additionally properly handle trailing malformed comments in the group +syntax. + +For #65083 +Fixed #65849 + +Change-Id: I00dddc044c6ae3381154e43236632604c390f672 +Reviewed-on: https://go-review.googlesource.com/c/go/+/555596 +Reviewed-by: Damien Neil +LUCI-TryBot-Result: Go LUCI +Reviewed-on: https://go-review.googlesource.com/c/go/+/566215 +Reviewed-by: Carlos Amedee + +Upstream-Status: Backport [https://github.com/golang/go/commit/5330cd225ba54c7dc78c1b46dcdf61a4671a632c] +CVE: CVE-2024-24784 +Signed-off-by: Ashish Sharma + + src/net/mail/message.go | 30 +++++++++++++++------------ + src/net/mail/message_test.go | 40 ++++++++++++++++++++++++++---------- + 2 files changed, 46 insertions(+), 24 deletions(-) + +diff --git a/src/net/mail/message.go b/src/net/mail/message.go +index af516fc30f470..fc2a9e46f811b 100644 +--- a/src/net/mail/message.go ++++ b/src/net/mail/message.go +@@ -280,7 +280,7 @@ func (a *Address) String() string { + // Add quotes if needed + quoteLocal := false + for i, r := range local { +- if isAtext(r, false, false) { ++ if isAtext(r, false) { + continue + } + if r == '.' { +@@ -444,7 +444,7 @@ func (p *addrParser) parseAddress(handleGroup bool) ([]*Address, error) { + if !p.consume('<') { + atext := true + for _, r := range displayName { +- if !isAtext(r, true, false) { ++ if !isAtext(r, true) { + atext = false + break + } +@@ -479,7 +479,9 @@ func (p *addrParser) consumeGroupList() ([]*Address, error) { + // handle empty group. + p.skipSpace() + if p.consume(';') { +- p.skipCFWS() ++ if !p.skipCFWS() { ++ return nil, errors.New("mail: misformatted parenthetical comment") ++ } + return group, nil + } + +@@ -496,7 +498,9 @@ func (p *addrParser) consumeGroupList() ([]*Address, error) { + return nil, errors.New("mail: misformatted parenthetical comment") + } + if p.consume(';') { +- p.skipCFWS() ++ if !p.skipCFWS() { ++ return nil, errors.New("mail: misformatted parenthetical comment") ++ } + break + } + if !p.consume(',') { +@@ -566,6 +570,12 @@ func (p *addrParser) consumePhrase() (phrase string, err error) { + var words []string + var isPrevEncoded bool + for { ++ // obs-phrase allows CFWS after one word ++ if len(words) > 0 { ++ if !p.skipCFWS() { ++ return "", errors.New("mail: misformatted parenthetical comment") ++ } ++ } + // word = atom / quoted-string + var word string + p.skipSpace() +@@ -661,7 +671,6 @@ Loop: + // If dot is true, consumeAtom parses an RFC 5322 dot-atom instead. + // If permissive is true, consumeAtom will not fail on: + // - leading/trailing/double dots in the atom (see golang.org/issue/4938) +-// - special characters (RFC 5322 3.2.3) except '<', '>', ':' and '"' (see golang.org/issue/21018) + func (p *addrParser) consumeAtom(dot bool, permissive bool) (atom string, err error) { + i := 0 + +@@ -672,7 +681,7 @@ Loop: + case size == 1 && r == utf8.RuneError: + return "", fmt.Errorf("mail: invalid utf-8 in address: %q", p.s) + +- case size == 0 || !isAtext(r, dot, permissive): ++ case size == 0 || !isAtext(r, dot): + break Loop + + default: +@@ -850,18 +859,13 @@ func (e charsetError) Error() string { + + // isAtext reports whether r is an RFC 5322 atext character. + // If dot is true, period is included. +-// If permissive is true, RFC 5322 3.2.3 specials is included, +-// except '<', '>', ':' and '"'. +-func isAtext(r rune, dot, permissive bool) bool { ++func isAtext(r rune, dot bool) bool { + switch r { + case '.': + return dot + + // RFC 5322 3.2.3. specials +- case '(', ')', '[', ']', ';', '@', '\\', ',': +- return permissive +- +- case '<', '>', '"', ':': ++ case '(', ')', '<', '>', '[', ']', ':', ';', '@', '\\', ',', '"': // RFC 5322 3.2.3. specials + return false + } + return isVchar(r) +diff --git a/src/net/mail/message_test.go b/src/net/mail/message_test.go +index 1e1bb4092f659..1f2f62afbf406 100644 +--- a/src/net/mail/message_test.go ++++ b/src/net/mail/message_test.go +@@ -385,8 +385,11 @@ func TestAddressParsingError(t *testing.T) { + 13: {"group not closed: null@example.com", "expected comma"}, + 14: {"group: first@example.com, second@example.com;", "group with multiple addresses"}, + 15: {"john.doe", "missing '@' or angle-addr"}, +- 16: {"john.doe@", "no angle-addr"}, ++ 16: {"john.doe@", "missing '@' or angle-addr"}, + 17: {"John Doe@foo.bar", "no angle-addr"}, ++ 18: {" group: null@example.com; (asd", "misformatted parenthetical comment"}, ++ 19: {" group: ; (asd", "misformatted parenthetical comment"}, ++ 20: {`(John) Doe `, "missing word in phrase:"}, + } + + for i, tc := range mustErrTestCases { +@@ -436,24 +439,19 @@ func TestAddressParsing(t *testing.T) { + Address: "john.q.public@example.com", + }}, + }, +- { +- `"John (middle) Doe" `, +- []*Address{{ +- Name: "John (middle) Doe", +- Address: "jdoe@machine.example", +- }}, +- }, ++ // Comment in display name + { + `John (middle) Doe `, + []*Address{{ +- Name: "John (middle) Doe", ++ Name: "John Doe", + Address: "jdoe@machine.example", + }}, + }, ++ // Display name is quoted string, so comment is not a comment + { +- `John !@M@! Doe `, ++ `"John (middle) Doe" `, + []*Address{{ +- Name: "John !@M@! Doe", ++ Name: "John (middle) Doe", + Address: "jdoe@machine.example", + }}, + }, +@@ -788,6 +786,26 @@ func TestAddressParsing(t *testing.T) { + }, + }, + }, ++ // Comment in group display name ++ { ++ `group (comment:): a@example.com, b@example.com;`, ++ []*Address{ ++ { ++ Address: "a@example.com", ++ }, ++ { ++ Address: "b@example.com", ++ }, ++ }, ++ }, ++ { ++ `x(:"):"@a.example;("@b.example;`, ++ []*Address{ ++ { ++ Address: `@a.example;(@b.example`, ++ }, ++ }, ++ }, + } + for _, test := range tests { + if len(test.exp) == 1 { From patchwork Wed Apr 10 13:10:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 42178 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2E50CD11C2 for ; Wed, 10 Apr 2024 13:11:18 +0000 (UTC) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by mx.groups.io with SMTP id smtpd.web11.166619.1712754670493697911 for ; Wed, 10 Apr 2024 06:11:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=KESyX47y; spf=softfail (domain: sakoman.com, ip: 209.85.210.173, mailfrom: steve@sakoman.com) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-6ed2dc03df6so2858190b3a.1 for ; Wed, 10 Apr 2024 06:11:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1712754670; x=1713359470; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=aPv0w3RSB36SeXxmiWi1BExfmamHxrEV7pCHcYjXP9Q=; b=KESyX47y+fKmVJ5JrxZRdVjSG9xla5cMQPltWyG0KYRgskuhmzPTUpol1BqhZjN/O3 qjPqjpt0iO/+iaY8NF8CYsqJwVxXY6Iv2IivOx8aiTTQBfGAD1M2xZaNGuJfj2wJDJbS udCnsuDiU6U/wgek5Pt3/eBritbR77nHAUWkgygn0wE1EyjjPh6sXyvSIiwPPFYjSNJp e5elqWrc4BDtQBWLEwUfX2zcD5I3l9jUCLgegR5WDnTJnkhJP7XnJs9FVpZm+1fsXttL DuSjtkvh4/luHFeF7tYf85NCi55pPfebxsildg2YQJFVDTe3hPq39oxAmmGtDv201T8Q fSQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712754670; x=1713359470; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aPv0w3RSB36SeXxmiWi1BExfmamHxrEV7pCHcYjXP9Q=; b=qjpWy8qGiMIi/F9XPGh9r7BIuSySP1eUq7Rx4X7Z1S9f77xk71/b0AN3MPZGwo7llb 1lygAIBMMqMVldw4/d/ihLspgBNMmbhpYxwdFwm5w5HGk9qncKmX9Ok0nCDbeMwyAV+C Gx/BWk2suylHlVuxTyLnYWT7dZFgsd6tiWgAcDakveKJnTlE/047c7jvdGm9ENcRyp5E Y6kfOtYalvYpWk2qpTOCKF+25QTkUl7Ao8dAlEPbyXABD5ep3O8/Ttveog6w91oAECb7 6Vc52Y7XcENISEf85hn+EkGNR1vhIcIznqMWqMnDaX0gv/kGZcqRP3p75ui1yDtjRlH7 lSdA== X-Gm-Message-State: AOJu0YzjRihlPhdhqDdJDnG6CFN9EV6NuwS9QVCKA/nHzyavRFDS1Roh B+Bn40peRviXSAHgOrHekSA7HrKF8d+fcd70S1l7anQnKFwoNaVQMmFfFBmtiFdh7BiZVhVdHQh diig= X-Google-Smtp-Source: AGHT+IGBrbohS9t+CHjOqHoAU/vT0HPL1/CxKOd+sMaNUy889zXXklxJujecOPCo4T0gtmJnxiycTw== X-Received: by 2002:a05:6a00:1915:b0:6ed:1c7:8c61 with SMTP id y21-20020a056a00191500b006ed01c78c61mr2876662pfi.12.1712754669770; Wed, 10 Apr 2024 06:11:09 -0700 (PDT) Received: from xps13.. ([199.58.97.236]) by smtp.gmail.com with ESMTPSA id c17-20020aa78c11000000b006ed0199bd57sm10054887pfd.177.2024.04.10.06.11.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Apr 2024 06:11:09 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 3/5] xserver-xorg: Backport fix for CVE-2024-31081 Date: Wed, 10 Apr 2024 06:10:56 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 10 Apr 2024 13:11:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198096 From: Ashish Sharma Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/-/commit/3e77295f888c67fc7645db5d0c00926a29ffecee] Signed-off-by: Ashish Sharma Signed-off-by: Steve Sakoman --- .../xserver-xorg/CVE-2024-31081.patch | 47 +++++++++++++++++++ .../xorg-xserver/xserver-xorg_1.20.14.bb | 1 + 2 files changed, 48 insertions(+) create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2024-31081.patch diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2024-31081.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2024-31081.patch new file mode 100644 index 0000000000..d2c551a0e5 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2024-31081.patch @@ -0,0 +1,47 @@ +From 3e77295f888c67fc7645db5d0c00926a29ffecee Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Fri, 22 Mar 2024 18:56:27 -0700 +Subject: [PATCH] Xi: ProcXIPassiveGrabDevice needs to use unswapped length to + send reply + +CVE-2024-31081 + +Fixes: d220d6907 ("Xi: add GrabButton and GrabKeysym code.") +Signed-off-by: Alan Coopersmith +Part-of: + +Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/-/commit/3e77295f888c67fc7645db5d0c00926a29ffecee] +CVE: CVE-2024-31081 +Signed-off-by: Ashish Sharma + + Xi/xipassivegrab.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c +index c9ac2f8553..896233bec2 100644 +--- a/Xi/xipassivegrab.c ++++ b/Xi/xipassivegrab.c +@@ -93,6 +93,7 @@ ProcXIPassiveGrabDevice(ClientPtr client) + GrabParameters param; + void *tmp; + int mask_len; ++ uint32_t length; + + REQUEST(xXIPassiveGrabDeviceReq); + REQUEST_FIXED_SIZE(xXIPassiveGrabDeviceReq, +@@ -247,9 +248,11 @@ ProcXIPassiveGrabDevice(ClientPtr client) + } + } + ++ /* save the value before SRepXIPassiveGrabDevice swaps it */ ++ length = rep.length; + WriteReplyToClient(client, sizeof(rep), &rep); + if (rep.num_modifiers) +- WriteToClient(client, rep.length * 4, modifiers_failed); ++ WriteToClient(client, length * 4, modifiers_failed); + + out: + free(modifiers_failed); +-- +GitLab + diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.14.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.14.bb index d6c6c5bd45..ade250542f 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.14.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.14.bb @@ -30,6 +30,7 @@ SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat file://CVE-2024-21886-2.patch \ file://CVE-2024-0408.patch \ file://CVE-2024-0409.patch \ + file://CVE-2024-31081.patch \ " SRC_URI[md5sum] = "453fc86aac8c629b3a5b77e8dcca30bf" SRC_URI[sha256sum] = "54b199c9280ff8bf0f73a54a759645bd0eeeda7255d1c99310d5b7595f3ac066" From patchwork Wed Apr 10 13:10:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 42179 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB2F1CD129A for ; Wed, 10 Apr 2024 13:11:18 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web11.166621.1712754673133306028 for ; Wed, 10 Apr 2024 06:11:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=r9hKBOui; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-6ed32341906so2687749b3a.1 for ; Wed, 10 Apr 2024 06:11:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1712754672; x=1713359472; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=9M/P2ygmBnqnGmA6FQ8s0rATHo0Q0o+ba4RCmCKB1vw=; b=r9hKBOuijYxE9Av23MDVmj+YV1EcfgG0fcTKJxnRQNMUpNQelg7pG6+T5WRcKA8UJ9 ALfazh60JMSmeaZySc2PRe/VLrQFfbHIccr6xFAxccq8wvASHyqz3I0T8DtA6/l6aeSY y+QwXLEl1pPwJv4wAcdmcPpvpv3sWtKnMaZu/STVuSjxR72XBoAk+BjRYGA3O/tVfzN8 mYIEOnTsio4PJ9UO7EV8KnJlGNRkAItXwVDMZREEusJYhXNuFmId0lr7rDkXY+O9AwKM bBY2mcQs/xpsV7InyB4+iu1C8LfFSmScXFkWOX/M4kE3Z1e6dN0QZMYPsk/WpHmYyYS8 52Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712754672; x=1713359472; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9M/P2ygmBnqnGmA6FQ8s0rATHo0Q0o+ba4RCmCKB1vw=; b=GrGE96qfQx4sqRa2RV2m6O9jtzsB+TfvLgxVr1qYKT5zoty1CxAQC3ebFt8yTOGnKL eBeog+SRKoXXLnQ0vkpx3OM001Frd2MVBIWSbf64EXoIcuvnH/LLz90wPxrSWlhFUf6K E2Migj9AwrOMrEDB3zz2MweqY3MiyagoVXch196oK1VvakzYZ93tN8WeGzfDZ2pLYWO0 B3vJrcaUWtVOVgSVGsF9su7FKBUrCloID9V3VuALPj6rLud6/DF+BJXZeNMNUEqiaAXc jXyKrInEdTiY1KfknNX6ggrX/w0uYNzcvy8YKYXMnR8ItUeETyAr5qxPrh8aA0MYUWDL dBIw== X-Gm-Message-State: AOJu0YwyQMFxcQq/WBSCI2bzNH+xHIZueIMh3ilm9/nuFQ94sImQS0i0 5XdJft+TXdaFKhtqNBhF5YymZguCaEAK10MvVIXQ/LjyMRzg8MYO3xsdFBl1EzpINO6ULlfjgzE Lcfc= X-Google-Smtp-Source: AGHT+IHZnr5uvtmrE3e9dBVKGErIhzCpJHyhz4+sh7+hcxFcPsYICS0NjkjIHcRiqk3Exvrw1yAPVg== X-Received: by 2002:a05:6a20:431b:b0:1a7:68bf:6eba with SMTP id h27-20020a056a20431b00b001a768bf6ebamr2826262pzk.42.1712754672326; Wed, 10 Apr 2024 06:11:12 -0700 (PDT) Received: from xps13.. ([199.58.97.236]) by smtp.gmail.com with ESMTPSA id c17-20020aa78c11000000b006ed0199bd57sm10054887pfd.177.2024.04.10.06.11.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Apr 2024 06:11:12 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 4/5] xserver-xorg: Backport fix for CVE-2024-31080 Date: Wed, 10 Apr 2024 06:10:57 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 10 Apr 2024 13:11:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198097 From: Ashish Sharma Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/-/commit/96798fc1967491c80a4d0c8d9e0a80586cb2152b] Signed-off-by: Ashish Sharma Signed-off-by: Steve Sakoman --- .../xserver-xorg/CVE-2024-31080.patch | 49 +++++++++++++++++++ .../xorg-xserver/xserver-xorg_1.20.14.bb | 1 + 2 files changed, 50 insertions(+) create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2024-31080.patch diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2024-31080.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2024-31080.patch new file mode 100644 index 0000000000..da735efb2b --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2024-31080.patch @@ -0,0 +1,49 @@ +From 96798fc1967491c80a4d0c8d9e0a80586cb2152b Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Fri, 22 Mar 2024 18:51:45 -0700 +Subject: [PATCH] Xi: ProcXIGetSelectedEvents needs to use unswapped length to + send reply + +CVE-2024-31080 + +Reported-by: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=69762 +Fixes: 53e821ab4 ("Xi: add request processing for XIGetSelectedEvents.") +Signed-off-by: Alan Coopersmith +Part-of: + +Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/-/commit/96798fc1967491c80a4d0c8d9e0a80586cb2152b] +CVE: CVE-2024-31080 +Signed-off-by: Ashish Sharma + + Xi/xiselectev.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/Xi/xiselectev.c b/Xi/xiselectev.c +index edcb8a0d36..ac14949871 100644 +--- a/Xi/xiselectev.c ++++ b/Xi/xiselectev.c +@@ -349,6 +349,7 @@ ProcXIGetSelectedEvents(ClientPtr client) + InputClientsPtr others = NULL; + xXIEventMask *evmask = NULL; + DeviceIntPtr dev; ++ uint32_t length; + + REQUEST(xXIGetSelectedEventsReq); + REQUEST_SIZE_MATCH(xXIGetSelectedEventsReq); +@@ -418,10 +419,12 @@ ProcXIGetSelectedEvents(ClientPtr client) + } + } + ++ /* save the value before SRepXIGetSelectedEvents swaps it */ ++ length = reply.length; + WriteReplyToClient(client, sizeof(xXIGetSelectedEventsReply), &reply); + + if (reply.num_masks) +- WriteToClient(client, reply.length * 4, buffer); ++ WriteToClient(client, length * 4, buffer); + + free(buffer); + return Success; +-- +GitLab + diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.14.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.14.bb index ade250542f..04a6e734ef 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.14.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.14.bb @@ -31,6 +31,7 @@ SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat file://CVE-2024-0408.patch \ file://CVE-2024-0409.patch \ file://CVE-2024-31081.patch \ + file://CVE-2024-31080.patch \ " SRC_URI[md5sum] = "453fc86aac8c629b3a5b77e8dcca30bf" SRC_URI[sha256sum] = "54b199c9280ff8bf0f73a54a759645bd0eeeda7255d1c99310d5b7595f3ac066" From patchwork Wed Apr 10 13:10:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 42177 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7D6BCD129C for ; Wed, 10 Apr 2024 13:11:18 +0000 (UTC) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mx.groups.io with SMTP id smtpd.web11.166624.1712754674811190981 for ; Wed, 10 Apr 2024 06:11:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=a5BbxnDG; spf=softfail (domain: sakoman.com, ip: 209.85.210.171, mailfrom: steve@sakoman.com) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-6ed01c63657so4436325b3a.2 for ; Wed, 10 Apr 2024 06:11:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1712754674; x=1713359474; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=LoqXnbNJ3x9Jrovup0C7bEHubadJ8B3guyJvxS32KGE=; b=a5BbxnDGtiC/LBHQsUBe6DdnKNspg4iQbQ3QI7bw4YLydTqI02KxUHxP7eNqgocsSx 5Tw9zmB1LlOGQ60TYh8dQjCG07bG9Kok3jN2suZoPI1auGUt+Oy59kpqtpcCAmrgC/lq TPOq8XOCLA7FvGMIC6W7ncp9y7xGQ3a2AfawjA9x3zoawY6KtTTKue1Mw0Q5eomY+nkO 5fOt9KH0Al+2o1W8clL0sMq3LZ4ts3SS83QJVWA+vuQW+QCpX98UVuuE04/oFqZsPyE/ Rh8EEVyRqmsAj77awBdnFqON/e+/PIxm7KTk/hMyHC6AXAgWJBZof2s9VexCKH5Ozc52 bD7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712754674; x=1713359474; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LoqXnbNJ3x9Jrovup0C7bEHubadJ8B3guyJvxS32KGE=; b=A+vFtALDRcA7br8OpWuG69DL4C8cni0ttjtxn5cW2Fd9AtV9E4KTlk1LUGotwDoi02 UZNJn5VChwiqx4eDeN6WWVPR0dDByaPa3SeWLlbvDNVY9CWp+HkahZPuhH9sxN+SuONc 1ZS1SfKtmkclfV2RKIMIQm997Eu/pGYqqQz+/NRiRoojKstMR0QHlZN5L6ZncgQkBwdf E46e6tKRb30IJ/5vM5uzmRELkbaj066TawwfsDN9k+t7A67oFIU3B3ZghZ4cCl8C2iSB iLbYB/7QBaYsXxUb0Xzs5On4QepytjYFw3D5hxqfr34iLoTTJeGv8pU0lBVkaHqFRpf/ ojNw== X-Gm-Message-State: AOJu0YzXAi9WF7MydOI6IKyhZVdCN7eIV6QNfxihvXCjyPeGkm3AZ/a4 2EUz3+nE1/UzpYx8hXNT2FE1CrofX8i2tSz0Qfp6bmbhY82kPesXkEcFZNNQvqEdzpi3gJ5nNiA Mjxs= X-Google-Smtp-Source: AGHT+IEmr9QbvPVTfXyjnZGW05yVfWa/FTCJ1dLJg+mb/gB2S7CkPfKSv6tfXGFdjW8VvBUHXa8Xzw== X-Received: by 2002:a05:6a00:991:b0:6e7:1d01:334c with SMTP id u17-20020a056a00099100b006e71d01334cmr2843214pfg.2.1712754674131; Wed, 10 Apr 2024 06:11:14 -0700 (PDT) Received: from xps13.. ([199.58.97.236]) by smtp.gmail.com with ESMTPSA id c17-20020aa78c11000000b006ed0199bd57sm10054887pfd.177.2024.04.10.06.11.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Apr 2024 06:11:13 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 5/5] licenses.conf: Add missing LGPLv2.0+ license Date: Wed, 10 Apr 2024 06:10:58 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 10 Apr 2024 13:11:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198098 From: Colin McAllister Adds LGPLv2.0+ license variation to match LGPLv2+. Signed-off-by: Colin McAllister Signed-off-by: Steve Sakoman --- meta/conf/licenses.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf index d14c365977..c78823e847 100644 --- a/meta/conf/licenses.conf +++ b/meta/conf/licenses.conf @@ -37,6 +37,7 @@ SPDXLICENSEMAP[GPL-3.0-only] = "GPL-3.0" SPDXLICENSEMAP[LGPLv2] = "LGPL-2.0" SPDXLICENSEMAP[LGPLv2+] = "LGPL-2.0+" SPDXLICENSEMAP[LGPLv2.0] = "LGPL-2.0" +SPDXLICENSEMAP[LGPLv2.0+] = "LGPL-2.0+" SPDXLICENSEMAP[LGPL-2.0-only] = "LGPL-2.0" SPDXLICENSEMAP[LGPL2.1] = "LGPL-2.1" SPDXLICENSEMAP[LGPLv2.1] = "LGPL-2.1"