# HG changeset patch # User eyck # Date 1045464391 0 # Node ID 502105e32ac26796e1554ff8bd9bd6079da982ad # Parent 5b130e0682a8a74e528d1ca6d61ba8939a6884bc Fix mistake in applying patch from Alex Beregszaszi. There's no security problem here, but better safe then sorry. diff -r 5b130e0682a8 -r 502105e32ac2 drivers/mga_vid.c --- a/drivers/mga_vid.c Sun Feb 16 15:26:30 2003 +0000 +++ b/drivers/mga_vid.c Mon Feb 17 06:46:31 2003 +0000 @@ -1416,14 +1416,14 @@ { unsigned len; len = 0; - len += sprintf(&mga_param_buff[len]-len,"Interface version: %04X\n",MGA_VID_VERSION); - len += sprintf(&mga_param_buff[len]-len,"Memory: %x:%dM\n",mga_mem_base,(unsigned int) mga_ram_size); - len += sprintf(&mga_param_buff[len]-len,"MMIO: %p\n",mga_mmio_base); - len += sprintf(&mga_param_buff[len]-len ,"Configurable stuff:\n"); - len += sprintf(&mga_param_buff[len]-len,"~~~~~~~~~~~~~~~~~~~\n"); - len += sprintf(&mga_param_buff[len]-len,PARAM_BRIGHTNESS"%d\n",mga_brightness); - len += sprintf(&mga_param_buff[len]-len,PARAM_CONTRAST"%d\n",mga_contrast); - len += sprintf(&mga_param_buff[len]-len,PARAM_BLACKIE"%s\n",regs.blackie?"on":"off"); + len += snprintf(&mga_param_buff[len],PARAM_BUFF_SIZE-len,"Interface version: %04X\n",MGA_VID_VERSION); + len += snprintf(&mga_param_buff[len],PARAM_BUFF_SIZE-len,"Memory: %x:%dM\n",mga_mem_base,(unsigned int) mga_ram_size); + len += snprintf(&mga_param_buff[len],PARAM_BUFF_SIZE-len,"MMIO: %p\n",mga_mmio_base); + len += snprintf(&mga_param_buff[len],PARAM_BUFF_SIZE-len,"Configurable stuff:\n"); + len += snprintf(&mga_param_buff[len],PARAM_BUFF_SIZE-len,"~~~~~~~~~~~~~~~~~~~\n"); + len += snprintf(&mga_param_buff[len],PARAM_BUFF_SIZE-len,PARAM_BRIGHTNESS"%d\n",mga_brightness); + len += snprintf(&mga_param_buff[len],PARAM_BUFF_SIZE-len,PARAM_CONTRAST"%d\n",mga_contrast); + len += snprintf(&mga_param_buff[len],PARAM_BUFF_SIZE-len,PARAM_BLACKIE"%s\n",regs.blackie?"on":"off"); mga_param_buff_len = len; // check boundaries of mga_param_buff before writing to it!!! }