← Back to branch summary

~ubuntu-branches/ubuntu/natty/virtualbox-ose/natty-updates

« back to all changes in this revision

Viewing changes to src/VBox/Devices/Network/DevVirtioNet.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-03-11 17:16:37 UTC
  • mfrom: (0.3.4 upstream) (0.4.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100311171637-43z64ia3ccpj8vqn
Tags: 3.1.4-dfsg-2ubuntu1
https://launchpad.net/bugs/528561
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/535297
* Merge from Debian unstable (LP: #528561), remaining changes:
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
  - Replace *-source packages with transitional packages for *-dkms
* Fix crash in vboxvideo_drm with kernel 2.6.33 / backported drm code
  (LP: #535297)
* Add a list of linux-headers packages to the apport hook
* Update debian/patches/u02-lp-integration.dpatch with a
  DEP-3 compliant header
* Add ${misc:Depends} to virtualbox-ose-source and virtualbox-ose-guest-source
  Depends

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Devices/Network/DevVirtioNet.cpp
302
302
    if (port + cb > sizeof(struct VNetPCIConfig))
303
303
    {
304
304
        Log(("%s vnetGetConfig: Read beyond the config structure is attempted (port=%RTiop cb=%x).\n", INSTANCE(pState), port, cb));
305
 
        return VERR_INTERNAL_ERROR;
 
305
        return VERR_IOM_IOPORT_UNUSED;
306
306
    }
307
307
    memcpy(data, ((uint8_t*)&pState->config) + port, cb);
308
308
    return VINF_SUCCESS;
314
314
    if (port + cb > sizeof(struct VNetPCIConfig))
315
315
    {
316
316
        Log(("%s vnetGetConfig: Write beyond the config structure is attempted (port=%RTiop cb=%x).\n", INSTANCE(pState), port, cb));
317
 
        return VERR_INTERNAL_ERROR;
 
317
        if (port < sizeof(struct VNetPCIConfig))
 
318
            memcpy(((uint8_t*)&pState->config) + port, data,
 
319
                   sizeof(struct VNetPCIConfig) - port);
 
320
        return VINF_SUCCESS;
318
321
    }
319
322
    memcpy(((uint8_t*)&pState->config) + port, data, cb);
320
323
    return VINF_SUCCESS;