diff options
author | David S. Miller <davem@davemloft.net> | 2005-05-29 20:28:01 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-05-29 20:28:01 -0700 |
commit | 6c94d3611be61e4cff33b311f1a626d93d1d3e92 (patch) | |
tree | 2aa0f06ebdc7a72e8b08d6f734a3f1a91bf95249 /net/ipv6/ip6_flowlabel.c | |
parent | 69f6a0fafcdf0bfe85af182695d6d38f80f9d549 (diff) | |
download | blackbird-op-linux-6c94d3611be61e4cff33b311f1a626d93d1d3e92.tar.gz blackbird-op-linux-6c94d3611be61e4cff33b311f1a626d93d1d3e92.zip |
[IPV6]: Clear up user copy warning in flowlabel code.
We are intentionally ignoring the copy_to_user() value,
make it clear to the compiler too.
Noted by Jeff Garzik.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_flowlabel.c')
-rw-r--r-- | net/ipv6/ip6_flowlabel.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c index a93f6dc51979..0e5f7499debb 100644 --- a/net/ipv6/ip6_flowlabel.c +++ b/net/ipv6/ip6_flowlabel.c @@ -535,10 +535,12 @@ release: if (err) goto done; - /* Do not check for fault */ - if (!freq.flr_label) - copy_to_user(&((struct in6_flowlabel_req __user *) optval)->flr_label, - &fl->label, sizeof(fl->label)); + if (!freq.flr_label) { + if (copy_to_user(&((struct in6_flowlabel_req __user *) optval)->flr_label, + &fl->label, sizeof(fl->label))) { + /* Intentionally ignore fault. */ + } + } sfl1->fl = fl; sfl1->next = np->ipv6_fl_list; |