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
7 changes: 7 additions & 0 deletions clang/include/clang/Analysis/Analyses/UnsafeBufferUsage.h
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,13 @@ class UnsafeBufferUsageHandler {
handleUnsafeOperation(Arg, IsRelatedToDecl, Ctx);
}

/// Invoked when an unsafe assignment to __single pointer is found.
virtual void handleUnsafeSinglePointerAssignment(const BinaryOperator *Assign,
bool IsRelatedToDecl,
ASTContext &Ctx) {
handleUnsafeOperation(Assign, IsRelatedToDecl, Ctx);
}

virtual void handleTooComplexCountAttributedAssign(const Expr *E,
const ValueDecl *VD,
bool IsRelatedToDecl,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ WARNING_GADGET(DataInvocation)
// TO_UPSTREAM(BoundsSafety) ON
WARNING_BOUNDS_SAFETY_GADGET(CountAttributedPointerArgument)
WARNING_BOUNDS_SAFETY_GADGET(SinglePointerArgument)
WARNING_BOUNDS_SAFETY_GADGET(SinglePointerAssignment)
// TO_UPSTREAM(BoundsSafety) OFF
WARNING_OPTIONAL_GADGET(UnsafeLibcFunctionCall)
WARNING_OPTIONAL_GADGET(SpanTwoParamConstructor) // Uses of `std::span(arg0, arg1)`
Expand Down
3 changes: 3 additions & 0 deletions clang/include/clang/Basic/DiagnosticSemaKinds.td
Original file line number Diff line number Diff line change
Expand Up @@ -14114,6 +14114,9 @@ def note_unsafe_count_attributed_pointer_argument_null_to_nonnull : Note<
def warn_unsafe_single_pointer_argument : Warning<
"unsafe assignment to function parameter of __single pointer type">,
InGroup<UnsafeBufferUsage>, DefaultIgnore;
def warn_unsafe_single_pointer_assignment : Warning<
"unsafe assignment to __single pointer type">,
InGroup<UnsafeBufferUsage>, DefaultIgnore;
def warn_assign_to_count_attributed_must_be_simple_stmt : Warning<
"assignment to %select{count-attributed pointer|dependent count}0 '%1' "
"must be a simple statement '%1 = ...'">,
Expand Down
59 changes: 59 additions & 0 deletions clang/lib/Analysis/UnsafeBufferUsage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3533,6 +3533,65 @@ class SinglePointerArgumentGadget : public WarningGadget {
}
};

// Represents an assignment to a __single pointer.
class SinglePointerAssignmentGadget : public WarningGadget {
private:
static constexpr const char *const AssignTag = "SinglePointerAssignment_Assign";
const BinaryOperator *Assign;

public:
explicit SinglePointerAssignmentGadget(const MatchResult &Result)
: WarningGadget(Kind::SinglePointerAssignment),
Assign(Result.getNodeAs<BinaryOperator>(AssignTag)) {
assert(Assign != nullptr && "Expecting a non-null matching result");
}

static bool classof(const Gadget *G) {
return G->getKind() == Kind::SinglePointerAssignment;
}

static bool matches(const Stmt *S, ASTContext &Ctx,
llvm::SmallVectorImpl<MatchResult> &Results) {
bool Found = false;
findStmtsInUnspecifiedUntypedContext(
S, [&Results, &Ctx, &Found](const Stmt *S) {
const auto *E = dyn_cast<Expr>(S);
if (!E)
return;
const auto *BO = dyn_cast<BinaryOperator>(E->IgnoreImpCasts());
if (!BO || BO->getOpcode() != BO_Assign)
return;
QualType LHSTy = BO->getLHS()->getType();
if (!LHSTy->isSinglePointerType())
return;
if (isSinglePointerArgumentSafe(Ctx, LHSTy, BO->getRHS()))
return;
Results.emplace_back(AssignTag, DynTypedNode::create(*BO));
Found = true;
});
return Found;
}

void handleUnsafeOperation(UnsafeBufferUsageHandler &Handler,
bool IsRelatedToDecl,
ASTContext &Ctx) const override {
Handler.handleUnsafeSinglePointerAssignment(Assign, IsRelatedToDecl, Ctx);
}

SourceLocation getSourceLoc() const override {
return Assign->getOperatorLoc();
}

virtual DeclUseList getClaimedVarUseSites() const override {
if (const auto *DRE = dyn_cast<DeclRefExpr>(Assign->getLHS())) {
return {DRE};
}
return {};
}

SmallVector<const Expr *, 1> getUnsafePtrs() const override { return {}; }
};

/// Scan the function and return a list of gadgets found with provided kits.
class WarningGadgetMatcher : public FastMatcher {

Expand Down
7 changes: 7 additions & 0 deletions clang/lib/Sema/AnalysisBasedWarnings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2601,6 +2601,13 @@ class UnsafeBufferUsageReporter : public UnsafeBufferUsageHandler {
S.Diag(Arg->getBeginLoc(), diag::warn_unsafe_single_pointer_argument);
}

void handleUnsafeSinglePointerAssignment(
const BinaryOperator *Assign, [[maybe_unused]] bool IsRelatedToDecl,
[[maybe_unused]] ASTContext &Ctx) override {
S.Diag(Assign->getOperatorLoc(),
diag::warn_unsafe_single_pointer_assignment);
}

void handleTooComplexCountAttributedAssign(
const Expr *E, const ValueDecl *VD, [[maybe_unused]] bool IsRelatedToDecl,
[[maybe_unused]] ASTContext &Ctx) override {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
// RUN: %clang_cc1 -fsyntax-only -std=c++20 -Wno-all -Wunsafe-buffer-usage -fexperimental-bounds-safety-attributes -verify %s

#include <ptrcheck.h>
#include <stddef.h>

namespace std {

template <typename T, size_t N>
struct array {
T &operator[](size_t n) noexcept;
};

template <typename CharT>
struct basic_string {
CharT &operator[](size_t n) noexcept;
};

typedef basic_string<char> string;

template <typename CharT>
struct basic_string_view {
const CharT &operator[](size_t n) const noexcept;
};

typedef basic_string_view<char> string_view;

template <typename T>
struct span {
T *data() const noexcept;
span<T> first(size_t count) const noexcept;
span<T> last(size_t count) const noexcept;
span<T> subspan(size_t offset, size_t count) const noexcept;
T &operator[](size_t n) noexcept;
};

template <typename T>
struct vector {
T &operator[](size_t n) noexcept;
};

} // namespace std

template <typename T>
struct my_vec {
T &operator[](size_t n) noexcept;
};

// Check assignment to `void *__single`.

void single_void(void *__single p_void, void *pv, std::span<int> sp, my_vec<int> &mv) {
char array[42] = {};

p_void = pv;

p_void = sp.data();
p_void = sp.first(1).data();
p_void = sp.first(42).data();
p_void = &sp[42];

p_void = &mv[0];

p_void = array;
}

// Check `nullptr`.

void null(char *__single p_char,
const char *__single p_cchar,
int *__single p_int,
void *__single p_void) {
p_char = nullptr;
p_cchar = nullptr;
p_int = nullptr;
p_void = nullptr;
}

// Check `&var` pattern.

void addr_of_var(char *__single p_char,
const char *__single p_cchar,
int *__single p_int,
void *__single p_void) {
char c = 0;
p_char = &c;
p_cchar = &c;
p_void = &c;

int i = 0;
p_int = &i;
p_void = &i;
}

// Check allowed classes in `&C[index]` pattern.

void allowed_class(char *__single p_char,
const char *__single p_cchar,
int *__single p_int,
void *__single p_void,
std::array<int, 42> &a,
std::string &s,
std::string_view sv,
std::span<int> sp,
std::vector<int> &v) {
p_int = &a[0];
p_void = &a[0];

p_char = &s[0];
p_cchar = &s[0];
p_void = &s[0];

p_cchar = &sv[0];

p_int = &sp[0];
p_void = &sp[0];

p_int = &v[0];
p_void = &v[0];
}

void not_allowed_class(int *__single p_int, my_vec<int> &mv) {
p_int = &mv[0]; // expected-warning{{unsafe assignment to __single pointer type}}
}

// Check if index doesn't matter in `&C[index]` pattern.

void index_does_not_matter(int *__single p_int, std::span<int> sp, size_t index) {
p_int = &sp[0];
p_int = &sp[1];
p_int = &sp[index];
p_int = &sp[42 - index];
}

// Check span's subview pattern.

void span_subview(int *__single p_int, std::span<int> sp, int n) {
p_int = sp.first(1).data();
p_int = sp.first(0).data(); // expected-warning{{unsafe assignment to __single pointer type}}
p_int = sp.first(n).data(); // expected-warning{{unsafe assignment to __single pointer type}}

p_int = sp.last(1).data();
p_int = sp.last(0).data(); // expected-warning{{unsafe assignment to __single pointer type}}
p_int = sp.last(n).data(); // expected-warning{{unsafe assignment to __single pointer type}}

p_int = sp.subspan(0, 1).data();
p_int = sp.subspan(42, 1).data();
p_int = sp.subspan(n, 1).data();
p_int = sp.subspan(0, 0).data(); // expected-warning{{unsafe assignment to __single pointer type}}
p_int = sp.subspan(0, n).data(); // expected-warning{{unsafe assignment to __single pointer type}}
}

// Check common unsafe patterns.

void unsafe(int *__single p_int, std::span<int> sp, int *p) {
p_int = sp.data(); // expected-warning{{unsafe assignment to __single pointer type}}

p_int = p; // expected-warning{{unsafe assignment to __single pointer type}}
}