From: Philip Homburg <philip@cs.vu.nl>
Date: Mon, 23 Apr 2007 13:22:26 +0000 (+0000)
Subject: Fail unsafe sdevio. Disallow unaligned I/O ports.
X-Git-Tag: v3.1.4~427
X-Git-Url: http://zhaoyanbai.com/repos/%22../static/icons/index.html?a=commitdiff_plain;h=2b2d3d5131af8a84dbd2308f15aeccb661987a6d;p=minix.git

Fail unsafe sdevio. Disallow unaligned I/O ports.
---

diff --git a/kernel/arch/i386/do_sdevio.c b/kernel/arch/i386/do_sdevio.c
index b76f4df49..c0ea693d7 100644
--- a/kernel/arch/i386/do_sdevio.c
+++ b/kernel/arch/i386/do_sdevio.c
@@ -71,14 +71,27 @@ register message *m_ptr;	/* pointer to request message */
          return(EPERM);
   } else {
      if(proc_nr != who_p)
-	kprintf("unsafe sdevio by %d in %d\n", who_e, proc_nr_e);
+     {
+	kprintf("do_sdevio: unsafe sdevio by %d in %d denied\n",
+		who_e, proc_nr_e);
+	return EPERM;
+     }
      /* Get and check physical address. */
      if ((phys_buf = numap_local(proc_nr,
 	 (vir_bytes) m_ptr->DIO_VEC_ADDR, count)) == 0)
          return(EFAULT);
   }
 
+	switch (io_type)
+	{
+	case _DIO_BYTE: size= 1; break;
+	case _DIO_WORD: size= 2; break;
+	case _DIO_LONG: size= 4; break;
+	default: size= 4; break;	/* Be conservative */
+	}
+
   rp= proc_addr(who_p);
+  privp= priv(rp);
   if (privp && privp->s_flags & CHECK_IO_PORT)
   {
 	switch (io_type)
@@ -104,6 +117,12 @@ register message *m_ptr;	/* pointer to request message */
 	}
   }
 
+  if (port & (size-1))
+  {
+	kprintf("do_devio: unaligned port 0x%x (size %d)\n", port, size);
+	return EPERM;
+  }
+
   /* Perform device I/O for bytes and words. Longs are not supported. */
   if (req_dir == _DIO_INPUT) { 
       switch (req_type) {
@@ -125,4 +144,3 @@ register message *m_ptr;	/* pointer to request message */
 }
 
 #endif /* USE_SDEVIO */
-