diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2024-11-25 11:55:38 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2024-11-26 09:00:29 +0000 |
| commit | d1656bfaa236ca8bb0ce36693aa283a568c62bd8 (patch) | |
| tree | deef539931e10410aae4e86da360a33a93e0e287 | |
| parent | 46f8273da3a8f68e273107356256b5e693a34b7f (diff) | |
tools/syz-declextract: prefix flags with auto_
They can clash with our manual flags names.
| -rw-r--r-- | sys/linux/auto.txt | 4 | ||||
| -rw-r--r-- | tools/syz-declextract/syz-declextract.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/linux/auto.txt b/sys/linux/auto.txt index 98e4b7a65..61529e5b0 100644 --- a/sys/linux/auto.txt +++ b/sys/linux/auto.txt @@ -104,7 +104,7 @@ include <net/netlabel/netlabel_calipso.h> include <net/netlabel/netlabel_cipso_v4.h> include <net/netlabel/netlabel_mgmt.h> include <net/netlabel/netlabel_unlabeled.h> -landlock_rule_type = LANDLOCK_RULE_PATH_BENEATH, LANDLOCK_RULE_NET_PORT +auto_landlock_rule_type = LANDLOCK_RULE_PATH_BENEATH, LANDLOCK_RULE_NET_PORT resource genl_802_15_4_MAC_family_id_auto[int16] resource genl_HSR_family_id_auto[int16] resource genl_IOAM6_family_id_auto[int16] @@ -336,7 +336,7 @@ kcmp$auto(pid1 int32, pid2 int32, type int32, idx1 intptr, idx2 intptr) (automat kexec_load$auto(entry intptr, nr_segments intptr, segments ptr[inout, kexec_segment$auto_record], flags intptr) (automatic) keyctl$auto(option int32, arg2 intptr, arg3 intptr, arg4 intptr, arg5 intptr) (automatic) kill$auto(pid pid, sig int32) (automatic) -landlock_add_rule$auto(ruleset_fd fd, rule_type flags[landlock_rule_type], rule_attr ptr[in, array[auto_todo]], flags int32) (automatic) +landlock_add_rule$auto(ruleset_fd fd, rule_type flags[auto_landlock_rule_type], rule_attr ptr[in, array[auto_todo]], flags int32) (automatic) landlock_create_ruleset$auto(attr ptr[in, landlock_ruleset_attr$auto_record], size intptr, flags int32) (automatic) landlock_restrict_self$auto(ruleset_fd fd, flags int32) (automatic) lchown$auto(filename ptr[in, filename], user uid, group gid) (automatic) diff --git a/tools/syz-declextract/syz-declextract.cpp b/tools/syz-declextract/syz-declextract.cpp index 8ab77f0d3..c348eb16d 100644 --- a/tools/syz-declextract/syz-declextract.cpp +++ b/tools/syz-declextract/syz-declextract.cpp @@ -444,7 +444,7 @@ public: isSyscallParam); // NOTE: The fieldType contains information we need, don't use field instead. case clang::Type::Enum: { const auto &enumDecl = llvm::dyn_cast<EnumType>(field)->getDecl(); - auto name = enumDecl->getNameAsString(); + auto name = "auto_" + enumDecl->getNameAsString(); flags.push_back(name); includes.push_back(std::filesystem::relative(SM->getFilename(enumDecl->getSourceRange().getBegin()).str())); const char *sep = " = "; |