aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorLinus Torvalds2012-12-13 13:59:27 -0600
committerLinus Torvalds2012-12-13 13:59:27 -0600
commitdadfab4873256d2145640c0ce468fcbfb48977fe (patch)
tree73569a071221172e7f5f787e5df0064e8d129b3f /tools
parent046e7d685bc370fd4c879ab6635ad3f69e6673d1 (diff)
parentdb2cad2f55078e90f84960b84b721291efa83d36 (diff)
downloadkernel-omap-dadfab4873256d2145640c0ce468fcbfb48977fe.tar.gz
kernel-omap-dadfab4873256d2145640c0ce468fcbfb48977fe.tar.xz
kernel-omap-dadfab4873256d2145640c0ce468fcbfb48977fe.zip
Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
Pull IEEE 1394 (FireWire) subsystem updates from Stefan Richter: - IPv4-over-1394: fixes for broadcast and multicast - SBP-2: allow thin-provisioning related commands - trivia * tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394: firewire: net: remove unused variable in fwnet_receive_broadcast() firewire: net: Fix handling of fragmented multicast/broadcast packets. firewire: sbp2: allow WRITE SAME and REPORT SUPPORTED OPERATION CODES tools/firewire: nosy-dump: check for allocation failure
Diffstat (limited to 'tools')
-rw-r--r--tools/firewire/nosy-dump.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/firewire/nosy-dump.c b/tools/firewire/nosy-dump.c
index f93b776370b6..3179c711bd65 100644
--- a/tools/firewire/nosy-dump.c
+++ b/tools/firewire/nosy-dump.c
@@ -150,6 +150,8 @@ subaction_create(uint32_t *data, size_t length)
150 150
151 /* we put the ack in the subaction struct for easy access. */ 151 /* we put the ack in the subaction struct for easy access. */
152 sa = malloc(sizeof *sa - sizeof sa->packet + length); 152 sa = malloc(sizeof *sa - sizeof sa->packet + length);
153 if (!sa)
154 exit(EXIT_FAILURE);
153 sa->ack = data[length / 4 - 1]; 155 sa->ack = data[length / 4 - 1];
154 sa->length = length; 156 sa->length = length;
155 memcpy(&sa->packet, data, length); 157 memcpy(&sa->packet, data, length);
@@ -180,6 +182,8 @@ link_transaction_lookup(int request_node, int response_node, int tlabel)
180 } 182 }
181 183
182 t = malloc(sizeof *t); 184 t = malloc(sizeof *t);
185 if (!t)
186 exit(EXIT_FAILURE);
183 t->request_node = request_node; 187 t->request_node = request_node;
184 t->response_node = response_node; 188 t->response_node = response_node;
185 t->tlabel = tlabel; 189 t->tlabel = tlabel;