From a34a62065c8b4beca3de6971f217d7a7801c1004 Mon Sep 17 00:00:00 2001 From: tsutsui Date: Fri, 18 Apr 2003 15:57:37 +0000 Subject: [PATCH] Revert part of previous. sdstrategy() no longer calls bounds_check_with_label() for RAW_PART. --- sys/arch/news68k/news68k/disksubr.c | 4 ++-- sys/arch/newsmips/newsmips/disksubr.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/arch/news68k/news68k/disksubr.c b/sys/arch/news68k/news68k/disksubr.c index c6be1f13e285..b12f9696f4ea 100644 --- a/sys/arch/news68k/news68k/disksubr.c +++ b/sys/arch/news68k/news68k/disksubr.c @@ -1,4 +1,4 @@ -/* $NetBSD: disksubr.c,v 1.13 2003/03/30 08:37:16 tsutsui Exp $ */ +/* $NetBSD: disksubr.c,v 1.14 2003/04/18 15:57:37 tsutsui Exp $ */ /* * Copyright (c) 1982, 1986, 1988 Regents of the University of California. @@ -208,7 +208,7 @@ bounds_check_with_label(bp, lp, wlabel) /* overwriting disk label ? */ /* XXX should also protect bootstrap in first 8K */ - if (securelevel >= 1 && DISKPART(bp->b_dev) != RAW_PART && + if (securelevel >= 1 && bp->b_blkno + p->p_offset <= labelsector && (bp->b_flags & B_READ) == 0 && wlabel == 0) { bp->b_error = EROFS; diff --git a/sys/arch/newsmips/newsmips/disksubr.c b/sys/arch/newsmips/newsmips/disksubr.c index 475094ad341e..2b161bceb632 100644 --- a/sys/arch/newsmips/newsmips/disksubr.c +++ b/sys/arch/newsmips/newsmips/disksubr.c @@ -1,4 +1,4 @@ -/* $NetBSD: disksubr.c,v 1.11 2003/03/30 08:42:00 tsutsui Exp $ */ +/* $NetBSD: disksubr.c,v 1.12 2003/04/18 15:57:37 tsutsui Exp $ */ /* * Copyright (c) 1982, 1986, 1988 Regents of the University of California. @@ -208,7 +208,7 @@ bounds_check_with_label(bp, lp, wlabel) /* overwriting disk label ? */ /* XXX should also protect bootstrap in first 8K */ - if (securelevel >= 1 && DISKPART(bp->b_dev) != RAW_PART && + if (securelevel >= 1 && bp->b_blkno + p->p_offset <= labelsector && (bp->b_flags & B_READ) == 0 && wlabel == 0) { bp->b_error = EROFS;