Re: [patch] [patch 2/2 v2] w1: use correct lock on error in w1_seq_show()
On Thu, Jun 11, 2015 at 06:31:00PM +0300, Evgeniy Polyakov wrote:
> Hi
>
> 04.06.2015, 12:04, "Dan Carpenter" :
> > I noticed there was a problem here because Smatch complained:
> >
> > drivers/w1/slaves/w1_therm.c:416 w1_seq_show() warn:
> > inconsistent returns 'mutex:>master->mutex'.
> > Locked on: line 416
> > Unlocked on: line 413
> >
> > The problem is that we lock ->mutex but we unlock ->bus_mutex on error.
> > David Fries says that ->bus_mutex is correct and ->mutex is incorrect.
> >
> > Fixes: d9411e57dc7f ('w1: Add support for DS28EA00 sequence to w1-therm')
> > Signed-off-by: Dan Carpenter
>
> Looks good to me, Greg please pull this serie into your tree, if you hadn't
> yet.
> Am I right that this is a stable tree material too?
I would expect the answer to be no. This is a fix to a new feature
that is in gregkh/char-misc but not yet in Linus's tree.
--
David Fries
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [patch] [patch 2/2 v2] w1: use correct lock on error in w1_seq_show()
Hi
04.06.2015, 12:04, "Dan Carpenter" :
> I noticed there was a problem here because Smatch complained:
>
> drivers/w1/slaves/w1_therm.c:416 w1_seq_show() warn:
> inconsistent returns 'mutex:>master->mutex'.
> Locked on: line 416
> Unlocked on: line 413
>
> The problem is that we lock ->mutex but we unlock ->bus_mutex on error.
> David Fries says that ->bus_mutex is correct and ->mutex is incorrect.
>
> Fixes: d9411e57dc7f ('w1: Add support for DS28EA00 sequence to w1-therm')
> Signed-off-by: Dan Carpenter
Looks good to me, Greg please pull this serie into your tree, if you hadn't yet.
Am I right that this is a stable tree material too?
Acked-by: Evgeniy Polyakov
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [patch] [patch 2/2 v2] w1: use correct lock on error in w1_seq_show()
On Thu, Jun 11, 2015 at 06:31:00PM +0300, Evgeniy Polyakov wrote:
Hi
04.06.2015, 12:04, Dan Carpenter dan.carpen...@oracle.com:
I noticed there was a problem here because Smatch complained:
drivers/w1/slaves/w1_therm.c:416 w1_seq_show() warn:
inconsistent returns 'mutex:sl-master-mutex'.
Locked on: line 416
Unlocked on: line 413
The problem is that we lock -mutex but we unlock -bus_mutex on error.
David Fries says that -bus_mutex is correct and -mutex is incorrect.
Fixes: d9411e57dc7f ('w1: Add support for DS28EA00 sequence to w1-therm')
Signed-off-by: Dan Carpenter dan.carpen...@oracle.com
Looks good to me, Greg please pull this serie into your tree, if you hadn't
yet.
Am I right that this is a stable tree material too?
I would expect the answer to be no. This is a fix to a new feature
that is in gregkh/char-misc but not yet in Linus's tree.
--
David Fries da...@fries.net
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [patch] [patch 2/2 v2] w1: use correct lock on error in w1_seq_show()
Hi
04.06.2015, 12:04, Dan Carpenter dan.carpen...@oracle.com:
I noticed there was a problem here because Smatch complained:
drivers/w1/slaves/w1_therm.c:416 w1_seq_show() warn:
inconsistent returns 'mutex:sl-master-mutex'.
Locked on: line 416
Unlocked on: line 413
The problem is that we lock -mutex but we unlock -bus_mutex on error.
David Fries says that -bus_mutex is correct and -mutex is incorrect.
Fixes: d9411e57dc7f ('w1: Add support for DS28EA00 sequence to w1-therm')
Signed-off-by: Dan Carpenter dan.carpen...@oracle.com
Looks good to me, Greg please pull this serie into your tree, if you hadn't yet.
Am I right that this is a stable tree material too?
Acked-by: Evgeniy Polyakov z...@ioremap.net
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[patch] [patch 2/2 v2] w1: use correct lock on error in w1_seq_show()
I noticed there was a problem here because Smatch complained:
drivers/w1/slaves/w1_therm.c:416 w1_seq_show() warn:
inconsistent returns 'mutex:>master->mutex'.
Locked on: line 416
Unlocked on: line 413
The problem is that we lock ->mutex but we unlock ->bus_mutex on error.
David Fries says that ->bus_mutex is correct and ->mutex is incorrect.
Fixes: d9411e57dc7f ('w1: Add support for DS28EA00 sequence to w1-therm')
Signed-off-by: Dan Carpenter
---
v2: In the first version I changed ->bus_mutext to ->mutex instead of
the other way around.
diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
index d21e686..06b034c 100644
--- a/drivers/w1/slaves/w1_therm.c
+++ b/drivers/w1/slaves/w1_therm.c
@@ -355,7 +355,7 @@ static ssize_t w1_seq_show(struct device *device,
struct w1_reg_num *reg_num;
int seq = 0;
- mutex_lock(>master->mutex);
+ mutex_lock(>master->bus_mutex);
/* Place all devices in CHAIN state */
if (w1_reset_bus(sl->master))
goto error;
@@ -407,7 +407,7 @@ static ssize_t w1_seq_show(struct device *device,
ack = w1_read_8(sl->master);
if (ack != W1_42_SUCCESS_CONFIRM_BYTE)
goto error;
- mutex_unlock(>master->mutex);
+ mutex_unlock(>master->bus_mutex);
c -= snprintf(buf + PAGE_SIZE - c, c, "%d\n", seq);
return PAGE_SIZE - c;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[patch] [patch 2/2 v2] w1: use correct lock on error in w1_seq_show()
I noticed there was a problem here because Smatch complained:
drivers/w1/slaves/w1_therm.c:416 w1_seq_show() warn:
inconsistent returns 'mutex:sl-master-mutex'.
Locked on: line 416
Unlocked on: line 413
The problem is that we lock -mutex but we unlock -bus_mutex on error.
David Fries says that -bus_mutex is correct and -mutex is incorrect.
Fixes: d9411e57dc7f ('w1: Add support for DS28EA00 sequence to w1-therm')
Signed-off-by: Dan Carpenter dan.carpen...@oracle.com
---
v2: In the first version I changed -bus_mutext to -mutex instead of
the other way around.
diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
index d21e686..06b034c 100644
--- a/drivers/w1/slaves/w1_therm.c
+++ b/drivers/w1/slaves/w1_therm.c
@@ -355,7 +355,7 @@ static ssize_t w1_seq_show(struct device *device,
struct w1_reg_num *reg_num;
int seq = 0;
- mutex_lock(sl-master-mutex);
+ mutex_lock(sl-master-bus_mutex);
/* Place all devices in CHAIN state */
if (w1_reset_bus(sl-master))
goto error;
@@ -407,7 +407,7 @@ static ssize_t w1_seq_show(struct device *device,
ack = w1_read_8(sl-master);
if (ack != W1_42_SUCCESS_CONFIRM_BYTE)
goto error;
- mutex_unlock(sl-master-mutex);
+ mutex_unlock(sl-master-bus_mutex);
c -= snprintf(buf + PAGE_SIZE - c, c, %d\n, seq);
return PAGE_SIZE - c;
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
