Skip to content

Commit

Permalink
wip2
Browse files Browse the repository at this point in the history
  • Loading branch information
@hvitved
hvitved committed Jun 14, 2024
1 parent 5717541 commit 927d3e2
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 15 deletions.
5 changes: 3 additions & 2 deletions shared/dataflow/codeql/dataflow/DataFlow.qll
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ signature module InputSig<LocationSig Location> {
*/
predicate isUnreachableInCall(NodeRegion nr, DataFlowCall call);

/** Gets the access path limit. A maximum limit of 5 is allowed. */
default int accessPathLimit() { result = 5 }

/**
Expand Down Expand Up @@ -412,7 +413,7 @@ module Configs<LocationSig Location, InputSig<Location> Lang> {
*/
default int fieldFlowBranchLimit() { result = 2 }

/** Gets the access path limit. */
/** Gets the access path limit. A maximum limit of 5 is allowed. */
default int accessPathLimit() { result = Lang::accessPathLimit() }

/**
Expand Down Expand Up @@ -534,7 +535,7 @@ module Configs<LocationSig Location, InputSig<Location> Lang> {
*/
default int fieldFlowBranchLimit() { result = 2 }

/** Gets the access path limit. */
/** Gets the access path limit. A maximum limit of 5 is allowed. */
default int accessPathLimit() { result = Lang::accessPathLimit() }

/**
Expand Down
62 changes: 49 additions & 13 deletions shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
*/
int fieldFlowBranchLimit();

/** Gets the access path limit. */
/** Gets the access path limit. A maximum limit of 5 is allowed. */
int accessPathLimit();

/**
Expand Down Expand Up @@ -2562,10 +2562,15 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
/** Input from previous iteration. */
private signature predicate storeReachesReadSig(NodeEx node1, NodeEx node2);

private signature int iterationSig();

private module StoreReachesRead<
storeReachesReadSig/2 storeReachesReadPrevDelta,
storeReachesReadSig/2 storeReachesReadPrevPrev>
storeReachesReadSig/2 storeReachesReadPrevPrev, iterationSig/0 iteration>
{
private predicate enabled() { Config::accessPathLimit() > iteration() }

// private predicate enabled() { any() }
pragma[nomagic]
private predicate step(NodeEx node1, NodeEx node2, boolean usesPrevDelta) {
valueStep(node1, node2) and
Expand All @@ -2591,7 +2596,9 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
}

private predicate stepNodeOrContent(ContentOrNodeContent n1, ContentOrNodeContent n2) {
step(n1.asNodeEx(), n2.asNodeEx(), _)
exists(boolean usesPrevDelta | step(n1.asNodeEx(), n2.asNodeEx(), usesPrevDelta) |
usesPrevDelta = false or enabled()
)
or
storeStepCand0(_, _, n1.asContent(), n2.asNodeEx(), _, _)
or
Expand All @@ -2618,23 +2625,33 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
}

private predicate isStoreTarget(NodeAndBoolean node) {
enabled() and
exists(Content c |
contentIsReadAndStored(c) and
storeStepCand0(_, _, c, node.getNodeEx(), _, _) and
node.getBoolean() = false
)
}

private boolean mustUsePrevDelta() {
exists(int iteration |
iteration = iteration() and
if iteration > 0 then result = true else result = false
)
}

private predicate isReadSource(NodeAndBoolean node) {
enabled() and
exists(Content c |
contentIsReadAndStored(c) and
readStepCand0(node.getNodeEx(), c, _) and
node.getBoolean() = true
node.getBoolean() = mustUsePrevDelta()
)
}

pragma[nomagic]
private predicate step0(NodeAndBoolean node1, NodeAndBoolean node2) {
enabled() and
exists(boolean usesPrevDelta |
step(node1.getNodeEx(), node2.getNodeEx(), usesPrevDelta)
|
Expand All @@ -2649,6 +2666,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
private predicate storeStepCandIsReadAndStored(
NodeEx node1, Content c, NodeAndBoolean node2
) {
enabled() and
contentIsReadAndStored(c) and
storeStepCand0(node1, _, c, node2.getNodeEx(), _, _) and
node2.getBoolean() = false
Expand All @@ -2658,9 +2676,10 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
private predicate readStepCandIsReadAndStored(
NodeAndBoolean node1, Content c, NodeEx node2
) {
enabled() and
contentIsReadAndStored(c) and
readStepCand0(node1.getNodeEx(), c, node2) and
node1.getBoolean() = true
node1.getBoolean() = mustUsePrevDelta()
}

pragma[nomagic]
Expand All @@ -2680,12 +2699,14 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
}
}

private predicate storeReachesReadPrevDelta0(NodeEx node1, NodeEx node2) { node1 = node2 }
private predicate storeReachesReadPrevDelta0(NodeEx node1, NodeEx node2) { none() }

private predicate storeReachesReadPrevPrev0(NodeEx node1, NodeEx node2) { none() }

private int iteration0() { result = 0 }

private module StoreReachesRead1 =
StoreReachesRead<storeReachesReadPrevDelta0/2, storeReachesReadPrevPrev0/2>;
StoreReachesRead<storeReachesReadPrevDelta0/2, storeReachesReadPrevPrev0/2, iteration0/0>;

private predicate storeReachesReadPrevDelta1(NodeEx storeSource, NodeEx readTarget) {
StoreReachesRead1::storeReachesReadDelta(storeSource, readTarget)
Expand All @@ -2701,30 +2722,45 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
none()
}

private int iteration1() { result = 1 }

private module StoreReachesRead2 =
StoreReachesRead<storeReachesReadPrevDelta1/2, storeReachesReadPrevPrev1/2>;
StoreReachesRead<storeReachesReadPrevDelta1/2, storeReachesReadPrevPrev1/2, iteration1/0>;

private predicate storeReachesReadPrevDelta2 = StoreReachesRead2::storeReachesReadDelta/2;

private predicate storeReachesReadPrevPrev2 = StoreReachesRead2::storeReachesReadPrev/2;

private int iteration2() { result = 2 }

private module StoreReachesRead3 =
StoreReachesRead<storeReachesReadPrevDelta2/2, storeReachesReadPrevPrev2/2>;
StoreReachesRead<storeReachesReadPrevDelta2/2, storeReachesReadPrevPrev2/2, iteration2/0>;

private predicate storeReachesReadPrevDelta3 = StoreReachesRead3::storeReachesReadDelta/2;

private predicate storeReachesReadPrevPrev3 = StoreReachesRead3::storeReachesReadPrev/2;

private int iteration3() { result = 3 }

private module StoreReachesRead4 =
StoreReachesRead<storeReachesReadPrevDelta3/2, storeReachesReadPrevPrev3/2>;
StoreReachesRead<storeReachesReadPrevDelta3/2, storeReachesReadPrevPrev3/2, iteration3/0>;

private predicate storeReachesReadPrevDelta4 = StoreReachesRead4::storeReachesReadDelta/2;

private predicate storeReachesReadPrevPrev4 = StoreReachesRead4::storeReachesReadPrev/2;

private int iteration4() { result = 4 }

private module StoreReachesRead5 =
StoreReachesRead<storeReachesReadPrevDelta4/2, storeReachesReadPrevPrev4/2, iteration4/0>;

predicate storeReachesRead(NodeEx storeSource, NodeEx readTarget) {
StoreReachesRead4::storeReachesReadDelta(storeSource, readTarget)
StoreReachesRead5::storeReachesReadDelta(storeSource, readTarget)
or
StoreReachesRead4::storeReachesReadPrev(storeSource, readTarget)
StoreReachesRead5::storeReachesReadPrev(storeSource, readTarget)
}

predicate contentIsReadAndStored = StoreReachesRead4::contentIsReadAndStored/1;
predicate contentIsReadAndStored = StoreReachesRead5::contentIsReadAndStored/1;
}

predicate storeReachesRead = StoreReadReachability::storeReachesRead/2;
Expand Down

0 comments on commit 927d3e2

Please sign in to comment.