Merge pull request #13732 from jketema/dataflow-default-none

jketema · web-flow · commit e6d7a83d4178 · 2023-07-13T10:42:39.000+02:00
C++/Swift: Remove `none()` dataflow configuration predicates
diff --git a/cpp/ql/src/Critical/FlowAfterFree.qll b/cpp/ql/src/Critical/FlowAfterFree.qll
@@ -88,14 +88,6 @@ module FlowFromFree<isSinkSig/2 isASink, isExcludedSig/2 isExcluded> {
         e = any(StoreInstruction store).getDestinationAddress().getUnconvertedResultExpression()
       )
     }
-
-    predicate isBarrier(DataFlow::Node n, FlowState state) { none() }
-
-    predicate isAdditionalFlowStep(
-      DataFlow::Node n1, FlowState state1, DataFlow::Node n2, FlowState state2
-    ) {
-      none()
-    }
   }
 
   import DataFlow::GlobalWithState<FlowFromFreeConfig>
diff --git a/cpp/ql/src/Likely Bugs/Conversion/CastArrayPointerArithmetic.ql b/cpp/ql/src/Likely Bugs/Conversion/CastArrayPointerArithmetic.ql
@@ -44,14 +44,6 @@ module CastToPointerArithFlowConfig implements DataFlow::StateConfigSig {
     ) and
     getFullyConvertedType(node) = state
   }
-
-  predicate isBarrier(DataFlow::Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(
-    DataFlow::Node node1, FlowState state1, DataFlow::Node node2, FlowState state2
-  ) {
-    none()
-  }
 }
 
 /**
diff --git a/cpp/ql/src/Security/CWE/CWE-078/ExecTainted.ql b/cpp/ql/src/Security/CWE/CWE-078/ExecTainted.ql
@@ -134,8 +134,6 @@ module ExecTaintConfig implements DataFlow::StateConfigSig {
 
   predicate isBarrier(DataFlow::Node node) { isBarrierImpl(node) }
 
-  predicate isBarrier(DataFlow::Node node, FlowState state) { none() }
-
   predicate isBarrierOut(DataFlow::Node node) {
     isSink(node, _) // Prevent duplicates along a call chain, since `shellCommand` will include wrappers
   }
diff --git a/cpp/ql/src/Security/CWE/CWE-119/OverrunWriteProductFlow.ql b/cpp/ql/src/Security/CWE/CWE-119/OverrunWriteProductFlow.ql
@@ -118,8 +118,6 @@ module ValidState {
       state = [false, true]
     }
 
-    predicate isBarrier(DataFlow::Node node, FlowState state) { none() }
-
     predicate isAdditionalFlowStep(
       DataFlow::Node node1, FlowState state1, DataFlow::Node node2, FlowState state2
     ) {
diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-193/ConstantSizeArrayOffByOne.ql b/cpp/ql/src/experimental/Security/CWE/CWE-193/ConstantSizeArrayOffByOne.ql
@@ -168,8 +168,6 @@ module ArrayAddressToDerefConfig implements DataFlow::StateConfigSig {
     )
   }
 
-  predicate isBarrier(DataFlow::Node node, FlowState state) { none() }
-
   predicate isBarrierIn(DataFlow::Node node) { isSource(node, _) }
 
   predicate isBarrierOut(DataFlow::Node node) { isSink(node, _) }
diff --git a/swift/ql/lib/codeql/swift/security/StringLengthConflationQuery.qll b/swift/ql/lib/codeql/swift/security/StringLengthConflationQuery.qll
@@ -31,17 +31,9 @@ module StringLengthConflationConfig implements DataFlow::StateConfigSig {
 
   predicate isBarrier(DataFlow::Node barrier) { barrier instanceof StringLengthConflationBarrier }
 
-  predicate isBarrier(DataFlow::Node barrier, FlowState flowstate) { none() }
-
   predicate isAdditionalFlowStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
     any(StringLengthConflationAdditionalFlowStep s).step(nodeFrom, nodeTo)
   }
-
-  predicate isAdditionalFlowStep(
-    DataFlow::Node nodeFrom, FlowState flowstateFrom, DataFlow::Node nodeTo, FlowState flowStateTo
-  ) {
-    none()
-  }
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -88,14 +88,6 @@ module FlowFromFree<isSinkSig/2 isASink, isExcludedSig/2 isExcluded> {`
`88`	`88`	`e = any(StoreInstruction store).getDestinationAddress().getUnconvertedResultExpression()`
`89`	`89`	`)`
`90`	`90`	`}`
`91`		`-`
`92`		`- predicate isBarrier(DataFlow::Node n, FlowState state) { none() }`
`93`		`-`
`94`		`- predicate isAdditionalFlowStep(`
`95`		`- DataFlow::Node n1, FlowState state1, DataFlow::Node n2, FlowState state2`
`96`		`- ) {`
`97`		`- none()`
`98`		`- }`
`99`	`91`	`}`
`100`	`92`
`101`	`93`	`import DataFlow::GlobalWithState<FlowFromFreeConfig>`
Original file line number	Diff line number	Diff line change
`@@ -44,14 +44,6 @@ module CastToPointerArithFlowConfig implements DataFlow::StateConfigSig {`
`44`	`44`	`) and`
`45`	`45`	`getFullyConvertedType(node) = state`
`46`	`46`	`}`
`47`		`-`
`48`		`- predicate isBarrier(DataFlow::Node node, FlowState state) { none() }`
`49`		`-`
`50`		`- predicate isAdditionalFlowStep(`
`51`		`- DataFlow::Node node1, FlowState state1, DataFlow::Node node2, FlowState state2`
`52`		`- ) {`
`53`		`- none()`
`54`		`- }`
`55`	`47`	`}`
`56`	`48`
`57`	`49`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -134,8 +134,6 @@ module ExecTaintConfig implements DataFlow::StateConfigSig {`
`134`	`134`
`135`	`135`	`predicate isBarrier(DataFlow::Node node) { isBarrierImpl(node) }`
`136`	`136`
`137`		`- predicate isBarrier(DataFlow::Node node, FlowState state) { none() }`
`138`		`-`
`139`	`137`	`predicate isBarrierOut(DataFlow::Node node) {`
`140`	`138`	isSink(node, _) // Prevent duplicates along a call chain, since `shellCommand` will include wrappers
`141`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,8 +118,6 @@ module ValidState {`
`118`	`118`	`state = [false, true]`
`119`	`119`	`}`
`120`	`120`
`121`		`- predicate isBarrier(DataFlow::Node node, FlowState state) { none() }`
`122`		`-`
`123`	`121`	`predicate isAdditionalFlowStep(`
`124`	`122`	`DataFlow::Node node1, FlowState state1, DataFlow::Node node2, FlowState state2`
`125`	`123`	`) {`
Original file line number	Diff line number	Diff line change
`@@ -168,8 +168,6 @@ module ArrayAddressToDerefConfig implements DataFlow::StateConfigSig {`
`168`	`168`	`)`
`169`	`169`	`}`
`170`	`170`
`171`		`- predicate isBarrier(DataFlow::Node node, FlowState state) { none() }`
`172`		`-`
`173`	`171`	`predicate isBarrierIn(DataFlow::Node node) { isSource(node, _) }`
`174`	`172`
`175`	`173`	`predicate isBarrierOut(DataFlow::Node node) { isSink(node, _) }`