linux-kernel - linux-next: manual merge of the staging tree with Linus' 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: <20120427143703.f6946999cbca5509e22820a6@canb.auug.org.au>
Date:	Fri, 27 Apr 2012 14:37:03 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jesper Juhl <jj@...osbits.net>
Subject: linux-next: manual merge of the staging tree with Linus' tree

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/vt6656/ioctl.c between commit 17b7e1ba1e2e ("staging:
vt6656: Don't leak memory in drivers/staging/vt6656/ioctl.c::private_ioctl
()") from Linus' tree and commit 62ef30b5781d ("staging: vt6656: Remove
redundant casts from ioctl.c") from the staging 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/staging/vt6656/ioctl.c
index d59456c,cc7357d..0000000
--- a/drivers/staging/vt6656/ioctl.c
+++ b/drivers/staging/vt6656/ioctl.c
@@@ -565,7 -565,7 +565,7 @@@ int private_ioctl(PSDevice pDevice, str
  			result = -ENOMEM;
  			break;
  		}
- 		pNodeList = kmalloc(sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)), (int)GFP_ATOMIC);
 -		pNodeList = (PSNodeList)kmalloc(sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)), GFP_ATOMIC);
++		pNodeList = kmalloc(sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)), GFP_ATOMIC);
  		if (pNodeList == NULL) {
  			result = -ENOMEM;
  			break;

Content of type "application/pgp-signature" skipped