From d04087bf823b4199ee100cc16315eaff979c833e Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Sun, 2 Dec 2012 13:36:09 +0300 Subject: [PATCH] --- yaml --- r: 341957 b: refs/heads/master c: 6dac3447425d932fa76a4e69d32eead9dd090b27 h: refs/heads/master i: 341955: c33ad6f718ce59102d5aa1bc0498afd4c97b868c v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/p54/eeprom.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4ac848b7b750..30a5a4d36aea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06ef5c4bbb9816e7a7eb44917f11c2e3375fb51a +refs/heads/master: 6dac3447425d932fa76a4e69d32eead9dd090b27 diff --git a/trunk/drivers/net/wireless/p54/eeprom.c b/trunk/drivers/net/wireless/p54/eeprom.c index 1ef1bfe6a9d7..d43e3740e45d 100644 --- a/trunk/drivers/net/wireless/p54/eeprom.c +++ b/trunk/drivers/net/wireless/p54/eeprom.c @@ -541,8 +541,9 @@ static int p54_parse_rssical(struct ieee80211_hw *dev, entries = (len - offset) / sizeof(struct pda_rssi_cal_ext_entry); - if ((len - offset) % sizeof(struct pda_rssi_cal_ext_entry) || - entries <= 0) { + if (len < offset || + (len - offset) % sizeof(struct pda_rssi_cal_ext_entry) || + entries == 0) { wiphy_err(dev->wiphy, "invalid rssi database.\n"); goto err_data; }