Commit dea1ddc7 authored by Arthur Edelstein's avatar Arthur Edelstein Committed by Georg Koppen
Browse files

Bug 22165: Block DoListAddresses when resisting fingerprinting

parent 60d1a7bf

netwerk/base/NetworkInfoServiceCocoa.cpp

+6 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 


#include "NetworkInfoServiceImpl.h"



#include "nsContentUtils.h"



namespace mozilla {

namespace net {
@@ -26,6 +28,10 @@ ListInterfaceAddresses(int aFd, const char* aIface, AddrMapType& aAddrMap); 
nsresult

DoListAddresses(AddrMapType& aAddrMap)

{

    if (nsContentUtils::ShouldResistFingerprinting()) {

        return NS_ERROR_FAILURE;

    }



    int fd = socket(AF_INET, SOCK_DGRAM, 0);

    if (fd < 0) {

        return NS_ERROR_FAILURE;

netwerk/base/NetworkInfoServiceLinux.cpp

+6 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 


#include "NetworkInfoServiceImpl.h"



#include "nsContentUtils.h"



namespace mozilla {

namespace net {
@@ -26,6 +28,10 @@ ListInterfaceAddresses(int aFd, const char* aIface, AddrMapType& aAddrMap); 
nsresult

DoListAddresses(AddrMapType& aAddrMap)

{

    if (nsContentUtils::ShouldResistFingerprinting()) {

        return NS_ERROR_FAILURE;

    }



    int fd = socket(AF_INET, SOCK_DGRAM, 0);

    if (fd < 0) {

        return NS_ERROR_FAILURE;

netwerk/base/NetworkInfoServiceWindows.cpp

+6 −0
Original line number Diff line number Diff line
@@ -12,12 +12,18 @@ 


#include "NetworkInfoServiceImpl.h"



#include "nsContentUtils.h"



namespace mozilla {

namespace net {



nsresult

DoListAddresses(AddrMapType& aAddrMap)

{

  if (nsContentUtils::ShouldResistFingerprinting()) {

    return NS_ERROR_FAILURE;

  }



  UniquePtr<MIB_IPADDRTABLE> ipAddrTable;

  DWORD size = sizeof(MIB_IPADDRTABLE);