Add validation for SomeIpSdOption to prevent Heap-buffer-overflow (#2215)

Author: egecetin

Packet++/header/SomeIpSdLayer.h

@@ -155,6 +155,13 @@ namespace pcpp
 		/// @return SomeIpSdProtocolType
 		SomeIpSdProtocolType getProtocol() const;
 
+		/// Checks whether data is valid or not
+		/// @return True if data is valid
+		static bool isDataValid(const IDataContainer* data, size_t dataLen)
+		{
+			return data && dataLen >= sizeof(someipsdhdroptionsipv4);
+		}
+
 	private:
 		/// @struct someipsdhdroptionsipv4
 		/// Represents the IPv4 option types for the SOME/IP-SD header
@@ -217,6 +224,13 @@ namespace pcpp
 		/// @return SomeIpSdProtocolType
 		SomeIpSdProtocolType getProtocol() const;
 
+		/// Checks whether data is valid or not
+		/// @return True if data is valid
+		static bool isDataValid(const IDataContainer* data, size_t dataLen)
+		{
+			return data && dataLen >= sizeof(someipsdhdroptionsipv6);
+		}
+
 	private:
 		/// @struct someipsdhdroptionsipv6
 		/// Represents the IPv6 option types for the SOME/IP-SD header
@@ -256,6 +270,13 @@ namespace pcpp
 		/// Get the configuration string
 		/// @return std::string
 		std::string getConfigurationString() const;
+
+		/// Checks whether data is valid or not
+		/// @return True if data is valid
+		static bool isDataValid(const IDataContainer* data, size_t dataLen)
+		{
+			return data && dataLen >= (sizeof(someipsdhdroptionsbase) - 1);
+		}
 	};
 
 	/// @class SomeIpSdLoadBalancingOption
@@ -283,6 +304,13 @@ namespace pcpp
 		/// @return uint16_t
 		uint16_t getWeight() const;
 
+		/// Checks whether data is valid or not
+		/// @return True if data is valid
+		static bool isDataValid(const IDataContainer* data, size_t dataLen)
+		{
+			return data && dataLen >= sizeof(someipsdhdroptionsload);
+		}
+
 	private:
 		/// @struct someipsdhdroptionsload
 		/// Represents the Load Balancing option header for SOME/IP-SD
@@ -621,7 +649,7 @@ namespace pcpp
 		uint32_t findOption(const SomeIpSdOption& option);
 		void addOption(const SomeIpSdOption& option);
 		bool addOptionIndex(uint32_t indexEntry, uint32_t indexOffset);
-		OptionPtr parseOption(SomeIpSdOption::OptionType type, size_t offset) const;
+		OptionPtr parseOption(SomeIpSdOption::OptionType type, size_t offset, size_t remainingLength) const;
 
 		static size_t getLenEntries(const uint8_t* data);
 		size_t getLenEntries() const;

Packet++/src/SomeIpSdLayer.cpp

@@ -517,7 +517,7 @@ namespace pcpp
 			SomeIpSdOption::someipsdhdroptionsbase* hdr = (SomeIpSdOption::someipsdhdroptionsbase*)(m_Data + offset);
 			SomeIpSdOption::OptionType optionType = static_cast<SomeIpSdOption::OptionType>(hdr->type);
 
-			option = parseOption(optionType, offset);
+			option = parseOption(optionType, offset, remainingLen);
 
 			if (option != nullptr)
 			{
@@ -562,7 +562,7 @@ namespace pcpp
 			{
 				SomeIpSdOption::OptionType optionType = static_cast<SomeIpSdOption::OptionType>(hdrOption->type);
 
-				option = parseOption(optionType, offset);
+				option = parseOption(optionType, offset, remainingLen);
 
 				if (option != nullptr)
 				{
@@ -754,29 +754,46 @@ namespace pcpp
 		return false;
 	}
 
-	SomeIpSdLayer::OptionPtr SomeIpSdLayer::parseOption(SomeIpSdOption::OptionType type, size_t offset) const
+	SomeIpSdLayer::OptionPtr SomeIpSdLayer::parseOption(SomeIpSdOption::OptionType type, size_t offset,
+	                                                    size_t remainingLength) const
 	{
 		switch (type)
 		{
 		case SomeIpSdOption::OptionType::IPv4Endpoint:
 		case SomeIpSdOption::OptionType::IPv4Multicast:
 		case SomeIpSdOption::OptionType::IPv4SdEndpoint:
 		{
-			return new SomeIpSdIPv4Option(this, offset);
+			if (SomeIpSdIPv4Option::isDataValid(this, remainingLength))
+			{
+				return new SomeIpSdIPv4Option(this, offset);
+			}
+			return nullptr;
 		}
 		case SomeIpSdOption::OptionType::IPv6Endpoint:
 		case SomeIpSdOption::OptionType::IPv6Multicast:
 		case SomeIpSdOption::OptionType::IPv6SdEndpoint:
 		{
-			return new SomeIpSdIPv6Option(this, offset);
+			if (SomeIpSdIPv6Option::isDataValid(this, remainingLength))
+			{
+				return new SomeIpSdIPv6Option(this, offset);
+			}
+			return nullptr;
 		}
 		case SomeIpSdOption::OptionType::ConfigurationString:
 		{
-			return new SomeIpSdConfigurationOption(this, offset);
+			if (SomeIpSdConfigurationOption::isDataValid(this, remainingLength))
+			{
+				return new SomeIpSdConfigurationOption(this, offset);
+			}
+			return nullptr;
 		}
 		case SomeIpSdOption::OptionType::LoadBalancing:
 		{
-			return new SomeIpSdLoadBalancingOption(this, offset);
+			if (SomeIpSdLoadBalancingOption::isDataValid(this, remainingLength))
+			{
+				return new SomeIpSdLoadBalancingOption(this, offset);
+			}
+			return nullptr;
 		}
 		default:
 			break;