summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Bird <tim.bird@am.sony.com>2012-02-07 18:34:28 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-08 16:52:45 -0800
commit350a1955957d73352c043d0f948e3f28bb118c57 (patch)
treee8dc845824980fac4e3398970ba605f9446a411c
parent169c843afffcb328390ef39ff95227596d6f63c4 (diff)
staging: android: logger: clarify non-update of w_off in do_write_log_from_user
Add comment to explain when w_off is not updated in case of failed second fragment copy to buffer. Signed-off-by: Tim Bird <tim.bird@am.sony.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/android/logger.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c
index 6d92b7ef0a5..0d2367f2c15 100644
--- a/drivers/staging/android/logger.c
+++ b/drivers/staging/android/logger.c
@@ -330,6 +330,12 @@ static ssize_t do_write_log_from_user(struct logger_log *log,
if (count != len)
if (copy_from_user(log->buffer, buf + len, count - len))
+ /*
+ * Note that by not updating w_off, this abandons the
+ * portion of the new entry that *was* successfully
+ * copied, just above. This is intentional to avoid
+ * message corruption from missing fragments.
+ */
return -EFAULT;
log->w_off = logger_offset(log, log->w_off + count);