lib: move msg validity check into separate function

Signed-off-by: Jiri Pirko <jiri@resnulli.us>

1 files changed, 15 insertions, 4 deletions

diff --git a/libndp/libndp.c b/libndp/libndp.c
index 0bd664e..dca3b75 100644
--- a/libndp/libndp.c
+++ b/libndp/libndp.c
@@ -392,6 +392,16 @@ static int ndp_msg_type_by_raw_type(enum ndp_msg_type *p_msg_type,
 	return -ENOENT;
 }
 
+static bool ndp_msg_check_valid(struct ndp_msg *msg)
+{
+	size_t len = ndp_msg_payload_len(msg);
+	enum ndp_msg_type msg_type = ndp_msg_type(msg);
+
+	if (len < ndp_msg_type_info(msg_type)->raw_struct_size)
+		return false;
+	return true;
+}
+
 static struct ndp_msg *ndp_msg_alloc(void)
 {
 	struct ndp_msg *msg;
@@ -1358,11 +1368,12 @@ static int ndp_sock_recv(struct ndp *ndp)
 	ndp_msg_init(msg, msg_type);
 	ndp_msg_payload_len_set(msg, len);
 
-	if (len < ndp_msg_type_info(msg_type)->raw_struct_size) {
-		warn(ndp, "rcvd %s packet too short (%luB)",
-			  ndp_msg_type_info(msg_type)->strabbr, len);
-		return 0;
+	if (!ndp_msg_check_valid(msg)) {
+		warn(ndp, "rcvd invalid ND message");
+		err = 0;
+		goto free_msg;
 	}
+
 	dbg(ndp, "rcvd %s, len: %luB",
 		 ndp_msg_type_info(msg_type)->strabbr, len);