]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
staging: unisys: BUG halt on error in I/O channel
authorNeil Horman <nhorman@redhat.com>
Tue, 21 Jul 2015 13:55:37 +0000 (09:55 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 23 Jul 2015 04:19:17 +0000 (21:19 -0700)
We precheck that we have enough space in an iochannel prior to writing to
it when we send in a fragmented skb.  Given that there is no recovery from
this condition that I can see, turn it into a BUG halt

Signed-off-by: Neil Horman <nhorman@redhat.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/unisys/visornic/visornic_main.c

index 1a0efe25f92915dbcadfe70c38a69401e3dabee8..f7363925f4a150dc2938674f1d48ed597328af82 100644 (file)
@@ -254,8 +254,16 @@ visor_copy_fragsinfo_from_skb(struct sk_buff *skb, unsigned int firstfraglen,
                                              page_offset,
                                              skb_shinfo(skb)->frags[ii].
                                              size, count, frags_max, frags);
-                       if (!count)
-                               return -EIO;
+                       /*
+                        * add_physinfo_entries only returns
+                        * zero if the frags array is out of room
+                        * That should never happen because we
+                        * fail above, if count+numfrags > frags_max.
+                        * Given that theres no recovery mechanism from putting
+                        * half a packet in the I/O channel, panic here as this
+                        * should never happen
+                        */
+                       BUG_ON(!count);
                }
        }
        if (skb_shinfo(skb)->frag_list) {