From 465f7328f70557a9fb4a26a15f307757afb07d42 Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Fri, 7 Dec 2012 16:17:29 -0500 Subject: [PATCH] --- yaml --- r: 347727 b: refs/heads/master c: 18d9a2ca2ea1aa963a077fb49e7efcc3b0237a9b h: refs/heads/master i: 347725: 5aa6b5b8b0e887042e1bed5f2dca79c99c661d17 347723: 64c9de76fc0c96a45783dc3c0fc3f59654387744 347719: 10f7b005795159c41f422a3692fb9339bf30e44d 347711: bac08eb43577faa851eb3725250e25fa6b61ed80 v: v3 --- [refs] | 2 +- trunk/fs/nfsd/fault_inject.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f304effe2d96..78acbc60dfda 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a5c33e23c4d781ecc815002c54f1f91012c703d +refs/heads/master: 18d9a2ca2ea1aa963a077fb49e7efcc3b0237a9b diff --git a/trunk/fs/nfsd/fault_inject.c b/trunk/fs/nfsd/fault_inject.c index 7a7b079fbdb1..e761ee95617f 100644 --- a/trunk/fs/nfsd/fault_inject.c +++ b/trunk/fs/nfsd/fault_inject.c @@ -122,7 +122,7 @@ static ssize_t fault_inject_write(struct file *file, const char __user *buf, size_t len, loff_t *ppos) { char write_buf[INET6_ADDRSTRLEN]; - size_t size = min(sizeof(write_buf), len) - 1; + size_t size = min(sizeof(write_buf) - 1, len); struct net *net = current->nsproxy->net_ns; struct sockaddr_storage sa; u64 val;