diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 11:59:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 11:59:27 -0800 |
| commit | dadfab4873256d2145640c0ce468fcbfb48977fe (patch) | |
| tree | 73569a071221172e7f5f787e5df0064e8d129b3f /tools | |
| parent | 046e7d685bc370fd4c879ab6635ad3f69e6673d1 (diff) | |
| parent | db2cad2f55078e90f84960b84b721291efa83d36 (diff) | |
| download | linux-3.10-dadfab4873256d2145640c0ce468fcbfb48977fe.tar.gz linux-3.10-dadfab4873256d2145640c0ce468fcbfb48977fe.tar.bz2 linux-3.10-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.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/firewire/nosy-dump.c b/tools/firewire/nosy-dump.c index f93b776370b..3179c711bd6 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) /* we put the ack in the subaction struct for easy access. */ sa = malloc(sizeof *sa - sizeof sa->packet + length); + if (!sa) + exit(EXIT_FAILURE); sa->ack = data[length / 4 - 1]; sa->length = length; memcpy(&sa->packet, data, length); @@ -180,6 +182,8 @@ link_transaction_lookup(int request_node, int response_node, int tlabel) } t = malloc(sizeof *t); + if (!t) + exit(EXIT_FAILURE); t->request_node = request_node; t->response_node = response_node; t->tlabel = tlabel; |