From 4e48be4f4a3469a1aafb307f6f8b89b71bb626a4 Mon Sep 17 00:00:00 2001 From: Douglas Gilbert Date: Thu, 1 Sep 2005 21:50:02 +1000 Subject: [PATCH] --- yaml --- r: 7721 b: refs/heads/master c: deb92b7ee98e8e580cafaa63bd1edbe6646877bc h: refs/heads/master i: 7719: e359075406487e0a062d1f5de8dc227d486c8f13 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/sg.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0ccb6a139d97..b119fb2d531b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07542b832309b93a2741cd162a391ab909f66438 +refs/heads/master: deb92b7ee98e8e580cafaa63bd1edbe6646877bc diff --git a/trunk/drivers/scsi/sg.c b/trunk/drivers/scsi/sg.c index 14fb179b3842..616c3f3e62fc 100644 --- a/trunk/drivers/scsi/sg.c +++ b/trunk/drivers/scsi/sg.c @@ -61,7 +61,7 @@ static int sg_version_num = 30533; /* 2 digits for each component */ #ifdef CONFIG_SCSI_PROC_FS #include -static char *sg_version_date = "20050328"; +static char *sg_version_date = "20050901"; static int sg_proc_init(void); static void sg_proc_cleanup(void); @@ -1794,12 +1794,12 @@ st_map_user_pages(struct scatterlist *sgl, const unsigned int max_pages, unsigned long uaddr, size_t count, int rw, unsigned long max_pfn) { + unsigned long end = (uaddr + count + PAGE_SIZE - 1) >> PAGE_SHIFT; + unsigned long start = uaddr >> PAGE_SHIFT; + const int nr_pages = end - start; int res, i, j; - unsigned int nr_pages; struct page **pages; - nr_pages = ((uaddr & ~PAGE_MASK) + count + ~PAGE_MASK) >> PAGE_SHIFT; - /* User attempted Overflow! */ if ((uaddr + count) < uaddr) return -EINVAL;