gwj / at91sam9263 · Commits

Commit 85df0de4cfe54fd64df7e37448cd152d0c9199a4

Authored by blueswir1
1 parent f4a5a5ba

Allow to register a callback with fw_cfg_add_callback() 

fw_cfg_add_callback() checks if key has FW_CFG_WRITE_CHANNEL bit set
after masking the key with FW_CFG_ENTRY_MASK.

But as FW_CFG_ENTRY_MASK is ~(FW_CFG_WRITE_CHANNEL | FW_CFG_ARCH_LOCAL),
the bit is never set and function exits.

This patch corrects this by checking the bit before masking the value.

Signed-by-off: Laurent Vivier <Laurent.Vivier@bull.net>
Acked-by: Gleb Natapov <gleb@redhat.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5978 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 4 additions and 2 deletions
hw/fw_cfg.c
  View file @85df0de
... ... @@ -240,10 +240,12 @@ int fw_cfg_add_callback(void *opaque, uint16_t key, FWCfgCallback callback,
240 240 FWCfgState *s = opaque;
241 241 int arch = !!(key & FW_CFG_ARCH_LOCAL);
242 242  
  243 + if (!(key & FW_CFG_WRITE_CHANNEL))
  244 + return 0;
  245 +
243 246 key &= FW_CFG_ENTRY_MASK;
244 247  
245   - if (key >= FW_CFG_MAX_ENTRY || !(key & FW_CFG_WRITE_CHANNEL)
246   - || len > 65535)
  248 + if (key >= FW_CFG_MAX_ENTRY || len > 65535)
247 249 return 0;
248 250  
249 251 s->entries[arch][key].data = data;
... ...