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
9 changes: 9 additions & 0 deletions rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,8 @@ module LocalFlow {
or
nodeTo.(PostUpdateNode).getPreUpdateNode().asExpr() =
getPostUpdateReverseStep(nodeFrom.(PostUpdateNode).getPreUpdateNode().asExpr(), true)
or
nodeTo.(TryEarlyReturnNode).getTryExpr().getExpr() = nodeFrom.asExpr()
Comment thread
hvitved marked this conversation as resolved.
Resolved
}
}

Expand Down Expand Up @@ -483,6 +485,7 @@ module RustDataFlowGen<RustDataFlowInputSig Input> implements InputSig<Location>
node instanceof ImplicitBorrowNode or
node instanceof DerefOutNode or
node instanceof IndexOutNode or
node instanceof TryEarlyReturnNode or
nodeIsHidden(node.(PostUpdateNode).getPreUpdateNode())
}

Expand Down Expand Up @@ -930,6 +933,12 @@ module RustDataFlowGen<RustDataFlowInputSig Input> implements InputSig<Location>
*/
predicate expectsContent(Node n, ContentSet cs) {
FlowSummaryImpl::Private::Steps::summaryExpectsContent(n.(FlowSummaryNode).getSummaryNode(), cs)
or
n instanceof TryEarlyReturnNode and
cs.(SingletonContentSet)
.getContent()
.(TupleFieldContent)
.isVariantField(any(ResultEnum r).getErr(), 0)
}

class NodeRegion instanceof Void {
Expand Down
20 changes: 20 additions & 0 deletions rust/ql/lib/codeql/rust/dataflow/internal/Node.qll
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,25 @@ final class SummaryReturnNode extends FlowSummaryNode, ReturnNode {
override ReturnKind getKind() { result = rk }
}

/**
* A node that represents an `Err` value returned early in a `?` expression.
*/
class TryEarlyReturnNode extends ReturnNode, TTryEarlyReturnNode {
private TryExpr try;

TryEarlyReturnNode() { this = TTryEarlyReturnNode(try) }

TryExpr getTryExpr() { result = try }

final override ReturnKind getKind() { result = TNormalReturnKind() }

final override CfgScope getCfgScope() { result = try.getEnclosingCfgScope() }

final override Location getLocation() { result = try.getLocation() }

final override string toString() { result = try.toString() + " (early return)" }
}

/** A data flow node that represents the output of a call. */
abstract class OutNode extends Node {
/** Gets the underlying call for this node. */
Expand Down Expand Up @@ -737,6 +756,7 @@ class StaticNode extends AstNodeNode, TStaticNode {
cached
newtype TNode =
TExprNode(Expr e) { e.hasEnclosingCfgScope() and Stages::DataFlowStage::ref() } or
TTryEarlyReturnNode(TryExpr te) or
TSourceParameterNode(ParamBase p) { p.hasEnclosingCfgScope() } or
TPatNode(Pat p) { p.hasEnclosingCfgScope() } or
TNameNode(Name n) { n = any(Variable v).getName() and n.hasEnclosingCfgScope() } or
Expand Down
23 changes: 16 additions & 7 deletions rust/ql/test/library-tests/dataflow/global/inline-flow.expected
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ models
| 1 | Summary: <& as core::ops::deref::Deref>::deref; Argument[self].Reference; ReturnValue; value |
| 2 | Summary: <core::ops::arith::Mul>::mul; Argument[self,0]; ReturnValue; taint |
| 3 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
| 4 | Summary: futures_executor::local_pool::block_on; Argument[0]; ReturnValue; value |
| 4 | Summary: <core::result::Result>::unwrap_err; Argument[self].Field[core::result::Result::Err(0)]; ReturnValue; value |
| 5 | Summary: futures_executor::local_pool::block_on; Argument[0]; ReturnValue; value |
edges
| main.rs:12:28:14:1 | { ... } | main.rs:17:13:17:23 | get_data(...) | provenance | |
| main.rs:13:5:13:13 | source(...) | main.rs:12:28:14:1 | { ... } | provenance | |
Expand Down Expand Up @@ -203,7 +204,7 @@ edges
| main.rs:348:9:348:9 | c | main.rs:350:10:350:16 | await b | provenance | |
| main.rs:354:9:354:9 | a | main.rs:355:10:355:10 | a | provenance | |
| main.rs:354:13:354:55 | ...::block_on(...) | main.rs:354:9:354:9 | a | provenance | |
| main.rs:354:41:354:54 | async_source(...) | main.rs:354:13:354:55 | ...::block_on(...) | provenance | MaD:4 |
| main.rs:354:41:354:54 | async_source(...) | main.rs:354:13:354:55 | ...::block_on(...) | provenance | MaD:5 |
| main.rs:366:44:368:9 | { ... } | main.rs:403:18:403:38 | t.get_double_number() | provenance | |
| main.rs:366:44:368:9 | { ... } | main.rs:407:18:407:50 | ...::get_double_number(...) | provenance | |
| main.rs:367:13:367:29 | self.get_number() | main.rs:367:13:367:33 | ... * ... | provenance | MaD:2 |
Expand Down Expand Up @@ -235,14 +236,17 @@ edges
| main.rs:433:32:433:43 | STATIC_VALUE | main.rs:433:17:433:28 | static_value | provenance | |
| main.rs:436:13:436:24 | STATIC_VALUE | main.rs:427:5:427:46 | static STATIC_VALUE | provenance | |
| main.rs:436:28:436:37 | source(...) | main.rs:436:13:436:24 | STATIC_VALUE | provenance | |
| main.rs:466:55:469:5 | { ... } [Ok] | main.rs:473:14:473:39 | unwrapped_value_returned(...) [Ok] | provenance | |
| main.rs:466:55:469:5 | { ... } [Ok] | main.rs:478:14:478:39 | unwrapped_value_returned(...) [Ok] | provenance | |
| main.rs:467:13:467:13 | a [Ok, Ok] | main.rs:468:9:468:9 | a [Ok, Ok] | provenance | |
| main.rs:467:48:467:65 | Ok(...) [Ok, Ok] | main.rs:467:13:467:13 | a [Ok, Ok] | provenance | |
| main.rs:467:51:467:64 | Ok(...) [Ok] | main.rs:467:48:467:65 | Ok(...) [Ok, Ok] | provenance | |
| main.rs:467:54:467:63 | source(...) | main.rs:467:51:467:64 | Ok(...) [Ok] | provenance | |
| main.rs:468:9:468:9 | a [Ok, Ok] | main.rs:468:9:468:10 | TryExpr [Ok] | provenance | |
| main.rs:468:9:468:10 | TryExpr [Ok] | main.rs:466:55:469:5 | { ... } [Ok] | provenance | |
| main.rs:473:14:473:39 | unwrapped_value_returned(...) [Ok] | main.rs:473:14:473:48 | ... .unwrap() | provenance | MaD:3 |
| main.rs:472:19:472:33 | Err(...) [Err] | main.rs:479:14:479:27 | err_returned(...) [Err] | provenance | |
| main.rs:472:23:472:32 | source(...) | main.rs:472:19:472:33 | Err(...) [Err] | provenance | |
| main.rs:478:14:478:39 | unwrapped_value_returned(...) [Ok] | main.rs:478:14:478:48 | ... .unwrap() | provenance | MaD:3 |
| main.rs:479:14:479:27 | err_returned(...) [Err] | main.rs:479:14:479:40 | ... .unwrap_err() | provenance | MaD:4 |
nodes
| main.rs:12:28:14:1 | { ... } | semmle.label | { ... } |
| main.rs:13:5:13:13 | source(...) | semmle.label | source(...) |
Expand Down Expand Up @@ -506,8 +510,12 @@ nodes
| main.rs:467:54:467:63 | source(...) | semmle.label | source(...) |
| main.rs:468:9:468:9 | a [Ok, Ok] | semmle.label | a [Ok, Ok] |
| main.rs:468:9:468:10 | TryExpr [Ok] | semmle.label | TryExpr [Ok] |
| main.rs:473:14:473:39 | unwrapped_value_returned(...) [Ok] | semmle.label | unwrapped_value_returned(...) [Ok] |
| main.rs:473:14:473:48 | ... .unwrap() | semmle.label | ... .unwrap() |
| main.rs:472:19:472:33 | Err(...) [Err] | semmle.label | Err(...) [Err] |
| main.rs:472:23:472:32 | source(...) | semmle.label | source(...) |
| main.rs:478:14:478:39 | unwrapped_value_returned(...) [Ok] | semmle.label | unwrapped_value_returned(...) [Ok] |
| main.rs:478:14:478:48 | ... .unwrap() | semmle.label | ... .unwrap() |
| main.rs:479:14:479:27 | err_returned(...) [Err] | semmle.label | err_returned(...) [Err] |
| main.rs:479:14:479:40 | ... .unwrap_err() | semmle.label | ... .unwrap_err() |
subpaths
| main.rs:38:16:38:24 | source(...) | main.rs:26:28:26:33 | ...: i64 | main.rs:26:17:26:25 | SelfParam [Return] [&ref, MyStruct] | main.rs:38:5:38:5 | [post] a [MyStruct] |
| main.rs:39:10:39:10 | a [MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | main.rs:30:31:32:5 | { ... } | main.rs:39:10:39:21 | a.get_data() |
Expand Down Expand Up @@ -575,4 +583,5 @@ testFailures
| main.rs:434:18:434:29 | static_value | main.rs:436:28:436:37 | source(...) | main.rs:434:18:434:29 | static_value | $@ | main.rs:436:28:436:37 | source(...) | source(...) |
| main.rs:437:18:437:29 | STATIC_VALUE | main.rs:427:36:427:45 | source(...) | main.rs:437:18:437:29 | STATIC_VALUE | $@ | main.rs:427:36:427:45 | source(...) | source(...) |
| main.rs:437:18:437:29 | STATIC_VALUE | main.rs:436:28:436:37 | source(...) | main.rs:437:18:437:29 | STATIC_VALUE | $@ | main.rs:436:28:436:37 | source(...) | source(...) |
| main.rs:473:14:473:48 | ... .unwrap() | main.rs:467:54:467:63 | source(...) | main.rs:473:14:473:48 | ... .unwrap() | $@ | main.rs:467:54:467:63 | source(...) | source(...) |
| main.rs:478:14:478:48 | ... .unwrap() | main.rs:467:54:467:63 | source(...) | main.rs:478:14:478:48 | ... .unwrap() | $@ | main.rs:467:54:467:63 | source(...) | source(...) |
| main.rs:479:14:479:40 | ... .unwrap_err() | main.rs:472:23:472:32 | source(...) | main.rs:479:14:479:40 | ... .unwrap_err() | $@ | main.rs:472:23:472:32 | source(...) | source(...) |
6 changes: 6 additions & 0 deletions rust/ql/test/library-tests/dataflow/global/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -468,8 +468,14 @@ mod try_operator {
a?
}

fn err_returned() -> Result<bool, i64> {
let err = Err(source(52))?;
Ok(true)
}

fn test_try_operator() {
sink(unwrapped_value_not_returned().unwrap());
sink(unwrapped_value_returned().unwrap()); // $ hasValueFlow=51
sink(err_returned().unwrap_err()); // $ hasValueFlow=52
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,13 @@
| main.rs:455:5:455:22 | test_async_await(...) | main.rs:353:1:358:1 | fn test_async_await |
| main.rs:462:23:462:32 | source(...) | main.rs:1:1:3:1 | fn source |
| main.rs:467:54:467:63 | source(...) | main.rs:1:1:3:1 | fn source |
| main.rs:472:9:472:53 | sink(...) | main.rs:5:1:7:1 | fn sink |
| main.rs:472:14:472:43 | unwrapped_value_not_returned(...) | main.rs:461:5:464:5 | fn unwrapped_value_not_returned |
| main.rs:472:14:472:52 | ... .unwrap() | {EXTERNAL LOCATION} | [summarized] fn unwrap |
| main.rs:473:9:473:49 | sink(...) | main.rs:5:1:7:1 | fn sink |
| main.rs:473:14:473:39 | unwrapped_value_returned(...) | main.rs:466:5:469:5 | fn unwrapped_value_returned |
| main.rs:473:14:473:48 | ... .unwrap() | {EXTERNAL LOCATION} | [summarized] fn unwrap |
| main.rs:472:23:472:32 | source(...) | main.rs:1:1:3:1 | fn source |
| main.rs:477:9:477:53 | sink(...) | main.rs:5:1:7:1 | fn sink |
| main.rs:477:14:477:43 | unwrapped_value_not_returned(...) | main.rs:461:5:464:5 | fn unwrapped_value_not_returned |
| main.rs:477:14:477:52 | ... .unwrap() | {EXTERNAL LOCATION} | [summarized] fn unwrap |
| main.rs:478:9:478:49 | sink(...) | main.rs:5:1:7:1 | fn sink |
| main.rs:478:14:478:39 | unwrapped_value_returned(...) | main.rs:466:5:469:5 | fn unwrapped_value_returned |
| main.rs:478:14:478:48 | ... .unwrap() | {EXTERNAL LOCATION} | [summarized] fn unwrap |
| main.rs:479:9:479:41 | sink(...) | main.rs:5:1:7:1 | fn sink |
| main.rs:479:14:479:27 | err_returned(...) | main.rs:471:5:474:5 | fn err_returned |
| main.rs:479:14:479:40 | ... .unwrap_err() | {EXTERNAL LOCATION} | [summarized] fn unwrap_err |
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,9 @@ localStep
| main.rs:301:9:301:10 | [SSA] i1 | main.rs:302:10:302:11 | i1 |
| main.rs:301:9:301:10 | i1 | main.rs:301:9:301:10 | [SSA] i1 |
| main.rs:301:9:301:10 | i1 | main.rs:301:9:301:10 | i1 |
| main.rs:301:14:301:15 | s1 | main.rs:301:14:301:16 | TryExpr (early return) |
| main.rs:301:14:301:16 | TryExpr | main.rs:301:9:301:10 | i1 |
| main.rs:303:10:303:11 | s2 | main.rs:303:10:303:12 | TryExpr (early return) |
| main.rs:304:5:304:11 | Some(...) | main.rs:298:41:305:1 | { ... } |
| main.rs:308:9:308:10 | [SSA] r1 | main.rs:309:28:309:29 | r1 |
| main.rs:308:9:308:10 | r1 | main.rs:308:9:308:10 | [SSA] r1 |
Expand Down Expand Up @@ -410,14 +412,17 @@ localStep
| main.rs:325:9:325:10 | [SSA] i1 | main.rs:327:10:327:11 | i1 |
| main.rs:325:9:325:10 | i1 | main.rs:325:9:325:10 | [SSA] i1 |
| main.rs:325:9:325:10 | i1 | main.rs:325:9:325:10 | i1 |
| main.rs:325:14:325:15 | s1 | main.rs:325:14:325:16 | TryExpr (early return) |
| main.rs:325:14:325:16 | TryExpr | main.rs:325:9:325:10 | i1 |
| main.rs:326:9:326:10 | [SSA] i2 | main.rs:328:10:328:11 | i2 |
| main.rs:326:9:326:10 | i2 | main.rs:326:9:326:10 | [SSA] i2 |
| main.rs:326:9:326:10 | i2 | main.rs:326:9:326:10 | i2 |
| main.rs:326:14:326:15 | s2 | main.rs:326:14:326:16 | TryExpr (early return) |
| main.rs:326:14:326:16 | TryExpr | main.rs:326:9:326:10 | i2 |
| main.rs:329:9:329:10 | [SSA] i3 | main.rs:330:10:330:11 | i3 |
| main.rs:329:9:329:10 | i3 | main.rs:329:9:329:10 | [SSA] i3 |
| main.rs:329:9:329:10 | i3 | main.rs:329:9:329:10 | i3 |
| main.rs:329:14:329:15 | s3 | main.rs:329:14:329:16 | TryExpr (early return) |
| main.rs:329:14:329:16 | TryExpr | main.rs:329:9:329:10 | i3 |
| main.rs:331:5:331:9 | Ok(...) | main.rs:321:46:332:1 | { ... } |
| main.rs:335:9:335:10 | [SSA] s1 | main.rs:336:10:336:11 | s1 |
Expand Down
Loading