fs: dlm: check on minimum msglen size

[ Upstream commit 710176e8363f269c6ecd73d203973b31ace119d3 ]

This patch adds an additional check for minimum dlm header size which is
an invalid dlm message and signals a broken stream. A msglen field cannot
be less than the dlm header size because the field is inclusive header
lengths.

Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/dlm/midcomms.c b/fs/dlm/midcomms.c
index fde3a6afe4beaff5399ae6e711ebd0f76cf4514a..0bedfa8606a261eac64fb521fd77657402496918 100644 (file)
--- a/fs/dlm/midcomms.c
+++ b/fs/dlm/midcomms.c
@@ -49,9 +49,10 @@ int dlm_process_incoming_buffer(int nodeid, unsigned char *buf, int len)
                 * cannot deliver this message to upper layers
                 */
                msglen = get_unaligned_le16(&hd->h_length);
-               if (msglen > DEFAULT_BUFFER_SIZE) {
-                       log_print("received invalid length header: %u, will abort message parsing",
-                                 msglen);
+               if (msglen > DEFAULT_BUFFER_SIZE ||
+                   msglen < sizeof(struct dlm_header)) {
+                       log_print("received invalid length header: %u from node %d, will abort message parsing",
+                                 msglen, nodeid);
                        return -EBADMSG;
                }