linux-kernel - linux-next: manual merge of the sound-asoc tree with the regmap tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20120510142552.35f8e15042053707a2086905@canb.auug.org.au>
Date:	Thu, 10 May 2012 14:25:52 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mark Brown <broonie@...nsource.wolfsonmicro.com>,
	Liam Girdwood <lrg@...com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Laxman Dewangan <ldewangan@...dia.com>,
	Stephen Warren <swarren@...dia.com>
Subject: linux-next: manual merge of the sound-asoc tree with the regmap
 tree

Hi all,

Today's linux-next merge of the sound-asoc tree got a conflict in
drivers/base/regmap/regmap.c between commit 6560ffd1ccd6 ("regmap: fix
possible memory corruption in regmap_bulk_read()") from the regmap tree
and commit edc9ae420f98 ("regmap: implement register striding") from the
sound-asoc tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/base/regmap/regmap.c
index bb80853,8a25006..0000000
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@@ -775,11 -863,10 +863,12 @@@ int regmap_bulk_read(struct regmap *map
  			map->format.parse_val(val + i);
  	} else {
  		for (i = 0; i < val_count; i++) {
 +			unsigned int ival;
- 			ret = regmap_read(map, reg + i, &ival);
+ 			ret = regmap_read(map, reg + (i * map->reg_stride),
 -					  val + (i * val_bytes));
++					  &ival);
  			if (ret != 0)
  				return ret;
 +			memcpy(val + (i * val_bytes), &ival, val_bytes);
  		}
  	}
  

Content of type "application/pgp-signature" skipped