linux-kernel - linux-next: manual merge of the rd-docs tree with the trivial 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>] [day] [month] [year] [list]

Message-ID: <20140709171414.5d995396@canb.auug.org.au>
Date:	Wed, 9 Jul 2014 17:14:14 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Randy Dunlap <rdunlap@...radead.org>, Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Rickard Strandqvist <rickard_strandqvist@...ctrumdigital.se>,
	Pali Rohár <pali.rohar@...il.com>
Subject: linux-next: manual merge of the rd-docs tree with the trivial tree

Hi Randy,

Today's linux-next merge of the rd-docs tree got a conflict in
Documentation/laptops/freefall.c between commit d5ae11dc402f ("doc:
hpfall.c: fix missing null-terminate after strncpy call") from the
trivial tree and commit 0af05db576e9 ("Dell kernel driver dell-smo8800
provides same freefall interface as hp_accel so") from the rd-docs tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc Documentation/laptops/freefall.c
index 67084321dab4,aab2ff09e868..000000000000
--- a/Documentation/laptops/freefall.c
+++ b/Documentation/laptops/freefall.c
@@@ -27,8 -33,8 +33,9 @@@ static int set_unload_heads_path(char *
  
  	if (strlen(device) <= 5 || strncmp(device, "/dev/", 5) != 0)
  		return -EINVAL;
- 	strncpy(devname, device + 5, sizeof(devname));
+ 	strncpy(devname, device + 5, sizeof(devname) - 1);
 +	devname[sizeof(devname) - 1] = '\0';
+ 	strncpy(device_path, device, sizeof(device_path) - 1);
  
  	snprintf(unload_heads_path, sizeof(unload_heads_path) - 1,
  				"/sys/block/%s/device/unload_heads", devname);

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)