Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ executors:
resource_class: medium
arm:
machine:
image: ubuntu-2204:current
image: ubuntu-2404:current
resource_class: arm.medium

jobs:
Expand All @@ -32,7 +32,7 @@ jobs:
- run: CGO_APPS=1 make
build:
machine:
image: ubuntu-2204:current
image: ubuntu-2404:current
resource_class: medium
parallelism: 3
steps:
Expand Down
5 changes: 2 additions & 3 deletions pkg/collector/bpf/lib/bpf_path.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ FUNC_INLINE int prepend_name(char *buf, char **bufptr, int *buflen, const unsign
if (namelen < 0 || namelen > 256)
return -ENAMETOOLONG;

s64 buffer_offset = (s64)(*bufptr) - (s64)buf;
u64 buffer_offset = (u64)(*bufptr) - (u64)buf;

// Change name and namelen to fit in the buffer.
// We prefer to store the part of it that fits rather than discard it.
Expand All @@ -111,8 +111,7 @@ FUNC_INLINE int prepend_name(char *buf, char **bufptr, int *buflen, const unsign
// This will never happen. buffer_offset is the diff of the initial buffer pointer
// with the current buffer pointer. This will be at max 4096 bytes (similar to the initial
// size).
// Needed to bound that for bpf_probe_read call.
if (buffer_offset < 0 || buffer_offset >= MAX_BUF_LEN)
if (buffer_offset >= MAX_BUF_LEN)
return -ENAMETOOLONG;

if (write_slash)
Expand Down
5 changes: 5 additions & 0 deletions pkg/collector/ebpf.go
Original file line number Diff line number Diff line change
Expand Up @@ -1104,6 +1104,11 @@ func loadObject(path string) (*ebpf.Collection, error) {
// Instantiate a Collection from a CollectionSpec.
coll, err := ebpf.NewCollection(spec)
if err != nil {
var ve *ebpf.VerifierError
if errors.As(err, &ve) {
err = fmt.Errorf("%+v", ve) //nolint:errorlint
}

return nil, fmt.Errorf("failed to instantiate collection: %w", err)
}

Expand Down
6 changes: 4 additions & 2 deletions scripts/install_clang.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ find_llvm() {
if [[ "$dir" == *"llvm"* ]]; then
llvm_ver=$(echo "${dir}" | grep -o "llvm-[0-9]\+" | cut -d "-" -f2)
if (( ${llvm_ver} >= 18 )); then
LLVM_DIR="${dir}"
break
if [ -f "${dir}/bin/clang" ] && [ -f "${dir}/bin/llc" ]; then
LLVM_DIR="${dir}"
break
fi
fi
fi
done
Expand Down
5 changes: 4 additions & 1 deletion website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@
},
"resolutions": {
"path-to-regexp": "1.9.0",
"dompurify": "3.2.4"
"dompurify": "3.2.4",
"webpack-dev-server": "5.2.1",
"brace-expansion": "1.1.12",
"on-headers": "1.1.0"
}
}
Loading