Fix some checkpatch.pl complained about in ah4.c
Signed-off-by: Jingyu Wang <[email protected]>
---
net/ipv4/ah4.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
index f8ad04470d3a..fe4715e7c80e 100644
--- a/net/ipv4/ah4.c
+++ b/net/ipv4/ah4.c
@@ -93,7 +93,7 @@ static int ip_clear_mutable_options(const struct iphdr *iph, __be32 *daddr)
continue;
}
optlen = optptr[1];
- if (optlen<2 || optlen>l)
+ if (optlen < 2 || optlen > l)
return -EINVAL;
switch (*optptr) {
case IPOPT_SEC:
@@ -165,7 +165,8 @@ static int ah_output(struct xfrm_state *x, struct sk_buff *skb)
ahp = x->data;
ahash = ahp->ahash;
- if ((err = skb_cow_data(skb, 0, &trailer)) < 0)
+ err = skb_cow_data(skb, 0, &trailer));
+ if (err < 0)
goto out;
nfrags = err;
@@ -352,7 +353,8 @@ static int ah_input(struct xfrm_state *x, struct sk_buff *skb)
skb->ip_summed = CHECKSUM_NONE;
- if ((err = skb_cow_data(skb, 0, &trailer)) < 0)
+ err = skb_cow_data(skb, 0, &trailer);
+ if (err < 0)
goto out;
nfrags = err;
@@ -553,8 +555,7 @@ static int ah4_rcv_cb(struct sk_buff *skb, int err)
return 0;
}
-static const struct xfrm_type ah_type =
-{
+static const struct xfrm_type ah_type = {
.owner = THIS_MODULE,
.proto = IPPROTO_AH,
.flags = XFRM_TYPE_REPLAY_PROT,
base-commit: 5957ac6635a1a12d4aa2661bbf04d3085a73372a
--
2.34.1
Hi Jingyu,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on 5957ac6635a1a12d4aa2661bbf04d3085a73372a]
url: https://github.com/intel-lab-lkp/linux/commits/Jingyu-Wang/net-ipv4-Fix-some-coding-style-in-ah4-c-file/20220908-102444
base: 5957ac6635a1a12d4aa2661bbf04d3085a73372a
config: x86_64-randconfig-a015
compiler: gcc-11 (Debian 11.3.0-5) 11.3.0
reproduce (this is a W=1 build):
# https://github.com/intel-lab-lkp/linux/commit/603895160512cd6e8f03a032b6523d1b90aa2d7c
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Jingyu-Wang/net-ipv4-Fix-some-coding-style-in-ah4-c-file/20220908-102444
git checkout 603895160512cd6e8f03a032b6523d1b90aa2d7c
# save the config file
mkdir build_dir && cp config build_dir/.config
make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash
If you fix the issue, kindly add following tag where applicable
Reported-by: kernel test robot <[email protected]>
All errors (new ones prefixed by >>):
net/ipv4/ah4.c: In function 'ah_output':
>> net/ipv4/ah4.c:168:45: error: expected ';' before ')' token
168 | err = skb_cow_data(skb, 0, &trailer));
| ^
| ;
>> net/ipv4/ah4.c:168:45: error: expected statement before ')' token
vim +168 net/ipv4/ah4.c
146
147 static int ah_output(struct xfrm_state *x, struct sk_buff *skb)
148 {
149 int err;
150 int nfrags;
151 int ihl;
152 u8 *icv;
153 struct sk_buff *trailer;
154 struct crypto_ahash *ahash;
155 struct ahash_request *req;
156 struct scatterlist *sg;
157 struct iphdr *iph, *top_iph;
158 struct ip_auth_hdr *ah;
159 struct ah_data *ahp;
160 int seqhi_len = 0;
161 __be32 *seqhi;
162 int sglists = 0;
163 struct scatterlist *seqhisg;
164
165 ahp = x->data;
166 ahash = ahp->ahash;
167
> 168 err = skb_cow_data(skb, 0, &trailer));
169 if (err < 0)
170 goto out;
171 nfrags = err;
172
173 skb_push(skb, -skb_network_offset(skb));
174 ah = ip_auth_hdr(skb);
175 ihl = ip_hdrlen(skb);
176
177 if (x->props.flags & XFRM_STATE_ESN) {
178 sglists = 1;
179 seqhi_len = sizeof(*seqhi);
180 }
181 err = -ENOMEM;
182 iph = ah_alloc_tmp(ahash, nfrags + sglists, ihl + seqhi_len);
183 if (!iph)
184 goto out;
185 seqhi = (__be32 *)((char *)iph + ihl);
186 icv = ah_tmp_icv(ahash, seqhi, seqhi_len);
187 req = ah_tmp_req(ahash, icv);
188 sg = ah_req_sg(ahash, req);
189 seqhisg = sg + nfrags;
190
191 memset(ah->auth_data, 0, ahp->icv_trunc_len);
192
193 top_iph = ip_hdr(skb);
194
195 iph->tos = top_iph->tos;
196 iph->ttl = top_iph->ttl;
197 iph->frag_off = top_iph->frag_off;
198
199 if (top_iph->ihl != 5) {
200 iph->daddr = top_iph->daddr;
201 memcpy(iph+1, top_iph+1, top_iph->ihl*4 - sizeof(struct iphdr));
202 err = ip_clear_mutable_options(top_iph, &top_iph->daddr);
203 if (err)
204 goto out_free;
205 }
206
207 ah->nexthdr = *skb_mac_header(skb);
208 *skb_mac_header(skb) = IPPROTO_AH;
209
210 top_iph->tos = 0;
211 top_iph->tot_len = htons(skb->len);
212 top_iph->frag_off = 0;
213 top_iph->ttl = 0;
214 top_iph->check = 0;
215
216 if (x->props.flags & XFRM_STATE_ALIGN4)
217 ah->hdrlen = (XFRM_ALIGN4(sizeof(*ah) + ahp->icv_trunc_len) >> 2) - 2;
218 else
219 ah->hdrlen = (XFRM_ALIGN8(sizeof(*ah) + ahp->icv_trunc_len) >> 2) - 2;
220
221 ah->reserved = 0;
222 ah->spi = x->id.spi;
223 ah->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output.low);
224
225 sg_init_table(sg, nfrags + sglists);
226 err = skb_to_sgvec_nomark(skb, sg, 0, skb->len);
227 if (unlikely(err < 0))
228 goto out_free;
229
230 if (x->props.flags & XFRM_STATE_ESN) {
231 /* Attach seqhi sg right after packet payload */
232 *seqhi = htonl(XFRM_SKB_CB(skb)->seq.output.hi);
233 sg_set_buf(seqhisg, seqhi, seqhi_len);
234 }
235 ahash_request_set_crypt(req, sg, icv, skb->len + seqhi_len);
236 ahash_request_set_callback(req, 0, ah_output_done, skb);
237
238 AH_SKB_CB(skb)->tmp = iph;
239
240 err = crypto_ahash_digest(req);
241 if (err) {
242 if (err == -EINPROGRESS)
243 goto out;
244
245 if (err == -ENOSPC)
246 err = NET_XMIT_DROP;
247 goto out_free;
248 }
249
250 memcpy(ah->auth_data, icv, ahp->icv_trunc_len);
251
252 top_iph->tos = iph->tos;
253 top_iph->ttl = iph->ttl;
254 top_iph->frag_off = iph->frag_off;
255 if (top_iph->ihl != 5) {
256 top_iph->daddr = iph->daddr;
257 memcpy(top_iph+1, iph+1, top_iph->ihl*4 - sizeof(struct iphdr));
258 }
259
260 out_free:
261 kfree(iph);
262 out:
263 return err;
264 }
265
--
0-DAY CI Kernel Test Service
https://01.org/lkp
Hi Jingyu,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on 5957ac6635a1a12d4aa2661bbf04d3085a73372a]
url: https://github.com/intel-lab-lkp/linux/commits/Jingyu-Wang/net-ipv4-Fix-some-coding-style-in-ah4-c-file/20220908-102444
base: 5957ac6635a1a12d4aa2661bbf04d3085a73372a
config: i386-randconfig-a015 (https://download.01.org/0day-ci/archive/20220908/[email protected]/config)
compiler: clang version 14.0.6 (https://github.com/llvm/llvm-project f28c006a5895fc0e329fe15fead81e37457cb1d1)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/603895160512cd6e8f03a032b6523d1b90aa2d7c
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Jingyu-Wang/net-ipv4-Fix-some-coding-style-in-ah4-c-file/20220908-102444
git checkout 603895160512cd6e8f03a032b6523d1b90aa2d7c
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=i386 SHELL=/bin/bash net/
If you fix the issue, kindly add following tag where applicable
Reported-by: kernel test robot <[email protected]>
All errors (new ones prefixed by >>):
>> net/ipv4/ah4.c:168:38: error: extraneous ')' before ';'
err = skb_cow_data(skb, 0, &trailer));
^
1 error generated.
vim +168 net/ipv4/ah4.c
146
147 static int ah_output(struct xfrm_state *x, struct sk_buff *skb)
148 {
149 int err;
150 int nfrags;
151 int ihl;
152 u8 *icv;
153 struct sk_buff *trailer;
154 struct crypto_ahash *ahash;
155 struct ahash_request *req;
156 struct scatterlist *sg;
157 struct iphdr *iph, *top_iph;
158 struct ip_auth_hdr *ah;
159 struct ah_data *ahp;
160 int seqhi_len = 0;
161 __be32 *seqhi;
162 int sglists = 0;
163 struct scatterlist *seqhisg;
164
165 ahp = x->data;
166 ahash = ahp->ahash;
167
> 168 err = skb_cow_data(skb, 0, &trailer));
169 if (err < 0)
170 goto out;
171 nfrags = err;
172
173 skb_push(skb, -skb_network_offset(skb));
174 ah = ip_auth_hdr(skb);
175 ihl = ip_hdrlen(skb);
176
177 if (x->props.flags & XFRM_STATE_ESN) {
178 sglists = 1;
179 seqhi_len = sizeof(*seqhi);
180 }
181 err = -ENOMEM;
182 iph = ah_alloc_tmp(ahash, nfrags + sglists, ihl + seqhi_len);
183 if (!iph)
184 goto out;
185 seqhi = (__be32 *)((char *)iph + ihl);
186 icv = ah_tmp_icv(ahash, seqhi, seqhi_len);
187 req = ah_tmp_req(ahash, icv);
188 sg = ah_req_sg(ahash, req);
189 seqhisg = sg + nfrags;
190
191 memset(ah->auth_data, 0, ahp->icv_trunc_len);
192
193 top_iph = ip_hdr(skb);
194
195 iph->tos = top_iph->tos;
196 iph->ttl = top_iph->ttl;
197 iph->frag_off = top_iph->frag_off;
198
199 if (top_iph->ihl != 5) {
200 iph->daddr = top_iph->daddr;
201 memcpy(iph+1, top_iph+1, top_iph->ihl*4 - sizeof(struct iphdr));
202 err = ip_clear_mutable_options(top_iph, &top_iph->daddr);
203 if (err)
204 goto out_free;
205 }
206
207 ah->nexthdr = *skb_mac_header(skb);
208 *skb_mac_header(skb) = IPPROTO_AH;
209
210 top_iph->tos = 0;
211 top_iph->tot_len = htons(skb->len);
212 top_iph->frag_off = 0;
213 top_iph->ttl = 0;
214 top_iph->check = 0;
215
216 if (x->props.flags & XFRM_STATE_ALIGN4)
217 ah->hdrlen = (XFRM_ALIGN4(sizeof(*ah) + ahp->icv_trunc_len) >> 2) - 2;
218 else
219 ah->hdrlen = (XFRM_ALIGN8(sizeof(*ah) + ahp->icv_trunc_len) >> 2) - 2;
220
221 ah->reserved = 0;
222 ah->spi = x->id.spi;
223 ah->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output.low);
224
225 sg_init_table(sg, nfrags + sglists);
226 err = skb_to_sgvec_nomark(skb, sg, 0, skb->len);
227 if (unlikely(err < 0))
228 goto out_free;
229
230 if (x->props.flags & XFRM_STATE_ESN) {
231 /* Attach seqhi sg right after packet payload */
232 *seqhi = htonl(XFRM_SKB_CB(skb)->seq.output.hi);
233 sg_set_buf(seqhisg, seqhi, seqhi_len);
234 }
235 ahash_request_set_crypt(req, sg, icv, skb->len + seqhi_len);
236 ahash_request_set_callback(req, 0, ah_output_done, skb);
237
238 AH_SKB_CB(skb)->tmp = iph;
239
240 err = crypto_ahash_digest(req);
241 if (err) {
242 if (err == -EINPROGRESS)
243 goto out;
244
245 if (err == -ENOSPC)
246 err = NET_XMIT_DROP;
247 goto out_free;
248 }
249
250 memcpy(ah->auth_data, icv, ahp->icv_trunc_len);
251
252 top_iph->tos = iph->tos;
253 top_iph->ttl = iph->ttl;
254 top_iph->frag_off = iph->frag_off;
255 if (top_iph->ihl != 5) {
256 top_iph->daddr = iph->daddr;
257 memcpy(top_iph+1, iph+1, top_iph->ihl*4 - sizeof(struct iphdr));
258 }
259
260 out_free:
261 kfree(iph);
262 out:
263 return err;
264 }
265
--
0-DAY CI Kernel Test Service
https://01.org/lkp
> @@ -165,7 +165,8 @@ static int ah_output(struct xfrm_state *x, struct sk_buff *skb)
> ahp = x->data;
> ahash = ahp->ahash;
>
> - if ((err = skb_cow_data(skb, 0, &trailer)) < 0)
> + err = skb_cow_data(skb, 0, &trailer));
I prefer the coding style issue over it not compiling at all.
I suggest you don't embarrass yourself any more by compile testing
your changes.
Andrew