From 52ab2155603b03ddff29ad529639299ed506335e Mon Sep 17 00:00:00 2001 From: Jeroen Ketema Date: Wed, 12 Jul 2023 23:49:29 +0200 Subject: [PATCH] C++/Swift: Remove `none()` dataflow configuration predicates These now have default implementations that are also `none()` --- cpp/ql/src/Critical/FlowAfterFree.qll | 8 -------- .../Likely Bugs/Conversion/CastArrayPointerArithmetic.ql | 8 -------- cpp/ql/src/Security/CWE/CWE-078/ExecTainted.ql | 2 -- .../src/Security/CWE/CWE-119/OverrunWriteProductFlow.ql | 2 -- .../Security/CWE/CWE-193/ConstantSizeArrayOffByOne.ql | 2 -- .../codeql/swift/security/StringLengthConflationQuery.qll | 8 -------- 6 files changed, 30 deletions(-) diff --git a/cpp/ql/src/Critical/FlowAfterFree.qll b/cpp/ql/src/Critical/FlowAfterFree.qll index 0e04b294d70..7705e8841d4 100644 --- a/cpp/ql/src/Critical/FlowAfterFree.qll +++ b/cpp/ql/src/Critical/FlowAfterFree.qll @@ -88,14 +88,6 @@ module FlowFromFree { 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 diff --git a/cpp/ql/src/Likely Bugs/Conversion/CastArrayPointerArithmetic.ql b/cpp/ql/src/Likely Bugs/Conversion/CastArrayPointerArithmetic.ql index 79a5d530c21..7dda356353e 100644 --- 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 index cc4b748e5dc..0686c4a707c 100644 --- 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 index baba3a033db..510b7e8b6c4 100644 --- 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 index 42623d37328..c38a012b27b 100644 --- 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 index 1aabb4ccbda..af3ae1f7cc1 100644 --- 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() - } } /**