linux-kernel - linux-next: manual merge of the net tree with the wireless 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]

Date:	Wed, 6 Oct 2010 12:09:08 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Dan Carpenter <error27@...il.com>,
	Joe Perches <joe@...ches.com>,
	"John W. Linville" <linville@...driver.com>
Subject: linux-next: manual merge of the net tree with the wireless tree

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/ipw2x00/ipw2200.c between commit
2ee4e27cf25ab647137713ca16377d8d9e138ea2 ("ipw2200: check for allocation
failures") from the wireless tree and commit
baeb2ffab4e67bb9174e6166e070a9a8ec94b0f6 ("drivers/net: Convert unbounded
kzalloc calls to kcalloc") from the net tree.

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

diff --cc drivers/net/wireless/ipw2x00/ipw2200.c
index d04d760,0f25083..0000000
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@@ -11467,13 -11467,9 +11467,13 @@@ static int ipw_net_init(struct net_devi
  
  		bg_band->band = IEEE80211_BAND_2GHZ;
  		bg_band->n_channels = geo->bg_channels;
- 		bg_band->channels =
- 			kzalloc(geo->bg_channels *
- 				sizeof(struct ieee80211_channel), GFP_KERNEL);
+ 		bg_band->channels = kcalloc(geo->bg_channels,
+ 					    sizeof(struct ieee80211_channel),
+ 					    GFP_KERNEL);
 +		if (!bg_band->channels) {
 +			rc = -ENOMEM;
 +			goto out;
 +		}
  		/* translate geo->bg to bg_band.channels */
  		for (i = 0; i < geo->bg_channels; i++) {
  			bg_band->channels[i].band = IEEE80211_BAND_2GHZ;
@@@ -11506,13 -11502,9 +11506,13 @@@
  
  		a_band->band = IEEE80211_BAND_5GHZ;
  		a_band->n_channels = geo->a_channels;
- 		a_band->channels =
- 			kzalloc(geo->a_channels *
- 				sizeof(struct ieee80211_channel), GFP_KERNEL);
+ 		a_band->channels = kcalloc(geo->a_channels,
+ 					   sizeof(struct ieee80211_channel),
+ 					   GFP_KERNEL);
 +		if (!a_band->channels) {
 +			rc = -ENOMEM;
 +			goto out;
 +		}
  		/* translate geo->bg to a_band.channels */
  		for (i = 0; i < geo->a_channels; i++) {
  			a_band->channels[i].band = IEEE80211_BAND_2GHZ;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/