Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

phonet: fix building with clang

clang warns about overflowing the data[] member in the struct pnpipehdr:

net/phonet/pep.c:295:8: warning: array index 4 is past the end of the array (which contains 1 element) [-Warray-bounds]
if (hdr->data[4] == PEP_IND_READY)
^ ~
include/net/phonet/pep.h:66:3: note: array 'data' declared here
u8 data[1];

Using a flexible array member at the end of the struct avoids the
warning, but since we cannot have a flexible array member inside
of the union, each index now has to be moved back by one, which
makes it a little uglier.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Rémi Denis-Courmont <remi@remlab.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Arnd Bergmann and committed by
David S. Miller
6321aa19 b35560e4

+19 -18
+3 -2
include/net/phonet/pep.h
··· 63 63 u8 state_after_reset; /* reset request */ 64 64 u8 error_code; /* any response */ 65 65 u8 pep_type; /* status indication */ 66 - u8 data[1]; 66 + u8 data0; /* anything else */ 67 67 }; 68 + u8 data[]; 68 69 }; 69 - #define other_pep_type data[1] 70 + #define other_pep_type data[0] 70 71 71 72 static inline struct pnpipehdr *pnp_hdr(struct sk_buff *skb) 72 73 {
+16 -16
net/phonet/pep.c
··· 132 132 ph->utid = 0; 133 133 ph->message_id = id; 134 134 ph->pipe_handle = pn->pipe_handle; 135 - ph->data[0] = code; 135 + ph->error_code = code; 136 136 return pn_skb_send(sk, skb, NULL); 137 137 } 138 138 ··· 153 153 ph->utid = id; /* whatever */ 154 154 ph->message_id = id; 155 155 ph->pipe_handle = pn->pipe_handle; 156 - ph->data[0] = code; 156 + ph->error_code = code; 157 157 return pn_skb_send(sk, skb, NULL); 158 158 } 159 159 ··· 208 208 struct pnpipehdr *ph; 209 209 struct sockaddr_pn dst; 210 210 u8 data[4] = { 211 - oph->data[0], /* PEP type */ 211 + oph->pep_type, /* PEP type */ 212 212 code, /* error code, at an unusual offset */ 213 213 PAD, PAD, 214 214 }; ··· 221 221 ph->utid = oph->utid; 222 222 ph->message_id = PNS_PEP_CTRL_RESP; 223 223 ph->pipe_handle = oph->pipe_handle; 224 - ph->data[0] = oph->data[1]; /* CTRL id */ 224 + ph->data0 = oph->data[0]; /* CTRL id */ 225 225 226 226 pn_skb_get_src_sockaddr(oskb, &dst); 227 227 return pn_skb_send(sk, skb, &dst); ··· 272 272 return -EINVAL; 273 273 274 274 hdr = pnp_hdr(skb); 275 - if (hdr->data[0] != PN_PEP_TYPE_COMMON) { 275 + if (hdr->pep_type != PN_PEP_TYPE_COMMON) { 276 276 net_dbg_ratelimited("Phonet unknown PEP type: %u\n", 277 - (unsigned int)hdr->data[0]); 277 + (unsigned int)hdr->pep_type); 278 278 return -EOPNOTSUPP; 279 279 } 280 280 281 - switch (hdr->data[1]) { 281 + switch (hdr->data[0]) { 282 282 case PN_PEP_IND_FLOW_CONTROL: 283 283 switch (pn->tx_fc) { 284 284 case PN_LEGACY_FLOW_CONTROL: 285 - switch (hdr->data[4]) { 285 + switch (hdr->data[3]) { 286 286 case PEP_IND_BUSY: 287 287 atomic_set(&pn->tx_credits, 0); 288 288 break; ··· 292 292 } 293 293 break; 294 294 case PN_ONE_CREDIT_FLOW_CONTROL: 295 - if (hdr->data[4] == PEP_IND_READY) 295 + if (hdr->data[3] == PEP_IND_READY) 296 296 atomic_set(&pn->tx_credits, wake = 1); 297 297 break; 298 298 } ··· 301 301 case PN_PEP_IND_ID_MCFC_GRANT_CREDITS: 302 302 if (pn->tx_fc != PN_MULTI_CREDIT_FLOW_CONTROL) 303 303 break; 304 - atomic_add(wake = hdr->data[4], &pn->tx_credits); 304 + atomic_add(wake = hdr->data[3], &pn->tx_credits); 305 305 break; 306 306 307 307 default: 308 308 net_dbg_ratelimited("Phonet unknown PEP indication: %u\n", 309 - (unsigned int)hdr->data[1]); 309 + (unsigned int)hdr->data[0]); 310 310 return -EOPNOTSUPP; 311 311 } 312 312 if (wake) ··· 318 318 { 319 319 struct pep_sock *pn = pep_sk(sk); 320 320 struct pnpipehdr *hdr = pnp_hdr(skb); 321 - u8 n_sb = hdr->data[0]; 321 + u8 n_sb = hdr->data0; 322 322 323 323 pn->rx_fc = pn->tx_fc = PN_LEGACY_FLOW_CONTROL; 324 324 __skb_pull(skb, sizeof(*hdr)); ··· 506 506 return -ECONNREFUSED; 507 507 508 508 /* Parse sub-blocks */ 509 - n_sb = hdr->data[4]; 509 + n_sb = hdr->data[3]; 510 510 while (n_sb > 0) { 511 511 u8 type, buf[6], len = sizeof(buf); 512 512 const u8 *data = pep_get_sb(skb, &type, &len, buf); ··· 739 739 ph->utid = 0; 740 740 ph->message_id = PNS_PIPE_REMOVE_REQ; 741 741 ph->pipe_handle = pn->pipe_handle; 742 - ph->data[0] = PAD; 742 + ph->data0 = PAD; 743 743 return pn_skb_send(sk, skb, NULL); 744 744 } 745 745 ··· 817 817 peer_type = hdr->other_pep_type << 8; 818 818 819 819 /* Parse sub-blocks (options) */ 820 - n_sb = hdr->data[4]; 820 + n_sb = hdr->data[3]; 821 821 while (n_sb > 0) { 822 822 u8 type, buf[1], len = sizeof(buf); 823 823 const u8 *data = pep_get_sb(skb, &type, &len, buf); ··· 1109 1109 ph->utid = 0; 1110 1110 if (pn->aligned) { 1111 1111 ph->message_id = PNS_PIPE_ALIGNED_DATA; 1112 - ph->data[0] = 0; /* padding */ 1112 + ph->data0 = 0; /* padding */ 1113 1113 } else 1114 1114 ph->message_id = PNS_PIPE_DATA; 1115 1115 ph->pipe_handle = pn->pipe_handle;