Message ID | 20181214154130.4069-1-tom.deseyn@gmail.com |
---|---|
State | New |
Headers | show |
Series | [v3] Add getsockopt for settable SOL_IPV6 options | expand |
Patchew URL: https://patchew.org/QEMU/20181214154130.4069-1-tom.deseyn@gmail.com/ Hi, This series seems to have some coding style problems. See output below for more information: Message-id: 20181214154130.4069-1-tom.deseyn@gmail.com Type: series Subject: [Qemu-devel] [PATCH v3] Add getsockopt for settable SOL_IPV6 options === TEST SCRIPT BEGIN === #!/bin/bash BASE=base n=1 total=$(git log --oneline $BASE.. | wc -l) failed=0 git config --local diff.renamelimit 0 git config --local diff.renames True git config --local diff.algorithm histogram commits="$(git log --format=%H --reverse $BASE..)" for c in $commits; do echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..." if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then failed=1 echo fi n=$((n+1)) done exit $failed === TEST SCRIPT END === Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384 Switched to a new branch 'test' 3da3146 Add getsockopt for settable SOL_IPV6 options === OUTPUT BEGIN === Checking PATCH 1/1: Add getsockopt for settable SOL_IPV6 options... ERROR: "foo* bar" should be "foo *bar" #38: FILE: linux-user/syscall.c:2368: + void* target_addr; ERROR: braces {} are necessary for all arms of this statement #39: FILE: linux-user/syscall.c:2369: + if (get_user_u32(len, optlen)) [...] ERROR: braces {} are necessary for all arms of this statement #41: FILE: linux-user/syscall.c:2371: + if (len < 0) [...] ERROR: braces {} are necessary for all arms of this statement #45: FILE: linux-user/syscall.c:2375: + if (ret < 0) [...] ERROR: braces {} are necessary for all arms of this statement #47: FILE: linux-user/syscall.c:2377: + if (lv < len) [...] ERROR: braces {} are necessary for all arms of this statement #49: FILE: linux-user/syscall.c:2379: + if (put_user_u32(len, optlen)) [...] ERROR: "(foo*)" should be "(foo *)" #52: FILE: linux-user/syscall.c:2382: + tswap32s((uint32_t*)&val); total: 7 errors, 0 warnings, 42 lines checked Your patch has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS. === OUTPUT END === Test command exited with code: 1 The full log is available at http://patchew.org/logs/20181214154130.4069-1-tom.deseyn@gmail.com/testing.checkpatch/?type=message. --- Email generated automatically by Patchew [http://patchew.org/]. Please send your feedback to patchew-devel@redhat.com
Hi Laurent, Can you please take a look at the updated patch? Should I add braces for code-style? Thanks, Tom On Fri, Dec 14, 2018 at 4:43 PM <tom.deseyn@gmail.com> wrote: > From: Tom Deseyn <tom.deseyn@gmail.com> > > Thank you for reviewing Laurant. > Sorry for missing history, I'm not used to sending patches via mail. > I got an email about code style. For now, I'm sticking to the style > that is used in the function. > > v2: default to unimplemented > v3: match kernel behavior > > Signed-off-by: Tom Deseyn <tom.deseyn@gmail.com> > --- > linux-user/syscall.c | 36 ++++++++++++++++++++++++++++++++++++ > 1 file changed, 36 insertions(+) > > diff --git a/linux-user/syscall.c b/linux-user/syscall.c > index 280137da8c..f103437f26 100644 > --- a/linux-user/syscall.c > +++ b/linux-user/syscall.c > @@ -2352,6 +2352,42 @@ static abi_long do_getsockopt(int sockfd, int > level, int optname, > break; > } > break; > + case SOL_IPV6: > + switch (optname) { > + case IPV6_MTU_DISCOVER: > + case IPV6_MTU: > + case IPV6_V6ONLY: > + case IPV6_RECVPKTINFO: > + case IPV6_UNICAST_HOPS: > + case IPV6_MULTICAST_HOPS: > + case IPV6_MULTICAST_LOOP: > + case IPV6_RECVERR: > + case IPV6_RECVHOPLIMIT: > + case IPV6_2292HOPLIMIT: > + case IPV6_CHECKSUM: { > + void* target_addr; > + if (get_user_u32(len, optlen)) > + return -TARGET_EFAULT; > + if (len < 0) > + return -TARGET_EINVAL; > + lv = sizeof(val); > + ret = get_errno(getsockopt(sockfd, level, optname, &val, > &lv)); > + if (ret < 0) > + return ret; > + if (lv < len) > + len = lv; > + if (put_user_u32(len, optlen)) > + return -TARGET_EFAULT; > + target_addr = lock_user(VERIFY_WRITE, optval_addr, len, 0); > + tswap32s((uint32_t*)&val); > + memcpy(target_addr, &val, len); > + unlock_user(target_addr, optval_addr, len); > + break; > + } > + default: > + goto unimplemented; > + } > + break; > default: > unimplemented: > gemu_log("getsockopt level=%d optname=%d not yet supported\n", > -- > 2.19.2 > >
Le 07/01/2019 à 06:50, Tom Deseyn a écrit : > Hi Laurent, > > Can you please take a look at the updated patch? Should I add braces for > code-style? Yes, new code must follow code-style. Older is only updated when we modify it for something else. Thanks, Laurent
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 280137da8c..f103437f26 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -2352,6 +2352,42 @@ static abi_long do_getsockopt(int sockfd, int level, int optname, break; } break; + case SOL_IPV6: + switch (optname) { + case IPV6_MTU_DISCOVER: + case IPV6_MTU: + case IPV6_V6ONLY: + case IPV6_RECVPKTINFO: + case IPV6_UNICAST_HOPS: + case IPV6_MULTICAST_HOPS: + case IPV6_MULTICAST_LOOP: + case IPV6_RECVERR: + case IPV6_RECVHOPLIMIT: + case IPV6_2292HOPLIMIT: + case IPV6_CHECKSUM: { + void* target_addr; + if (get_user_u32(len, optlen)) + return -TARGET_EFAULT; + if (len < 0) + return -TARGET_EINVAL; + lv = sizeof(val); + ret = get_errno(getsockopt(sockfd, level, optname, &val, &lv)); + if (ret < 0) + return ret; + if (lv < len) + len = lv; + if (put_user_u32(len, optlen)) + return -TARGET_EFAULT; + target_addr = lock_user(VERIFY_WRITE, optval_addr, len, 0); + tswap32s((uint32_t*)&val); + memcpy(target_addr, &val, len); + unlock_user(target_addr, optval_addr, len); + break; + } + default: + goto unimplemented; + } + break; default: unimplemented: gemu_log("getsockopt level=%d optname=%d not yet supported\n",