Skip to content

Rust: Change array element content type into a general collection element content type #18568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paldepind merged 3 commits into from
Jan 24, 2025
Merged

Rust: Change array element content type into a general collection element content type #18568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66b6ae7
Rust: Change array element content type into a general collection
paldepind Jan 23, 2025
9a6d651
Rust: More renaming and adjusting for generic element content type
paldepind Jan 23, 2025
e7ad091
Rust: Remove unnecessary characteristic predicate
paldepind Jan 24, 2025
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
25 changes: 14 additions & 11 deletions rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,12 +759,15 @@ final class ReferenceContent extends Content, TReferenceContent {
}

/**
* An element in an array.
* An element in a collection where we do not track the specific collection
* type nor the placement of the element in the collection. Therefore the
* collection should be one where the elements are reasonably homogeneous,
* i.e., if one is tainted all elements are considered tainted.
*
* Examples include the elements of a set, array, vector, or stack.
*/
final class ArrayElementContent extends Content, TArrayElement {
ArrayElementContent() { this = TArrayElement() }

override string toString() { result = "array[]" }
final class ElementContent extends Content, TElementContent {
override string toString() { result = "element" }
}

/**
Expand Down Expand Up @@ -1086,19 +1089,19 @@ module RustDataFlow implements InputSig<Location> {
)
or
exists(IndexExprCfgNode arr |
c instanceof ArrayElementContent and
c instanceof ElementContent and
node1.asExpr() = arr.getBase() and
node2.asExpr() = arr
)
or
exists(ForExprCfgNode for |
c instanceof ArrayElementContent and
c instanceof ElementContent and
node1.asExpr() = for.getIterable() and
node2.asPat() = for.getPat()
)
or
exists(SlicePatCfgNode pat |
c instanceof ArrayElementContent and
c instanceof ElementContent and
node1.asPat() = pat and
node2.asPat() = pat.getAPat()
)
Expand Down Expand Up @@ -1178,7 +1181,7 @@ module RustDataFlow implements InputSig<Location> {
node2.asExpr() = tuple
)
or
c instanceof ArrayElementContent and
c instanceof ElementContent and
node1.asExpr() =
[
node2.asExpr().(ArrayRepeatExprCfgNode).getRepeatOperand(),
Expand All @@ -1188,7 +1191,7 @@ module RustDataFlow implements InputSig<Location> {
tupleAssignment(node1, node2.(PostUpdateNode).getPreUpdateNode(), c)
or
exists(AssignmentExprCfgNode assignment, IndexExprCfgNode index |
c instanceof ArrayElementContent and
c instanceof ElementContent and
assignment.getLhs() = index and
node1.asExpr() = assignment.getRhs() and
node2.(PostUpdateNode).getPreUpdateNode().asExpr() = index.getBase()
Expand Down Expand Up @@ -1561,7 +1564,7 @@ private module Cached {
TVariantFieldContent(VariantCanonicalPath v, string field) {
field = v.getVariant().getFieldList().(RecordFieldList).getAField().getName().getText()
} or
TArrayElement() or
TElementContent() or
TTuplePositionContent(int pos) {
pos in [0 .. max([
any(TuplePat pat).getNumberOfFields(),
Expand Down
4 changes: 2 additions & 2 deletions rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ module Input implements InputSig<Location, RustDataFlow> {
arg = s.getExtendedCanonicalPath() + "::" + field
)
or
result = "ArrayElement" and
c = TArrayElement() and
result = "Element" and
c = TElementContent() and
arg = ""
or
exists(int pos |
Expand Down
2 changes: 1 addition & 1 deletion rust/ql/lib/codeql/rust/dataflow/internal/ModelsAsData.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* - `Parameter[n]`: the `n`-th parameter of a callback. May be a range of form `x..y` (inclusive)
* and/or a comma-separated list.
* - `ReturnValue`: the value returned by a function call.
* - `ArrayElement`: an element of an array.
* - `Element`: an element in a collection.
* - `Variant[v::f]`: field `f` of the variant with canonical path `v`, for example
* `Variant[crate::ihex::Record::Data::value]`.
* - `Variant[v(i)]`: position `i` inside the variant with canonical path `v`, for example
Expand Down
4 changes: 2 additions & 2 deletions rust/ql/lib/codeql/rust/dataflow/internal/TaintTrackingImpl.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ module RustTaintTracking implements InputSig<Location, RustDataFlow> {
// source is a collection.
exists(SingletonContentSet cs |
RustDataFlow::readStep(pred, cs, succ) and
cs.getContent() instanceof ArrayElementContent
cs.getContent() instanceof ElementContent
)
or
exists(FormatArgsExprCfgNode format | succ.asExpr() = format |
Expand All @@ -64,7 +64,7 @@ module RustTaintTracking implements InputSig<Location, RustDataFlow> {
predicate defaultImplicitTaintRead(Node::Node node, ContentSet cs) {
exists(node) and
exists(Content c | c = cs.(SingletonContentSet).getContent() |
c instanceof ArrayElementContent or
c instanceof ElementContent or
c instanceof ReferenceContent
)
}
Expand Down
66 changes: 33 additions & 33 deletions rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,26 +514,26 @@ storeStep
| main.rs:306:41:306:41 | 2 | D | main.rs:306:14:306:43 | ...::D {...} |
| main.rs:324:18:324:27 | source(...) | C | main.rs:323:14:325:5 | C {...} |
| main.rs:326:27:326:27 | 2 | D | main.rs:326:14:326:29 | D {...} |
| main.rs:344:17:344:17 | 1 | array[] | main.rs:344:16:344:33 | [...] |
| main.rs:344:20:344:20 | 2 | array[] | main.rs:344:16:344:33 | [...] |
| main.rs:344:23:344:32 | source(...) | array[] | main.rs:344:16:344:33 | [...] |
| main.rs:348:17:348:26 | source(...) | array[] | main.rs:348:16:348:31 | [...; 10] |
| main.rs:352:17:352:17 | 1 | array[] | main.rs:352:16:352:24 | [...] |
| main.rs:352:20:352:20 | 2 | array[] | main.rs:352:16:352:24 | [...] |
| main.rs:352:23:352:23 | 3 | array[] | main.rs:352:16:352:24 | [...] |
| main.rs:358:17:358:17 | 1 | array[] | main.rs:358:16:358:33 | [...] |
| main.rs:358:20:358:20 | 2 | array[] | main.rs:358:16:358:33 | [...] |
| main.rs:358:23:358:32 | source(...) | array[] | main.rs:358:16:358:33 | [...] |
| main.rs:363:17:363:17 | 1 | array[] | main.rs:363:16:363:24 | [...] |
| main.rs:363:20:363:20 | 2 | array[] | main.rs:363:16:363:24 | [...] |
| main.rs:363:23:363:23 | 3 | array[] | main.rs:363:16:363:24 | [...] |
| main.rs:370:17:370:17 | 1 | array[] | main.rs:370:16:370:33 | [...] |
| main.rs:370:20:370:20 | 2 | array[] | main.rs:370:16:370:33 | [...] |
| main.rs:370:23:370:32 | source(...) | array[] | main.rs:370:16:370:33 | [...] |
| main.rs:381:24:381:24 | 1 | array[] | main.rs:381:23:381:31 | [...] |
| main.rs:381:27:381:27 | 2 | array[] | main.rs:381:23:381:31 | [...] |
| main.rs:381:30:381:30 | 3 | array[] | main.rs:381:23:381:31 | [...] |
| main.rs:384:18:384:27 | source(...) | array[] | main.rs:384:5:384:11 | [post] mut_arr |
| main.rs:344:17:344:17 | 1 | element | main.rs:344:16:344:33 | [...] |
| main.rs:344:20:344:20 | 2 | element | main.rs:344:16:344:33 | [...] |
| main.rs:344:23:344:32 | source(...) | element | main.rs:344:16:344:33 | [...] |
| main.rs:348:17:348:26 | source(...) | element | main.rs:348:16:348:31 | [...; 10] |
| main.rs:352:17:352:17 | 1 | element | main.rs:352:16:352:24 | [...] |
| main.rs:352:20:352:20 | 2 | element | main.rs:352:16:352:24 | [...] |
| main.rs:352:23:352:23 | 3 | element | main.rs:352:16:352:24 | [...] |
| main.rs:358:17:358:17 | 1 | element | main.rs:358:16:358:33 | [...] |
| main.rs:358:20:358:20 | 2 | element | main.rs:358:16:358:33 | [...] |
| main.rs:358:23:358:32 | source(...) | element | main.rs:358:16:358:33 | [...] |
| main.rs:363:17:363:17 | 1 | element | main.rs:363:16:363:24 | [...] |
| main.rs:363:20:363:20 | 2 | element | main.rs:363:16:363:24 | [...] |
| main.rs:363:23:363:23 | 3 | element | main.rs:363:16:363:24 | [...] |
| main.rs:370:17:370:17 | 1 | element | main.rs:370:16:370:33 | [...] |
| main.rs:370:20:370:20 | 2 | element | main.rs:370:16:370:33 | [...] |
| main.rs:370:23:370:32 | source(...) | element | main.rs:370:16:370:33 | [...] |
| main.rs:381:24:381:24 | 1 | element | main.rs:381:23:381:31 | [...] |
| main.rs:381:27:381:27 | 2 | element | main.rs:381:23:381:31 | [...] |
| main.rs:381:30:381:30 | 3 | element | main.rs:381:23:381:31 | [...] |
| main.rs:384:18:384:27 | source(...) | element | main.rs:384:5:384:11 | [post] mut_arr |
| main.rs:396:35:396:61 | default_name | captured default_name | main.rs:396:35:396:61 | \|...\| ... |
| main.rs:418:27:418:27 | 0 | Some | main.rs:418:22:418:28 | Some(...) |
readStep
Expand Down Expand Up @@ -600,20 +600,20 @@ readStep
| main.rs:332:28:332:43 | D {...} | D | main.rs:332:41:332:41 | n |
| main.rs:335:9:335:24 | C {...} | C | main.rs:335:22:335:22 | n |
| main.rs:336:9:336:24 | D {...} | D | main.rs:336:22:336:22 | n |
| main.rs:345:14:345:17 | arr1 | array[] | main.rs:345:14:345:20 | arr1[2] |
| main.rs:349:14:349:17 | arr2 | array[] | main.rs:349:14:349:20 | arr2[4] |
| main.rs:353:14:353:17 | arr3 | array[] | main.rs:353:14:353:20 | arr3[2] |
| main.rs:359:15:359:18 | arr1 | array[] | main.rs:359:9:359:10 | n1 |
| main.rs:364:15:364:18 | arr2 | array[] | main.rs:364:9:364:10 | n2 |
| main.rs:372:9:372:17 | SlicePat | array[] | main.rs:372:10:372:10 | a |
| main.rs:372:9:372:17 | SlicePat | array[] | main.rs:372:13:372:13 | b |
| main.rs:372:9:372:17 | SlicePat | array[] | main.rs:372:16:372:16 | c |
| main.rs:382:10:382:16 | mut_arr | array[] | main.rs:382:10:382:19 | mut_arr[1] |
| main.rs:384:5:384:11 | mut_arr | array[] | main.rs:384:5:384:14 | mut_arr[1] |
| main.rs:385:13:385:19 | mut_arr | array[] | main.rs:385:13:385:22 | mut_arr[1] |
| main.rs:387:10:387:16 | mut_arr | array[] | main.rs:387:10:387:19 | mut_arr[0] |
| main.rs:345:14:345:17 | arr1 | element | main.rs:345:14:345:20 | arr1[2] |
| main.rs:349:14:349:17 | arr2 | element | main.rs:349:14:349:20 | arr2[4] |
| main.rs:353:14:353:17 | arr3 | element | main.rs:353:14:353:20 | arr3[2] |
| main.rs:359:15:359:18 | arr1 | element | main.rs:359:9:359:10 | n1 |
| main.rs:364:15:364:18 | arr2 | element | main.rs:364:9:364:10 | n2 |
| main.rs:372:9:372:17 | SlicePat | element | main.rs:372:10:372:10 | a |
| main.rs:372:9:372:17 | SlicePat | element | main.rs:372:13:372:13 | b |
| main.rs:372:9:372:17 | SlicePat | element | main.rs:372:16:372:16 | c |
| main.rs:382:10:382:16 | mut_arr | element | main.rs:382:10:382:19 | mut_arr[1] |
| main.rs:384:5:384:11 | mut_arr | element | main.rs:384:5:384:14 | mut_arr[1] |
| main.rs:385:13:385:19 | mut_arr | element | main.rs:385:13:385:22 | mut_arr[1] |
| main.rs:387:10:387:16 | mut_arr | element | main.rs:387:10:387:19 | mut_arr[0] |
| main.rs:394:7:394:18 | TuplePat | tuple.0 | main.rs:394:8:394:11 | cond |
| main.rs:394:7:394:18 | TuplePat | tuple.1 | main.rs:394:14:394:17 | name |
| main.rs:394:23:394:27 | names | array[] | main.rs:394:7:394:18 | TuplePat |
| main.rs:394:23:394:27 | names | element | main.rs:394:7:394:18 | TuplePat |
| main.rs:396:35:396:61 | [post] \|...\| ... | captured default_name | main.rs:396:35:396:61 | [post] default_name |
| main.rs:396:38:396:49 | this | captured default_name | main.rs:396:38:396:49 | default_name |
Loading