iMX/i2som-imx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

w1: fix w1_send_slave dropping a slave id

Browse Source 
commit 6b355b33a6 upstream.

Previous logic,
if (avail > 8) {
	store slave;
	return;
}
send data; clear;

The logic error is, if there isn't space send the buffer and clear,
but the slave wasn't added to the now empty buffer loosing that slave
id.  It also should have been "if (avail >= 8)" because when it is 8,
there is space.

Instead, if there isn't space send and clear the buffer, then there is
always space for the slave id.

Signed-off-by: David Fries <David@Fries.net>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
David Fries
2014-01-15 22:29:12 -06:00
committed by Greg Kroah-Hartman
parent 3b015ff024
commit 6733ac5814
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/w1/w1_netlink.c
View File

@ -54,28 +54,29 @@ static void w1_send_slave(struct w1_master *dev, u64 rn)
struct w1_netlink_msg *hdr = (struct w1_netlink_msg *)(msg + 1);
struct w1_netlink_cmd *cmd = (struct w1_netlink_cmd *)(hdr + 1);
int avail;
u64 *data;
/* update kernel slave list */
w1_slave_found(dev, rn);
avail = dev->priv_size - cmd->len;
if (avail > 8) {
u64 *data = (void *)(cmd + 1) + cmd->len;
if (avail < 8) {
msg->ack++;
cn_netlink_send(msg, 0, GFP_KERNEL);
*data = rn;
cmd->len += 8;
hdr->len += 8;
msg->len += 8;
return;
msg->len = sizeof(struct w1_netlink_msg) +
sizeof(struct w1_netlink_cmd);
hdr->len = sizeof(struct w1_netlink_cmd);
cmd->len = 0;
}
msg->ack++;
cn_netlink_send(msg, 0, GFP_KERNEL);
data = (void *)(cmd + 1) + cmd->len;
msg->len = sizeof(struct w1_netlink_msg) + sizeof(struct w1_netlink_cmd);
hdr->len = sizeof(struct w1_netlink_cmd);
cmd->len = 0;
*data = rn;
cmd->len += 8;
hdr->len += 8;
msg->len += 8;
}
static int w1_process_search_command(struct w1_master *dev, struct cn_msg *msg,