platform_system_vold/DirectVolume.h
Kenny Root a9f423dd7e Prevent null pointer deref in DirectVolume
There's a possibility that if something were messed up a call to
NetlinkEvent::findParam could return a NULL. Passing NULL as the
argument into atoi() would cause a null pointer dereference.

Change-Id: Ib071afbbe2adc341108c245ffa596cc8730bd8fd
2010-03-24 15:39:08 -07:00

83 lines
2.4 KiB
C++

/*
* Copyright (C) 2008 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef _DEVICEVOLUME_H
#define _DEVICEVOLUME_H
#include <utils/List.h>
#include <sysutils/NetlinkEvent.h>
#include "Volume.h"
#define MAX_PARTS 4
typedef android::List<char *> PathCollection;
inline bool getMajorMinorNum(NetlinkEvent *evt, int *major, int *minor) {
const char *major_str = evt->findParam("MAJOR");
const char *minor_str = evt->findParam("MINOR");
if (major_str == NULL || minor_str == NULL) {
return false;
}
*major = atoi(major_str);
*minor = atoi(minor_str);
return true;
}
class DirectVolume : public Volume {
public:
static const int MAX_PARTITIONS = 4;
protected:
PathCollection *mPaths;
int mPartIdx;
int mDiskMajor;
int mDiskMinor;
int mPartMinors[MAX_PARTITIONS];
int mDiskNumParts;
unsigned char mPendingPartMap;
public:
DirectVolume(VolumeManager *vm, const char *label, const char *mount_point, int partIdx);
virtual ~DirectVolume();
int addPath(const char *path);
int handleBlockEvent(NetlinkEvent *evt);
dev_t getDiskDevice();
void handleVolumeShared();
void handleVolumeUnshared();
protected:
int getDeviceNodes(dev_t *devs, int max);
private:
void handleDiskAdded(const char *devpath, NetlinkEvent *evt);
void handleDiskRemoved(const char *devpath, NetlinkEvent *evt);
void handleDiskChanged(const char *devpath, NetlinkEvent *evt);
void handlePartitionAdded(const char *devpath, NetlinkEvent *evt);
void handlePartitionRemoved(const char *devpath, NetlinkEvent *evt);
void handlePartitionChanged(const char *devpath, NetlinkEvent *evt);
int doMountVfat(const char *deviceNode, const char *mountPoint);
};
typedef android::List<DirectVolume *> DirectVolumeCollection;
#endif