diff --git a/[refs] b/[refs] index 15056953a475..810889566c8e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4b3ada83d06554d307dd54abdc62b2e5648264a +refs/heads/master: 7635b03adf3d7b84da7649b81efa91e6ebf11b85 diff --git a/trunk/kernel/trace/blktrace.c b/trunk/kernel/trace/blktrace.c index a400b861fad3..73d7860b72e2 100644 --- a/trunk/kernel/trace/blktrace.c +++ b/trunk/kernel/trace/blktrace.c @@ -327,7 +327,7 @@ static ssize_t blk_msg_write(struct file *filp, const char __user *buffer, char *msg; struct blk_trace *bt; - if (count > BLK_TN_MAX_MSG - 1) + if (count >= BLK_TN_MAX_MSG) return -EINVAL; msg = kmalloc(count + 1, GFP_KERNEL);