evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ASoC: soundwire: fix out of boundary access issues"

Browse source
This commit is contained in:
Linux Build Service Account 2016-08-16 16:34:47 -07:00 • committed by Gerrit - the friendly Code Review server
commit 9dbc6e0357
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/base/regmap/regmap-swr.c
View file

@ -23,15 +23,15 @@
static int regmap_swr_gather_write(void *context, static int regmap_swr_gather_write(void *context,
const void *reg, size_t reg_size, const void *reg, size_t reg_size,
const void *val, size_t val_size) const void *val, size_t val_len)
{ {
struct device *dev = context; struct device *dev = context;
struct swr_device *swr = to_swr_device(dev); struct swr_device *swr = to_swr_device(dev);
struct regmap *map = dev_get_regmap(dev, NULL); struct regmap *map = dev_get_regmap(dev, NULL);
size_t addr_bytes = map->format.reg_bytes; size_t addr_bytes = map->format.reg_bytes;
int ret = 0; size_t val_bytes;
int i; int i, ret = 0;
u32 reg_addr = 0; u16 reg_addr = 0;
if (swr == NULL) { if (swr == NULL) {
dev_err(dev, "%s: swr device is NULL\n", __func__); dev_err(dev, "%s: swr device is NULL\n", __func__);
@ -43,12 +43,15 @@ static int regmap_swr_gather_write(void *context,
return -EINVAL; return -EINVAL;
} }
reg_addr = *(u16 *)reg; reg_addr = *(u16 *)reg;
for (i = 0; i < val_size; i++) { val_bytes = map->format.val_bytes;
ret = swr_write(swr, swr->dev_num, (reg_addr+i), /* val_len = val_bytes * val_count */
(u32 *)(val+i)); for (i = 0; i < (val_len / val_bytes); i++) {
reg_addr = reg_addr + i;
val = (u8 *)val + (val_bytes * i);
ret = swr_write(swr, swr->dev_num, reg_addr, val);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "%s: write reg 0x%x failed, err %d\n", dev_err(dev, "%s: write reg 0x%x failed, err %d\n",
__func__, (reg_addr+i), ret); __func__, reg_addr, ret);
break; break;
} }
} }
@ -153,7 +156,7 @@ static int regmap_swr_read(void *context,
struct regmap *map = dev_get_regmap(dev, NULL); struct regmap *map = dev_get_regmap(dev, NULL);
size_t addr_bytes = map->format.reg_bytes; size_t addr_bytes = map->format.reg_bytes;
int ret = 0; int ret = 0;
u32 reg_addr = 0; u16 reg_addr = 0;
if (swr == NULL) { if (swr == NULL) {
dev_err(dev, "%s: swr is NULL\n", __func__); dev_err(dev, "%s: swr is NULL\n", __func__);
@ -164,7 +167,7 @@ static int regmap_swr_read(void *context,
__func__, reg_size); __func__, reg_size);
return -EINVAL; return -EINVAL;
} }
reg_addr = *(u32 *)reg; reg_addr = *(u16 *)reg;
ret = swr_read(swr, swr->dev_num, reg_addr, val, val_size); ret = swr_read(swr, swr->dev_num, reg_addr, val, val_size);
if (ret < 0) if (ret < 0)
dev_err(dev, "%s: codec reg 0x%x read failed %d\n", dev_err(dev, "%s: codec reg 0x%x read failed %d\n",

2
drivers/soundwire/swr-wcd-ctrl.c
View file

@ -477,7 +477,7 @@ static int swrm_read(struct swr_master *master, u8 dev_num, u16 reg_addr,
{ {
struct swr_mstr_ctrl *swrm = swr_get_ctrl_data(master); struct swr_mstr_ctrl *swrm = swr_get_ctrl_data(master);
int ret = 0; int ret = 0;
int val = 0; int val;
u8 *reg_val = (u8 *)buf; u8 *reg_val = (u8 *)buf;
if (!swrm) { if (!swrm) {