diff options
| author | Len Brown <len.brown@intel.com> | 2005-03-17 15:27:36 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-03-17 15:27:36 -0500 |
| commit | 175bc146b9a93cc743a64914c8d1adafafda7a87 (patch) | |
| tree | 291617238f5f52c91afa9f16609cadfa36fb451f | |
| parent | 1e74fa16a824ec842bfb8ed7ca45ef1ca668ef08 (diff) | |
| parent | cc8b6e45dd635d698cd4ef28aa6ccc704a23cd72 (diff) | |
| download | history-175bc146b9a93cc743a64914c8d1adafafda7a87.tar.gz | |
Merge intel.com:/home/lenb/bk/26-latest-ref
into intel.com:/home/lenb/src/26-latest-dev
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | drivers/i2c/chips/eeprom.c | 3 | ||||
| -rw-r--r-- | drivers/net/ppp_async.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile index fbe0fd77b5dcd..0e5fd7a04e555 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 -SUBLEVEL = 11 -EXTRAVERSION = +SUBLEVEL = 12 +EXTRAVERSION =-rc1 NAME=Woozy Numbat # *DOCUMENTATION* diff --git a/drivers/i2c/chips/eeprom.c b/drivers/i2c/chips/eeprom.c index 8e49fa7eb7abd..f126d011cfee2 100644 --- a/drivers/i2c/chips/eeprom.c +++ b/drivers/i2c/chips/eeprom.c @@ -130,7 +130,8 @@ static ssize_t eeprom_read(struct kobject *kobj, char *buf, loff_t off, size_t c /* Hide Vaio security settings to regular users (16 first bytes) */ if (data->nature == VAIO && off < 16 && !capable(CAP_SYS_ADMIN)) { - int in_row1 = 16 - off; + size_t in_row1 = 16 - off; + in_row1 = min(in_row1, count); memset(buf, 0, in_row1); if (count - in_row1 > 0) memcpy(buf + in_row1, &data->data[16], count - in_row1); diff --git a/drivers/net/ppp_async.c b/drivers/net/ppp_async.c index a48e19391208f..33b9d79b1aada 100644 --- a/drivers/net/ppp_async.c +++ b/drivers/net/ppp_async.c @@ -1000,7 +1000,7 @@ static void async_lcp_peek(struct asyncppp *ap, unsigned char *data, data += 4; dlen -= 4; /* data[0] is code, data[1] is length */ - while (dlen >= 2 && dlen >= data[1]) { + while (dlen >= 2 && dlen >= data[1] && data[1] >= 2) { switch (data[0]) { case LCP_MRU: val = (data[2] << 8) + data[3]; |