| Message ID | 20190213185741.GA5047@embeddedor (mailing list archive) |
|---|---|
| State | Deferred |
| Delegated to: | Samuel Ortiz |
| Headers | show |
| Series | NFC: pn533: mark expected switch fall-throughs | expand |
Hi all, If no one cares, I'll add this to my tree for 5.2 Thanks -- Gustavo On 2/13/19 12:57 PM, Gustavo A. R. Silva wrote: > In preparation to enabling -Wimplicit-fallthrough, mark switch > cases where we are expecting to fall through. > > This patch fixes the following warnings: > > drivers/nfc/pn533/pn533.c: In function ‘pn533_transceive’: > drivers/nfc/pn533/pn533.c:2142:6: warning: this statement may fall through [-Wimplicit-fallthrough=] > if (dev->tgt_active_prot == NFC_PROTO_FELICA) { > ^ > drivers/nfc/pn533/pn533.c:2150:2: note: here > default: > ^~~~~~~ > drivers/nfc/pn533/pn533.c: In function ‘pn533_wq_mi_recv’: > drivers/nfc/pn533/pn533.c:2267:6: warning: this statement may fall through [-Wimplicit-fallthrough=] > if (dev->tgt_active_prot == NFC_PROTO_FELICA) { > ^ > drivers/nfc/pn533/pn533.c:2276:2: note: here > default: > ^~~~~~~ > > Warning level 3 was used: -Wimplicit-fallthrough=3 > > This patch is part of the ongoing efforts to enable > -Wimplicit-fallthrough. > > Addresses-Coverity-ID: 1230487 ("Missing break in switch") > Addresses-Coverity-ID: 1230488 ("Missing break in switch") > Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> > --- > drivers/nfc/pn533/pn533.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/nfc/pn533/pn533.c b/drivers/nfc/pn533/pn533.c > index a0cc1cc45292..5961f14259e5 100644 > --- a/drivers/nfc/pn533/pn533.c > +++ b/drivers/nfc/pn533/pn533.c > @@ -2147,6 +2147,7 @@ static int pn533_transceive(struct nfc_dev *nfc_dev, > > break; > } > + /* fall through */ > default: > /* jumbo frame ? */ > if (skb->len > PN533_CMD_DATAEXCH_DATA_MAXLEN) { > @@ -2273,6 +2274,7 @@ static void pn533_wq_mi_recv(struct work_struct *work) > > break; > } > + /* fall through */ > default: > skb_put_u8(skb, 1); /*TG*/ > >
On Wed, Feb 13, 2019 at 10:57 AM Gustavo A. R. Silva <gustavo@embeddedor.com> wrote: > > In preparation to enabling -Wimplicit-fallthrough, mark switch > cases where we are expecting to fall through. > > This patch fixes the following warnings: > > drivers/nfc/pn533/pn533.c: In function ‘pn533_transceive’: > drivers/nfc/pn533/pn533.c:2142:6: warning: this statement may fall through [-Wimplicit-fallthrough=] > if (dev->tgt_active_prot == NFC_PROTO_FELICA) { > ^ > drivers/nfc/pn533/pn533.c:2150:2: note: here > default: > ^~~~~~~ > drivers/nfc/pn533/pn533.c: In function ‘pn533_wq_mi_recv’: > drivers/nfc/pn533/pn533.c:2267:6: warning: this statement may fall through [-Wimplicit-fallthrough=] > if (dev->tgt_active_prot == NFC_PROTO_FELICA) { > ^ > drivers/nfc/pn533/pn533.c:2276:2: note: here > default: > ^~~~~~~ > > Warning level 3 was used: -Wimplicit-fallthrough=3 > > This patch is part of the ongoing efforts to enable > -Wimplicit-fallthrough. > > Addresses-Coverity-ID: 1230487 ("Missing break in switch") > Addresses-Coverity-ID: 1230488 ("Missing break in switch") > Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> Reviewed-by: Kees Cook <keescook@chromium.org>
diff --git a/drivers/nfc/pn533/pn533.c b/drivers/nfc/pn533/pn533.c index a0cc1cc45292..5961f14259e5 100644 --- a/drivers/nfc/pn533/pn533.c +++ b/drivers/nfc/pn533/pn533.c @@ -2147,6 +2147,7 @@ static int pn533_transceive(struct nfc_dev *nfc_dev, break; } + /* fall through */ default: /* jumbo frame ? */ if (skb->len > PN533_CMD_DATAEXCH_DATA_MAXLEN) { @@ -2273,6 +2274,7 @@ static void pn533_wq_mi_recv(struct work_struct *work) break; } + /* fall through */ default: skb_put_u8(skb, 1); /*TG*/
In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through. This patch fixes the following warnings: drivers/nfc/pn533/pn533.c: In function ‘pn533_transceive’: drivers/nfc/pn533/pn533.c:2142:6: warning: this statement may fall through [-Wimplicit-fallthrough=] if (dev->tgt_active_prot == NFC_PROTO_FELICA) { ^ drivers/nfc/pn533/pn533.c:2150:2: note: here default: ^~~~~~~ drivers/nfc/pn533/pn533.c: In function ‘pn533_wq_mi_recv’: drivers/nfc/pn533/pn533.c:2267:6: warning: this statement may fall through [-Wimplicit-fallthrough=] if (dev->tgt_active_prot == NFC_PROTO_FELICA) { ^ drivers/nfc/pn533/pn533.c:2276:2: note: here default: ^~~~~~~ Warning level 3 was used: -Wimplicit-fallthrough=3 This patch is part of the ongoing efforts to enable -Wimplicit-fallthrough. Addresses-Coverity-ID: 1230487 ("Missing break in switch") Addresses-Coverity-ID: 1230488 ("Missing break in switch") Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> --- drivers/nfc/pn533/pn533.c | 2 ++ 1 file changed, 2 insertions(+)