Return-Path: linux-nfs-owner@vger.kernel.org Received: from mail-la0-f43.google.com ([209.85.215.43]:59347 "EHLO mail-la0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753832AbaLDPVN (ORCPT ); Thu, 4 Dec 2014 10:21:13 -0500 Received: by mail-la0-f43.google.com with SMTP id ge10so9996053lab.30 for ; Thu, 04 Dec 2014 07:21:12 -0800 (PST) From: Rasmus Villemoes To: "J. Bruce Fields" Cc: Rasmus Villemoes , linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] fs: nfsd: Fix bug in compare_blob Date: Thu, 4 Dec 2014 16:20:52 +0100 Message-Id: <1417706452-30204-1-git-send-email-linux@rasmusvillemoes.dk> Sender: linux-nfs-owner@vger.kernel.org List-ID: Bugs similar to the one in acbbe6fbb240 (kcmp: fix standard comparison bug) are in rich supply. In this variant, the problem is that struct xdr_netobj::len has type unsigned int, so the expression o1->len - o2->len _also_ has type unsigned int; it has completely well-defined semantics, and the result is some non-negative integer, which is always representable in a long long. But this means that if the conditional triggers, we are guaranteed to return a positive value from compare_blob. In this case it could be fixed by - res = o1->len - o2->len; + res = (long long)o1->len - (long long)o2->len; but I'd rather eliminate the usually broken 'return a - b;' idiom. Signed-off-by: Rasmus Villemoes --- Notes: How this could ever have worked is beyond me - compare_blob seems to be used to maintain an rbtree, and I wouldn't expect rbtrees to behave well if the comparison function doesn't satisfy the basic invariant sign(cmp(a, b)) == -sign(cmp(b, a)). fs/nfsd/nfs4state.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index e9c3afe4b5d3..d504cd6927f8 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1711,15 +1711,14 @@ static int copy_cred(struct svc_cred *target, struct svc_cred *source) return 0; } -static long long +static int compare_blob(const struct xdr_netobj *o1, const struct xdr_netobj *o2) { - long long res; - - res = o1->len - o2->len; - if (res) - return res; - return (long long)memcmp(o1->data, o2->data, o1->len); + if (o1->len < o2->len) + return -1; + if (o1->len > o2->len) + return 1; + return memcmp(o1->data, o2->data, o1->len); } static int same_name(const char *n1, const char *n2) @@ -1907,7 +1906,7 @@ add_clp_to_name_tree(struct nfs4_client *new_clp, struct rb_root *root) static struct nfs4_client * find_clp_in_name_tree(struct xdr_netobj *name, struct rb_root *root) { - long long cmp; + int cmp; struct rb_node *node = root->rb_node; struct nfs4_client *clp; -- 2.0.4