d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added a check for the ISA memory address range being valid. Fixes PR#835.

Browse Source
This commit is contained in:
dg 1997-09-08 20:00:21 +00:00
parent 10251b0fa8
commit 224a34b929
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/dev/ed/if_ed.c
View File

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ed.c,v 1.118 1997/09/02 01:18:07 bde Exp $
* $Id: if_ed.c,v 1.119 1997/09/08 10:27:09 davidg Exp $
*/
/*
@ -451,7 +451,7 @@ ed_probe_WD80x3(isa_dev)
{
struct ed_softc *sc = &ed_softc[isa_dev->id_unit];
int i;
u_int memsize;
u_int memsize, maddr;
u_char iptr, isa16bit, sum;
sc->asic_addr = isa_dev->id_iobase;
@ -629,6 +629,13 @@ ed_probe_WD80x3(isa_dev)
if (isa_dev->id_msize)
memsize = isa_dev->id_msize;
maddr = (u_int) isa_dev->id_maddr & 0xffffff;
if (maddr < 0xc0000 || maddr + memsize > 0x1000000) {
printf("ed%d: Invalid ISA memory address range configured: 0x%x - 0x%x\n",
isa_dev->id_unit, maddr, maddr + memsize);
return 0;
}
/*
* (note that if the user specifies both of the following flags that
* '8bit' mode intentionally has precedence)

11
sys/i386/isa/if_ed.c
View File

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ed.c,v 1.118 1997/09/02 01:18:07 bde Exp $
* $Id: if_ed.c,v 1.119 1997/09/08 10:27:09 davidg Exp $
*/
/*
@ -451,7 +451,7 @@ ed_probe_WD80x3(isa_dev)
{
struct ed_softc *sc = &ed_softc[isa_dev->id_unit];
int i;
u_int memsize;
u_int memsize, maddr;
u_char iptr, isa16bit, sum;
sc->asic_addr = isa_dev->id_iobase;
@ -629,6 +629,13 @@ ed_probe_WD80x3(isa_dev)
if (isa_dev->id_msize)
memsize = isa_dev->id_msize;
maddr = (u_int) isa_dev->id_maddr & 0xffffff;
if (maddr < 0xc0000 || maddr + memsize > 0x1000000) {
printf("ed%d: Invalid ISA memory address range configured: 0x%x - 0x%x\n",
isa_dev->id_unit, maddr, maddr + memsize);
return 0;
}
/*
* (note that if the user specifies both of the following flags that
* '8bit' mode intentionally has precedence)