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

Don't accept the blank time value, if it is too big.

Browse Source 
PR: bin/6188
This commit is contained in:
Kazutaka YOKOTA 1998-08-03 09:15:36 +00:00
parent 2aa0aafb2d
commit 16d7bd5278
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/syscons/syscons.c
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: syscons.c,v 1.267 1998/07/15 12:18:17 bde Exp $
* $Id: syscons.c,v 1.268 1998/08/03 09:09:34 yokota Exp $
*/
#include "sc.h"
@ -97,6 +97,8 @@
#define MODE_MAP_SIZE (M_VGA_CG320 + 1)
#define MODE_PARAM_SIZE 64
#define MAX_BLANKTIME (7*24*60*60) /* 7 days!? */
/* for backward compatibility */
#define OLD_CONS_MOUSECTL _IOWR('c', 10, old_mouse_info_t)
@ -1041,7 +1043,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
return 0;
case CONS_BLANKTIME: /* set screen saver timeout (0 = no saver) */
if (*(int *)data < 0)
if (*(int *)data < 0 || *(int *)data > MAX_BLANKTIME)
return EINVAL;
scrn_blank_time = *(int *)data;
if (scrn_blank_time == 0)

6
sys/i386/isa/syscons.c
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: syscons.c,v 1.267 1998/07/15 12:18:17 bde Exp $
* $Id: syscons.c,v 1.268 1998/08/03 09:09:34 yokota Exp $
*/
#include "sc.h"
@ -97,6 +97,8 @@
#define MODE_MAP_SIZE (M_VGA_CG320 + 1)
#define MODE_PARAM_SIZE 64
#define MAX_BLANKTIME (7*24*60*60) /* 7 days!? */
/* for backward compatibility */
#define OLD_CONS_MOUSECTL _IOWR('c', 10, old_mouse_info_t)
@ -1041,7 +1043,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
return 0;
case CONS_BLANKTIME: /* set screen saver timeout (0 = no saver) */
if (*(int *)data < 0)
if (*(int *)data < 0 || *(int *)data > MAX_BLANKTIME)
return EINVAL;
scrn_blank_time = *(int *)data;
if (scrn_blank_time == 0)

6
sys/isa/syscons.c
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: syscons.c,v 1.267 1998/07/15 12:18:17 bde Exp $
* $Id: syscons.c,v 1.268 1998/08/03 09:09:34 yokota Exp $
*/
#include "sc.h"
@ -97,6 +97,8 @@
#define MODE_MAP_SIZE (M_VGA_CG320 + 1)
#define MODE_PARAM_SIZE 64
#define MAX_BLANKTIME (7*24*60*60) /* 7 days!? */
/* for backward compatibility */
#define OLD_CONS_MOUSECTL _IOWR('c', 10, old_mouse_info_t)
@ -1041,7 +1043,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
return 0;
case CONS_BLANKTIME: /* set screen saver timeout (0 = no saver) */
if (*(int *)data < 0)
if (*(int *)data < 0 || *(int *)data > MAX_BLANKTIME)
return EINVAL;
scrn_blank_time = *(int *)data;
if (scrn_blank_time == 0)