From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 28 Jun 2016 13:13:49 +0000 (+0100)
Subject: [CritFix] Fix encrypted fuzzy requests
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bfdb97167d7c2ec0e9578e4760a2c889f12e7de;p=thirdparty%2Frspamd.git

[CritFix] Fix encrypted fuzzy requests
---

diff --git a/src/plugins/fuzzy_check.c b/src/plugins/fuzzy_check.c
index 385b8aadcc..54a40db913 100644
--- a/src/plugins/fuzzy_check.c
+++ b/src/plugins/fuzzy_check.c
@@ -132,7 +132,7 @@ struct fuzzy_learn_session {
 struct fuzzy_cmd_io {
 	guint32 tag;
 	guint32 flags;
-	struct rspamd_fuzzy_cmd *cmd;
+	struct rspamd_fuzzy_cmd cmd;
 	struct iovec io;
 };
 
@@ -1008,7 +1008,7 @@ fuzzy_cmd_from_task_meta (struct fuzzy_rule *rule,
 	io = rspamd_mempool_alloc (pool, sizeof (*io));
 	io->flags = 0;
 	io->tag = cmd->tag;
-	io->cmd = cmd;
+	memcpy (&io->cmd, cmd, sizeof (io->cmd));
 
 	if (rule->peer_key) {
 		fuzzy_encrypt_cmd (rule, &enccmd->hdr, (guchar *)cmd, sizeof (*cmd));
@@ -1085,7 +1085,7 @@ fuzzy_cmd_from_text_part (struct fuzzy_rule *rule,
 	io = rspamd_mempool_alloc (pool, sizeof (*io));
 	io->tag = shcmd->basic.tag;
 	io->flags = 0;
-	io->cmd = &shcmd->basic;
+	memcpy (&io->cmd, &shcmd->basic, sizeof (io->cmd));
 
 	if (rule->peer_key) {
 		/* Encrypt data */
@@ -1139,7 +1139,7 @@ fuzzy_cmd_from_data_part (struct fuzzy_rule *rule,
 	io = rspamd_mempool_alloc (pool, sizeof (*io));
 	io->flags = 0;
 	io->tag = cmd->tag;
-	io->cmd = cmd;
+	memcpy (&io->cmd, cmd, sizeof (io->cmd));
 
 	if (rule->peer_key) {
 		g_assert (enccmd != NULL);
@@ -1284,7 +1284,7 @@ fuzzy_process_reply (guchar **pos, gint *r, GPtrArray *req,
 				io->flags |= FUZZY_CMD_FLAG_REPLIED;
 
 				if (pcmd) {
-					*pcmd = io->cmd;
+					*pcmd = &io->cmd;
 				}
 
 				return rep;