From f9ff4a203b8c155d51a208cadadb62f224fba715 Mon Sep 17 00:00:00 2001
From: Oliver Giles <ohw.giles@gmail.com>
Date: Mon, 1 Feb 2021 10:18:17 +1300
Subject: [PATCH] Ensure the size of the version field is 4 bytes

A corrupted version field size can cause TNEFVersion to access outside
of allocated memory. Check the version is the expected size and raise
an error if not.

Resolves: #86
Reported-by: jasperla
---
 lib/ytnef.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/ytnef.c b/lib/ytnef.c
index b148719..ffede44 100644
--- a/lib/ytnef.c
+++ b/lib/ytnef.c
@@ -335,6 +335,10 @@ int TNEFRendData STD_ARGLIST {
 int TNEFVersion STD_ARGLIST {
   WORD major;
   WORD minor;
+  if (size != 2 * sizeof(WORD)) {
+    printf("Incorrect size of version field, suspected corruption\n");
+    return -1;
+  }
   minor = SwapWord((BYTE*)data, size);
   major = SwapWord((BYTE*)data + 2, size - 2);
 
td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=f0e149752a76b453b197b39c88e4ffc9ac5f52fa'>refs</a><a class='active' href='/guix/log/config-daemon.ac'>log</a><a href='/guix/tree/config-daemon.ac?id=f0e149752a76b453b197b39c88e4ffc9ac5f52fa'>tree</a><a href='/guix/commit/config-daemon.ac?id=f0e149752a76b453b197b39c88e4ffc9ac5f52fa'>commit</a><a href='/guix/diff/config-daemon.ac?id=f0e149752a76b453b197b39c88e4ffc9ac5f52fa'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/config-daemon.ac'>
<input type='hidden' name='id' value='f0e149752a76b453b197b39c88e4ffc9ac5f52fa'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=f0e149752a76b453b197b39c88e4ffc9ac5f52fa'>root</a>/<a href='/guix/log/config-daemon.ac?id=f0e149752a76b453b197b39c88e4ffc9ac5f52fa'>config-daemon.ac</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/config-daemon.ac?id=f0e149752a76b453b197b39c88e4ffc9ac5f52fa&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-09-08 11:49:24 +0200'>2019-09-08</span></td><td><a href='/guix/commit/config-daemon.ac?id=f6919ebdc6b0ce0286814cc6ab0564b1a4c67f5f'>daemon: Run 'guix substitute' directly and assume a single substituter.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-09-08 11:49:24 +0200'>2019-09-08</span></td><td><a href='/guix/commit/config-daemon.ac?id=bc69ea2d605810cc32e13ed03d5848b8dc358b61'>daemon: Run 'guix offload' directly.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-09-08 11:49:24 +0200'>2019-09-08</span></td><td><a href='/guix/commit/config-daemon.ac?id=9fcc35c51fd579b3bb7b4f61cba6973675c3922c'>daemon: Run 'guix perform-download' directly.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-09-08 11:49:24 +0200'>2019-09-08</span></td><td><a href='/guix/commit/config-daemon.ac?id=0c684b7edfacada4f576855dbb09291f04a84fa2'>daemon: Run 'guix authenticate' directly.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-09-08 11:49:24 +0200'>2019-09-08</span></td><td><a href='/guix/commit/config-daemon.ac?id=2e3e5d21988fc2cafb2a9eaf4b00976ea425629d'>daemon: Invoke 'guix gc --list-busy' instead of 'list-runtime-roots'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-05-01 11:05:47 +0200'>2019-05-01</span></td><td><a href='/guix/commit/config-daemon.ac?id=757e633d57a7b994759d69e41dd759a39f1a34ae'>build: Change default substitute server to "ci.guix.gnu.org".</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>