linux-kernel - linux-next: manual merge of the rr tree with the sound 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: <20100713121348.c9e76987.sfr@canb.auug.org.au>
Date:	Tue, 13 Jul 2010 12:13:48 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Rusty Russell <rusty@...tcorp.com.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Arnd Bergmann <arnd@...db.de>, Takashi Iwai <tiwai@...e.de>
Subject: linux-next: manual merge of the rr tree with the sound tree

Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in
arch/um/drivers/hostaudio_kern.c between commit
90dc763fef4c869e60b2a7ad92e1a7dab68575ea ("sound: push BKL into open
functions") from the sound tree and commit
6aad4054c113f2d8a8bbdee64e7167950dd06c92 ("param:lock-charp-simple") from
the rr tree.

Overlapping additions.  I fixed it up (see below) and carry the fix as necessary.

I was not sure if the kparam_(un)block_sysfs_write() calls needed to be
surrounded by the (un)lock_kernel() calls or vice verse.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/um/drivers/hostaudio_kern.c
index 68142df,162855c..0000000
--- a/arch/um/drivers/hostaudio_kern.c
+++ b/arch/um/drivers/hostaudio_kern.c
@@@ -199,10 -200,9 +201,12 @@@ static int hostaudio_open(struct inode 
  	if (file->f_mode & FMODE_WRITE)
  		w = 1;
  
 +	lock_kernel();
+ 	kparam_block_sysfs_write(dsp);
  	ret = os_open_file(dsp, of_set_rw(OPENFLAGS(), r, w), 0);
+ 	kparam_unblock_sysfs_write(dsp);
 +	unlock_kernel();
 +
  	if (ret < 0) {
  		kfree(state);
  		return ret;
@@@ -258,13 -258,15 +262,17 @@@ static int hostmixer_open_mixdev(struc
  	if (file->f_mode & FMODE_WRITE)
  		w = 1;
  
 +	lock_kernel();
+ 	kparam_block_sysfs_write(mixer);
  	ret = os_open_file(mixer, of_set_rw(OPENFLAGS(), r, w), 0);
+ 	kparam_unblock_sysfs_write(mixer);
 +	unlock_kernel();
  
  	if (ret < 0) {
+ 		kparam_block_sysfs_write(dsp);
  		printk(KERN_ERR "hostaudio_open_mixdev failed to open '%s', "
  		       "err = %d\n", dsp, -ret);
+ 		kparam_unblock_sysfs_write(dsp);
  		kfree(state);
  		return ret;
  	}
--
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/