diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2020-11-28 19:34:06 +0100 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2020-12-04 13:50:03 +0000 |
| commit | e41c5bb10cb79711eb0b3fb53537cc81b6421f94 (patch) | |
| tree | ee9f70a4554472941e105afcc93a354817b50ec5 | |
| parent | df38f45c44f6cc77b11093793fe437e331676c39 (diff) | |
profile-core: drop a systemd patch for 3.1.4 YP uprev
The patch 0001-fix-udevd-seclabel-parsing.patch is in upstream YP 3.1.4
Remove the patch.
Bug-AGL: SPEC-3699
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: I7a0d24178a7e0b8dae16e7f12df1ec565cff5278
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25657
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
| -rw-r--r-- | meta-agl-profile-core/recipes-core/systemd/systemd/0001-fix-udevd-seclabel-parsing.patch | 34 | ||||
| -rw-r--r-- | meta-agl-profile-core/recipes-core/systemd/systemd_%.bbappend | 1 |
2 files changed, 0 insertions, 35 deletions
diff --git a/meta-agl-profile-core/recipes-core/systemd/systemd/0001-fix-udevd-seclabel-parsing.patch b/meta-agl-profile-core/recipes-core/systemd/systemd/0001-fix-udevd-seclabel-parsing.patch deleted file mode 100644 index 29165b58e..000000000 --- a/meta-agl-profile-core/recipes-core/systemd/systemd/0001-fix-udevd-seclabel-parsing.patch +++ /dev/null @@ -1,34 +0,0 @@ -Fix udevd SECLABEL token parsing - -The udevd rules parsing rewrite in v243 broke SECLABEL parsing, -with the result being that udevd crashes when it parses a line -containing a SECLABEL token. Fix the handling of the attribute -of SECLABEL tokens when parsing, and add a check to prevent -crashes if the attribute is missing. - -Upstream-Status: Pending - -Signed-off-by: Scott Murray <scott.murray@konsulko.com> - -diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c -index efea16e5c5..3e757ccb06 100644 ---- a/src/udev/udev-rules.c -+++ b/src/udev/udev-rules.c -@@ -918,7 +918,7 @@ static int parse_token(UdevRules *rules, const char *key, char *attr, UdevRuleOp - op = OP_ASSIGN; - } - -- r = rule_line_add_token(rule_line, TK_A_SECLABEL, op, value, NULL); -+ r = rule_line_add_token(rule_line, TK_A_SECLABEL, op, value, attr); - } else if (streq(key, "RUN")) { - if (is_match || op == OP_REMOVE) - return log_token_invalid_op(rules, key); -@@ -1927,6 +1927,8 @@ static int udev_rule_apply_token_to_event( - _cleanup_free_ char *name = NULL, *label = NULL; - char label_str[UTIL_LINE_SIZE] = {}; - -+ if (!token->data) -+ break; - name = strdup((const char*) token->data); - if (!name) - return log_oom(); diff --git a/meta-agl-profile-core/recipes-core/systemd/systemd_%.bbappend b/meta-agl-profile-core/recipes-core/systemd/systemd_%.bbappend index 242b3d39c..96c4dc35c 100644 --- a/meta-agl-profile-core/recipes-core/systemd/systemd_%.bbappend +++ b/meta-agl-profile-core/recipes-core/systemd/systemd_%.bbappend @@ -1,7 +1,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "\ - file://0001-fix-udevd-seclabel-parsing.patch \ file://0002-network-add-CAN-Termination-tristate-option.patch \ file://e2fsck.conf \ file://canbus-can.network \ |